diff --git a/.jenkins/check/config/filter_cppcheck.txt b/.jenkins/check/config/filter_cppcheck.txt index 7d129db8a1..b328b59dd2 100644 --- a/.jenkins/check/config/filter_cppcheck.txt +++ b/.jenkins/check/config/filter_cppcheck.txt @@ -1,29 +1,29 @@ # MindSpore "mindspore/mindspore/ccsrc/debug/anf_ir_utils.cc" "stlFindInsert" -"mindspore/mindspore/ccsrc/vm/transform.cc" "containerOutOfBounds" -"mindspore/mindspore/ccsrc/vm/transform.cc" "constVariable" +"mindspore/mindspore/ccsrc/backend/graph_compiler/transform.cc" "containerOutOfBounds" +"mindspore/mindspore/ccsrc/backend/graph_compiler/transform.cc" "constVariable" "mindspore/mindspore/ccsrc/utils/tensorprint_utils.cc" "invalidPointerCast" -"mindspore/mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.cc" "syntaxError" +"mindspore/mindspore/ccsrc/plugin/device/gpu/hal/device/mpi/mpi_initializer.cc" "syntaxError" "mindspore/mindspore/core/abstract/prim_nn.cc" "zerodivcond" "mindspore/mindspore/ccsrc/frontend/operator/ops_front_infer_function.cc" "zerodivcond" "mindspore/mindspore/ccsrc/pipeline/jit/pipeline_split.cc" "zerodivcond" -"mindspore/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc" "useStlAlgorithm" +"mindspore/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.cc" "useStlAlgorithm" "mindspore/mindspore/ccsrc/frontend/operator/ops_front_infer_function.cc" "uninitvar" "mindspore/mindspore/ccsrc/pipeline/jit/action.cc" "constVariable" "mindspore/mindspore/ccsrc/pipeline/jit/validator.cc" "constVariable" "mindspore/mindspore/ccsrc/utils/tensorprint_utils.cc" "invalidPointerCast" -"mindspore/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc" "knownConditionTrueFalse" -"mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.cc" "containerOutOfBounds" -"mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.cc" "containerOutOfBounds" -"mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.cc" "containerOutOfBounds" -"mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc" "containerOutOfBounds" +"mindspore/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/ir_fission/bn_grad_split.cc" "knownConditionTrueFalse" +"mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.cc" "containerOutOfBounds" +"mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.cc" "containerOutOfBounds" +"mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.cc" "containerOutOfBounds" +"mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.cc" "containerOutOfBounds" "mindspore/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_generate_strategy.cc" "containerOutOfBounds" -"mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.cc" "containerOutOfBounds" +"mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.cc" "containerOutOfBounds" "mindspore/mindspore/core/ops/strided_slice.cc" "zerodivcond" "mindspore/mindspore/core/ops/avg_pool_3d.cc" "zerodivcond" -"mindspore/mindspore/ccsrc/runtime/hccl_adapter/hccl_adapter.cc" "useStlAlgorithm" -"mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/cast_gpu_kernel.cc" "unknownMacro" -"mindspore/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc" "nullPointerArithmeticRedundantCheck" +"mindspore/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/hccl_adapter.cc" "useStlAlgorithm" +"mindspore/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/cast_gpu_kernel.cc" "unknownMacro" +"mindspore/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_manager.cc" "nullPointerArithmeticRedundantCheck" "mindspore/mindspore/ccsrc/pipeline/jit/static_analysis/auto_monad.cc" "containerOutOfBounds" "mindspore/mindspore/core/load_mindir/anf_model_parser.cc" "stlIfStrFind" diff --git a/.jenkins/check/config/filter_cpplint.txt b/.jenkins/check/config/filter_cpplint.txt index 3c82ccb356..80644f89df 100644 --- a/.jenkins/check/config/filter_cpplint.txt +++ b/.jenkins/check/config/filter_cpplint.txt @@ -5,16 +5,16 @@ "mindspore/include/infer_tensor.h" "runtime/references" "mindspore/include/inference.h" "runtime/explicit" "mindspore/mindspore/core/abstract/utils.cc" "build/include_what_you_use" -"mindspore/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc" "build/include_what_you_use" -"mindspore/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_callback_register.cc" "runtime/references" -"mindspore/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h" "runtime/references" -"mindspore/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_reporter.h" "runtime/references" +"mindspore/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.cc" "build/include_what_you_use" +"mindspore/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_callback_register.cc" "runtime/references" +"mindspore/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_manager.h" "runtime/references" +"mindspore/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_reporter.h" "runtime/references" "mindspore/mindspore/core/mindrt/src/actor/actormgr.h" "runtime/references" "mindspore/mindspore/core/mindrt/src/actor/actorpolicyinterface.h" "runtime/references" "mindspore/mindspore/core/mindrt/src/actor/actorthread.h" "runtime/references" "mindspore/mindspore/core/mindrt/src/actor/actorpolicy.h" "runtime/references" -"mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/" "readability/casting" -"mindspore/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc" "build/include_what_you_use" +"mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/" "readability/casting" +"mindspore/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_runtime.cc" "build/include_what_you_use" "mindspore/mindspore/ccsrc/utils/convert_utils_py.cc" "whitespace/indent" # Modelzoo diff --git a/.jenkins/check/config/filter_pylint.txt b/.jenkins/check/config/filter_pylint.txt index b27df10b3e..e0db34626c 100644 --- a/.jenkins/check/config/filter_pylint.txt +++ b/.jenkins/check/config/filter_pylint.txt @@ -120,6 +120,6 @@ "mindspore/tests/ut/python/optimizer/test_auto_grad.py" "broad-except" #MindSpore Lite -"mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/generator.py" "redefined-builtin" -"mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/generator.py" "exec-used" -"mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/generator.py" "global-variable-undefined" +"mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/generator.py" "redefined-builtin" +"mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/generator.py" "exec-used" +"mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/generator.py" "global-variable-undefined" diff --git a/.jenkins/check/config/whitelizard.txt b/.jenkins/check/config/whitelizard.txt index 430e671298..0022a7e6ab 100644 --- a/.jenkins/check/config/whitelizard.txt +++ b/.jenkins/check/config/whitelizard.txt @@ -10,10 +10,10 @@ mindspore/mindspore/lite/providers/nnie_proposal/src/proposal.cc:mindspore::prop mindspore/mindspore/core/abstract/primitive_infer_map.cc:mindspore::abstract::GetPrimitiveToEvalImplMap mindspore/mindspore/ccsrc/frontend/optimizer/irpass.cc:mindspore::opt::irpass::OptimizeIRPassLib::OptimizeIRPassLib mindspore/mindspore/ccsrc/frontend/parallel/ops_info/gather_v2_p_info.cc:mindspore::parallel::GatherV2PInfo::CheckStrategy -mindspore/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc:mindspore::device::gpu::GPUKernelRuntime::LaunchKernelDynamic +mindspore/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_runtime.cc:mindspore::device::gpu::GPUKernelRuntime::LaunchKernelDynamic mindspore/mindspore/ccsrc/pipeline/jit/init.cc:PYBIND11_MODULE -mindspore/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h:mindspore::kernel::UnaryOpGpuKernel::Launch -mindspore/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_rnn_grad_fission_v2.cc:mindspore::opt::AddLSTMInputGradNode +mindspore/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_gpu_kernel.h:mindspore::kernel::UnaryOpGpuKernel::Launch +mindspore/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_rnn_grad_fission_v2.cc:mindspore::opt::AddLSTMInputGradNode mindspore/model_zoo/official/recommend/wide_and_deep/src/wide_and_deep.py:__init__ mindspore/model_zoo/official/recommend/wide_and_deep_multitable/src/wide_and_deep.py:__init__ mindspore/mindspore/ccsrc/pipeline/jit/resource.cc:mindspore::pipeline::GetMethodMap @@ -34,165 +34,166 @@ mindspore/mindspore/lite/nnacl/infer/infer_register.c:RegisterInfer mindspore/mindspore/lite/src/runtime/kernel/arm/base/quant_dtype_cast.cc:mindspore::kernel::QuantDTypeCastCPUKernel::QuantDTypeCast mindspore/mindspore/lite/src/runtime/kernel/arm/base/quant_dtype_cast.cc:mindspore::kernel::QuantDTypeCastCPUKernel::Run mindspore/mindspore/ccsrc/pipeline/jit/static_analysis/prim.cc:mindspore::abstract::ConvertAbstractToPython -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/strided_slice_infer.c:StridedSliceInferShape -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_transform_fp16.c:WinogradInputTransformFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pooling_fp16.c:AvgPoolingFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pooling_fp16.c:MaxPoolingFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform4x2UnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform4x2ReluUnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform4x2Relu6UnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6UnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6ReluUnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6Relu6UnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pooling_int8.c:AvgPoolingOptInt8 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pooling_int8.c:MaxPoolingWithQuantInt8 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv3x3_int8.c:Conv3x3Int8OutputUnit -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_int8.c:Conv1x1PreOptPeroc -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer_register.c:RegisterInfer -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/gemm.c:RowMajor2Col12MajorStride -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/gemm.c:RowMajor2Col8MajorStride -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_transform_fp16.c:Conv3x3Fp16InputUnit -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_transform_fp16.c:Conv3x3Fp16FilterTransform -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pooling_fp16.c:AvgPoolingFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pooling_fp16.c:MaxPoolingFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pack_fp16.c:PackNHWCToNCHWFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:InputTransform6x6UnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:InputTransform8x8UnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform4x2Relu6UnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6UnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6ReluUnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6Relu6UnitFp16 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pooling_int8.c:AvgPoolingOptInt8 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv3x3_int8.c:Conv3x3Int8InputUnit -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv3x3_int8.c:Conv3x3Int8FilterTransform -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv3x3_int8.c:Conv3x3Int8OutputUnit -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_int8.c:Conv1x1PreOptPeroc -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_int8.c:Conv1x1PreOptPert -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pack_int8.c:PackNHWCToNCHWInt8 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pooling_fp32.c:AvgPooling -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_fp32.c:MatMul4x1Kernel -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_common_fp32.c:SWConv3x32Kernel, SWConv4x24Kernel, SWConv12x8Kernel, SWConv8x8Kernel, SWConv4x8Kernel, SWConv6x16Kernel, SWConv4x16Kernel -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_depthwise_fp32.c:DepthwiseSW3x32Kernel, DepthwiseSW4x24Kernel, DepthwiseSW12x8Kernel, DepthwiseSW8x8Kernel, DepthwiseSW4x8Kernel, DepthwiseSW6x16Kernel, DepthwiseSW4x16Kernel +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/strided_slice_infer.c:StridedSliceInferShape +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_transform_fp16.c:WinogradInputTransformFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pooling_fp16.c:AvgPoolingFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pooling_fp16.c:MaxPoolingFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform4x2UnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform4x2ReluUnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform4x2Relu6UnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6UnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6ReluUnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6Relu6UnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pooling_int8.c:AvgPoolingOptInt8 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pooling_int8.c:MaxPoolingWithQuantInt8 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv3x3_int8.c:Conv3x3Int8OutputUnit +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_int8.c:Conv1x1PreOptPeroc +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer_register.c:RegisterInfer +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/gemm.c:RowMajor2Col12MajorStride +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/gemm.c:RowMajor2Col8MajorStride +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_transform_fp16.c:Conv3x3Fp16InputUnit +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_transform_fp16.c:Conv3x3Fp16FilterTransform +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pooling_fp16.c:AvgPoolingFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pooling_fp16.c:MaxPoolingFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pack_fp16.c:PackNHWCToNCHWFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:InputTransform6x6UnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:InputTransform8x8UnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform4x2Relu6UnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6UnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6ReluUnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c:OutputTransform8x6Relu6UnitFp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pooling_int8.c:AvgPoolingOptInt8 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv3x3_int8.c:Conv3x3Int8InputUnit +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv3x3_int8.c:Conv3x3Int8FilterTransform +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv3x3_int8.c:Conv3x3Int8OutputUnit +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_int8.c:Conv1x1PreOptPeroc +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_int8.c:Conv1x1PreOptPert +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pack_int8.c:PackNHWCToNCHWInt8 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pooling_fp32.c:AvgPooling +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_fp32.c:MatMul4x1Kernel +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_common_fp32.c:SWConv3x32Kernel, SWConv4x24Kernel, SWConv12x8Kernel, SWConv8x8Kernel, SWConv4x8Kernel, SWConv6x16Kernel, SWConv4x16Kernel +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_depthwise_fp32.c:DepthwiseSW3x32Kernel, DepthwiseSW4x24Kernel, DepthwiseSW12x8Kernel, DepthwiseSW8x8Kernel, DepthwiseSW4x8Kernel, DepthwiseSW6x16Kernel, DepthwiseSW4x16Kernel mindspore/mindspore/core/ir/dtype/type.cc:mindspore::ObjectIdLabel mindspore/mindspore/python/mindspore/ops/_op_impl/_custom_op/dsd_impl.py:dsd_matmul mindspore/mindspore/python/mindspore/ops/_op_impl/_custom_op/dsd_back_impl.py:dsdbpropimpl -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_1x1_x86_fp32.c:Conv1x1SW3x32Kernel, Conv1x1SW4x24Kernel, Conv1x1SW12x8Kernel, Conv1x1SW8x8Kernel, Conv1x1SW4x8Kernel, Conv1x1SW6x16Kernel, Conv1x1SW4x16Kernel, Conv1x1SW1x32Kernel, Conv1x1SW1x24Kernel, Conv1x1SW1x16Kernel, Conv1x1SW1x8Kernel -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_fp32.c:MatMul3x32Kernel, MatMul4x24Kernel, MatMul12x8Kernel, MatMul8x8Kernel, MatMul4x8Kernel, MatMul6x16Kernel, MatMul4x16Kernel, MatVecMul1x32Kernel, MatVecMul1x24Kernel, MatVecMul1x16Kernel, MatVecMul1x8Kernel -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/TiledC4MatMulFp32.c:TiledC4MatmulFp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/PostFuncBiasReluC4.c:PostFuncBiasReluC4 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/WinogradTrans.c:WinogradTransRight -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/WinogradTrans.c:WinogradTransLeft -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/WinogradPostFuncBiasReluC4.c:WinogradPostFuncBiasReluC4 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/PostFuncBiasReluC8.c:PostFuncBiasReluC8 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/WinogradPostFuncBiasReluC8.c:WinogradPostFuncBiasReluC8 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_winograd_fp32.c:PackDeConvWgDataFp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/WinogradPostFuncBiasReluC4.c:WinogradPostFuncBiasReluC4 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/PostFuncBiasReluC8.c:PostFuncBiasReluC8 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/WinogradTransAvx.c:WinogradTransLeft -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/WinogradTransAvx.c:WinogradTransRight -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/PostFuncBiasReluC8.c:PostFuncBiasReluC8 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/WinogradPostFuncBiasReluC8.c:WinogradPostFuncBiasReluC8 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_winograd_fp32.c:PackDeConvWgDataFp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_winograd_fp32.c:DeConvWgMerge -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/TiledC8MatMulFp32.c:TiledC8MatmulFp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/quant_dtype_cast_fp16.c:Fp16ToInt8_arm64 -mindspore/mindspore/ccsrc/backend/session/gpu_session.cc:mindspore::session::gpu::GPUSession::LoadInputData +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_1x1_x86_fp32.c:Conv1x1SW3x32Kernel, Conv1x1SW4x24Kernel, Conv1x1SW12x8Kernel, Conv1x1SW8x8Kernel, Conv1x1SW4x8Kernel, Conv1x1SW6x16Kernel, Conv1x1SW4x16Kernel, Conv1x1SW1x32Kernel, Conv1x1SW1x24Kernel, Conv1x1SW1x16Kernel, Conv1x1SW1x8Kernel +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_fp32.c:MatMul3x32Kernel, MatMul4x24Kernel, MatMul12x8Kernel, MatMul8x8Kernel, MatMul4x8Kernel, MatMul6x16Kernel, MatMul4x16Kernel, MatVecMul1x32Kernel, MatVecMul1x24Kernel, MatVecMul1x16Kernel, MatVecMul1x8Kernel +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/TiledC4MatMulFp32.c:TiledC4MatmulFp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/PostFuncBiasReluC4.c:PostFuncBiasReluC4 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/WinogradTrans.c:WinogradTransRight +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/WinogradTrans.c:WinogradTransLeft +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/WinogradPostFuncBiasReluC4.c:WinogradPostFuncBiasReluC4 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/PostFuncBiasReluC8.c:PostFuncBiasReluC8 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/WinogradPostFuncBiasReluC8.c:WinogradPostFuncBiasReluC8 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_winograd_fp32.c:PackDeConvWgDataFp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/WinogradPostFuncBiasReluC4.c:WinogradPostFuncBiasReluC4 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/PostFuncBiasReluC8.c:PostFuncBiasReluC8 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/WinogradTransAvx.c:WinogradTransLeft +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/WinogradTransAvx.c:WinogradTransRight +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/PostFuncBiasReluC8.c:PostFuncBiasReluC8 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/WinogradPostFuncBiasReluC8.c:WinogradPostFuncBiasReluC8 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_winograd_fp32.c:PackDeConvWgDataFp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_winograd_fp32.c:DeConvWgMerge +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/TiledC8MatMulFp32.c:TiledC8MatmulFp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/quant_dtype_cast_fp16.c:Fp16ToInt8_arm64 +mindspore/mindspore/ccsrc/backend/common/session/gpu_session.cc:mindspore::session::gpu::GPUSession::LoadInputData mindspore/mindspore/ccsrc/debug/dump_proto.cc:mindspore::ProtoExporter::SetNodeOutputType mindspore/mindspore/ccsrc/debug/dump_proto.cc:mindspore::ProtoExporter::SetValueToProto mindspore/mindspore/ccsrc/debug/dump_proto.cc:mindspore::ProtoExporter::SetScalarToProto -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_10x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_11x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x96_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x96_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x64_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x64_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_7x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x64_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x48_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_6x48_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x96_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x96_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x80_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x48_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x80_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x80_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_9x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_8x48_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_6x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_8x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x64_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_6x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_9x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_7x48_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x96_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x96_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x80_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x64_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_12x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_10x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_11x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x80_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_8x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_12x32_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x48_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x48_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x96_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x96_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_7x16_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x48_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_6x64_kernel_nhwc_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_10x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_11x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x96_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x96_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x64_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x64_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_7x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x64_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x48_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_6x48_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x96_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x96_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x80_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x48_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x80_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x80_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_9x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_8x48_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_6x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_8x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x64_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_6x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_9x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_7x48_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x96_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x96_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x80_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_4x64_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_12x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_10x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_11x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x80_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x80_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_8x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_3x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x32_kernel_nhwc_fp32.c:nnacl_gemm_avx512_12x32_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x48_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_1x48_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x96_kernel_nhwc_fp32.c:nnacl_gemm_avx512_2x96_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x16_kernel_nhwc_fp32.c:nnacl_gemm_avx512_7x16_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x48_kernel_nhwc_fp32.c:nnacl_gemm_avx512_5x48_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x64_kernel_nhwc_fp32.c:nnacl_gemm_avx512_6x64_kernel_nhwc_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32 mindspore/mindspore/lite/src/runtime/kernel/arm/fp32/matmul_fp32_base.cc:mindspore::kernel::MatmulFp32BaseCPUKernel::init_global_variable -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32 -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32.c:nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32_asm.c:nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32 mindspore/mindspore/lite/src/runtime/kernel/arm/fp32/matmul_fp32_base.cc:mindspore::kernel::MatmulFp32BaseCPUKernel::Run mindspore/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_partition.cc:mindspore::parallel::GetWeights mindspore/mindspore/ccsrc/frontend/parallel/auto_parallel/rec_core/rec_partition.cc:mindspore::parallel::PartitionNode -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/instance_norm_fp16.c:InstanceNormNC8HW8Fp16 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/instance_norm_fp16.c:InstanceNormNC8HW8Fp16 mindspore/mindspore/lite/src/runtime/kernel/arm/fp32/matmul_fp32_base.cc:mindspore::kernel::MatmulFp32BaseCPUKernel::init_global_variable -mindspore/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_winograd_fp32.c:ConvWinogardFp32 +mindspore/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_winograd_fp32.c:ConvWinogardFp32 +mindspore/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc:mindspore::opt::MatchAdd5Pattern \ No newline at end of file diff --git a/mindspore/ccsrc/CMakeLists.txt b/mindspore/ccsrc/CMakeLists.txt index d1359a935e..6bca169359 100644 --- a/mindspore/ccsrc/CMakeLists.txt +++ b/mindspore/ccsrc/CMakeLists.txt @@ -14,8 +14,8 @@ set(FBS_FILES ms_build_flatbuffers(FBS_FILES ${CMAKE_CURRENT_SOURCE_DIR}../../schema generated_fbs_files ${SERVER_FLATBUFFER_OUTPUT}) if(ENABLE_D) - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/backend/kernel_compiler/aicpu/aicpu_ops) - add_subdirectory(backend/kernel_compiler/aicpu/aicpu_ops) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/plugin/device/ascend/kernel/aicpu/aicpu_ops) + add_subdirectory(plugin/device/ascend/kernel/aicpu/aicpu_ops) endif() if(ENABLE_CPU) @@ -27,8 +27,8 @@ if(ENABLE_CPU) elseif("${X86_64_SIMD}" STREQUAL "off" AND NOT ${ENABLE_ASAN}) set(X86_64_SIMD "avx") endif() - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/backend/kernel_compiler/cpu) - add_subdirectory(backend/kernel_compiler/cpu/nnacl) + include_directories(${CMAKE_CURRENT_SOURCE_DIR}/plugin/device/cpu/kernel) + add_subdirectory(plugin/device/cpu/kernel/nnacl) endif() if(NOT CMAKE_SYSTEM_NAME MATCHES "Darwin") @@ -109,18 +109,19 @@ if(ENABLE_GPU) include_directories(${CUDNN_INCLUDE_PATH} ${CUDA_PATH} ${CUDA_INCLUDE_DIRS} ${CUPTI_INCLUDE_DIRS}) file(GLOB_RECURSE GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "runtime/device/gpu/*.cc" - "runtime/device/gpu/*.cu" - "backend/kernel_compiler/gpu/*.cu" + "plugin/device/gpu/hal/device/*.cc" + "plugin/device/gpu/hal/device/*.cu" + "plugin/device/gpu/kernel/*.cu" ) list(APPEND CUDA_NVCC_FLAGS -arch=sm_53 --expt-relaxed-constexpr) - 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" - "runtime/device/gpu/trt_loader.cc") + list(REMOVE_ITEM GPU_SRC_LIST "plugin/device/gpu/hal/device/blocking_queue.cc" + "plugin/device/gpu/hal/device/gpu_buffer_mgr.cc") + list(REMOVE_ITEM GPU_SRC_LIST "plugin/device/gpu/hal/device/mpi/mpi_initializer.cc" + "plugin/device/gpu/hal/device/distribution/collective_wrapper.cc" + "plugin/device/gpu/hal/device/distribution/mpi_wrapper.cc" + "plugin/device/gpu/hal/device/distribution/nccl_wrapper.cc" + "plugin/device/gpu/hal/device/trt_loader.cc") if(NOT ${TENSORRT_HOME} STREQUAL "") find_path(TENSORRT_HOME_INCLUDE NvInfer.h HINTS ${TENSORRT_HOME}/include) @@ -131,7 +132,7 @@ if(ENABLE_GPU) set(ENABLE_GPU_INFER TRUE) add_compile_definitions(ENABLE_GPU_INFER) include_directories(${TENSORRT_HOME_INCLUDE}) - list(APPEND GPU_SRC_LIST ${CMAKE_CURRENT_SOURCE_DIR}/runtime/device/gpu/trt_loader.cc) + list(APPEND GPU_SRC_LIST ${CMAKE_CURRENT_SOURCE_DIR}/plugin/device/gpu/hal/device/trt_loader.cc) endif() set(NVCC_TMP_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS}) @@ -199,11 +200,12 @@ if(ENABLE_DUMP_PROTO) endif() if(MODE_ASCEND_ALL) - include_directories("${CMAKE_BINARY_DIR}/backend/kernel_compiler/aicpu") - file(GLOB_RECURSE PROTO_IN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "backend/kernel_compiler/aicpu/proto/*.proto") + include_directories("${CMAKE_BINARY_DIR}/plugin/device/ascend/kernel/aicpu") + file(GLOB_RECURSE PROTO_IN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "plugin/device/ascend/kernel/aicpu/proto/*.proto") ms_protobuf_generate(PROTOSRCS PROTOHDRS ${PROTO_IN}) - file(GLOB_RECURSE PROTO_DUMP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "runtime/device/ascend/dump/proto/*.proto") + file(GLOB_RECURSE PROTO_DUMP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "plugin/device/ascend/hal/device/dump/proto/*.proto") ms_protobuf_generate(DUMP_PROTOSRCS PROTOHDRS ${PROTO_DUMP}) list(APPEND MINDSPORE_PROTO_LIST ${PROTOSRCS}) @@ -227,20 +229,38 @@ endif() set(SUB_COMP transform/graph_ir transform/express_ir - backend/optimizer - backend/kernel_compiler - backend/session - runtime/device - runtime/framework - runtime/hardware - runtime/op_builder - runtime/hccl_adapter frontend/optimizer frontend/parallel frontend/operator pipeline/jit pipeline/pynative - common debug pybind_api utils vm profiler ps fl distributed + debug pybind_api utils profiler ps fl distributed + kernel + common + common/mem_reuse + backend/common/optimizer + backend/common/pass + backend/common/session + backend/common/somas + backend/graph_compiler + runtime/collective + runtime/device + runtime/graph_scheduler + runtime/hardware + runtime/op_builder + plugin/device/ascend/hal/device + plugin/device/ascend/hal/hardware + plugin/device/ascend/hal/hccl_adapter + plugin/device/ascend/kernel + plugin/device/ascend/optimizer + plugin/device/cpu/hal/device + plugin/device/cpu/hal/hardware + plugin/device/cpu/kernel + plugin/device/cpu/optimizer + plugin/device/gpu/hal/device + plugin/device/gpu/hal/hardware + plugin/device/gpu/kernel + plugin/device/gpu/optimizer ) foreach(_comp ${SUB_COMP}) diff --git a/mindspore/ccsrc/backend/common/optimizer/CMakeLists.txt b/mindspore/ccsrc/backend/common/optimizer/CMakeLists.txt new file mode 100644 index 0000000000..343ac467a1 --- /dev/null +++ b/mindspore/ccsrc/backend/common/optimizer/CMakeLists.txt @@ -0,0 +1,15 @@ +file(GLOB_RECURSE _PREACTIVATE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -Wno-user-defined-warnings -Wno-inconsistent-missing-override \ + -Wno-overloaded-virtual -Wno-unused-const-variable -Wno-pessimizing-move") +endif() + +set_property(SOURCE ${_PREACTIVATE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT) +add_library(_mindspore_backend_common_optimizer_obj OBJECT ${_PREACTIVATE_SRC_LIST}) diff --git a/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc b/mindspore/ccsrc/backend/common/optimizer/common_backend_optimization.cc similarity index 84% rename from mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc rename to mindspore/ccsrc/backend/common/optimizer/common_backend_optimization.cc index 419387507f..8780254096 100644 --- a/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc +++ b/mindspore/ccsrc/backend/common/optimizer/common_backend_optimization.cc @@ -13,27 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/common/common_backend_optimization.h" +#include "backend/common/optimizer/common_backend_optimization.h" #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/pass/eliminate_func_data_type.h" -#include "backend/optimizer/pass/convert_const_input_to_attr.h" -#include "backend/optimizer/pass/custom_op_const_input_to_attr.h" -#include "backend/optimizer/pass/custom_op_reg_info_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 "backend/optimizer/pass/convert_const_scalar_to_tensor.h" -#include "backend/optimizer/pass/convert_attr_to_unify_mindir.h" -#include "backend/optimizer/pass/add_training_attr.h" -#include "backend/optimizer/pass/optimize_updatestate.h" -#include "backend/optimizer/pass/conv_transpose_to_conv_bp.h" -#include "backend/optimizer/pass/reduce_sum_optimizer.h" -#include "backend/optimizer/pass/add_dynamic_shape_attr.h" -#include "backend/optimizer/pass/add_akg_kernel_attrs.h" -#include "backend/optimizer/pass/sparse_process.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/pass/eliminate_func_data_type.h" +#include "backend/common/pass/convert_const_input_to_attr.h" +#include "backend/common/pass/custom_op_const_input_to_attr.h" +#include "backend/common/pass/custom_op_reg_info_to_attr.h" +#include "backend/common/pass/convert_tuple_output_to_maketuple.h" +#include "backend/common/pass/convert_const_input_to_tensor_input.h" +#include "backend/common/pass/convert_tuple_input_to_dynamic_input.h" +#include "backend/common/pass/const_to_attr_strided_slice_grad.h" +#include "backend/common/pass/convert_const_scalar_to_tensor.h" +#include "backend/common/pass/convert_attr_to_unify_mindir.h" +#include "backend/common/pass/add_training_attr.h" +#include "backend/common/pass/optimize_updatestate.h" +#include "backend/common/pass/conv_transpose_to_conv_bp.h" +#include "backend/common/pass/reduce_sum_optimizer.h" +#include "backend/common/pass/add_dynamic_shape_attr.h" +#include "backend/common/pass/add_akg_kernel_attrs.h" +#include "backend/common/pass/sparse_process.h" #include "utils/ms_context.h" #include "debug/anf_ir_dump.h" diff --git a/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.h b/mindspore/ccsrc/backend/common/optimizer/common_backend_optimization.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.h rename to mindspore/ccsrc/backend/common/optimizer/common_backend_optimization.h index ac033a999b..5ad9f78f8e 100644 --- a/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.h +++ b/mindspore/ccsrc/backend/common/optimizer/common_backend_optimization.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_COMMON_COMMON_BACKEND_OPTIMIZATION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_COMMON_COMMON_BACKEND_OPTIMIZATION_H_ #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { void BackendCommonOptimization(const std::shared_ptr &kernel_graph); diff --git a/mindspore/ccsrc/backend/optimizer/common/const_input_to_attr_registry.cc b/mindspore/ccsrc/backend/common/optimizer/const_input_to_attr_registry.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/common/const_input_to_attr_registry.cc rename to mindspore/ccsrc/backend/common/optimizer/const_input_to_attr_registry.cc index 5c3868ffc4..fbe32c7c8e 100644 --- a/mindspore/ccsrc/backend/optimizer/common/const_input_to_attr_registry.cc +++ b/mindspore/ccsrc/backend/common/optimizer/const_input_to_attr_registry.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/common/const_input_to_attr_registry.h" +#include "backend/common/optimizer/const_input_to_attr_registry.h" #include "utils/utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/backend/optimizer/common/const_input_to_attr_registry.h b/mindspore/ccsrc/backend/common/optimizer/const_input_to_attr_registry.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/common/const_input_to_attr_registry.h rename to mindspore/ccsrc/backend/common/optimizer/const_input_to_attr_registry.h diff --git a/mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.cc b/mindspore/ccsrc/backend/common/optimizer/fusion_id_allocator.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.cc rename to mindspore/ccsrc/backend/common/optimizer/fusion_id_allocator.cc index adbd450df4..f2ebecefe6 100644 --- a/mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.cc +++ b/mindspore/ccsrc/backend/common/optimizer/fusion_id_allocator.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/common/fusion_id_allocator.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/fusion_id_allocator.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.h b/mindspore/ccsrc/backend/common/optimizer/fusion_id_allocator.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/common/fusion_id_allocator.h rename to mindspore/ccsrc/backend/common/optimizer/fusion_id_allocator.h diff --git a/mindspore/ccsrc/backend/optimizer/common/helper.cc b/mindspore/ccsrc/backend/common/optimizer/helper.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/common/helper.cc rename to mindspore/ccsrc/backend/common/optimizer/helper.cc index 92d485bc50..86ba1b311d 100644 --- a/mindspore/ccsrc/backend/optimizer/common/helper.cc +++ b/mindspore/ccsrc/backend/common/optimizer/helper.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include #include #include @@ -24,16 +24,16 @@ #include "utils/hash_set.h" #include "utils/utils.h" #include "base/base_ref.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" #include "frontend/operator/ops.h" #include "utils/ms_utils.h" #include "utils/convert_utils.h" #include "runtime/device/kernel_info.h" #include "utils/ms_context.h" #include "utils/trace_base.h" -#include "backend/optimizer/common/const_input_to_attr_registry.h" +#include "backend/common/optimizer/const_input_to_attr_registry.h" #include "abstract/primitive_infer_map.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/common/helper.h b/mindspore/ccsrc/backend/common/optimizer/helper.h similarity index 99% rename from mindspore/ccsrc/backend/optimizer/common/helper.h rename to mindspore/ccsrc/backend/common/optimizer/helper.h index d08bf84345..f53bff9b4e 100644 --- a/mindspore/ccsrc/backend/optimizer/common/helper.h +++ b/mindspore/ccsrc/backend/common/optimizer/helper.h @@ -23,9 +23,9 @@ #include #include "utils/hash_set.h" #include "ir/func_graph.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "utils/ms_utils.h" -#include "backend/optimizer/common/pattern_engine.h" +#include "backend/common/optimizer/pattern_engine.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/common/node_pass.cc b/mindspore/ccsrc/backend/common/optimizer/node_pass.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/common/node_pass.cc rename to mindspore/ccsrc/backend/common/optimizer/node_pass.cc index 7a644810aa..6663935c05 100644 --- a/mindspore/ccsrc/backend/optimizer/common/node_pass.cc +++ b/mindspore/ccsrc/backend/common/optimizer/node_pass.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/common/node_pass.h" +#include "backend/common/optimizer/node_pass.h" #include #include @@ -22,7 +22,7 @@ #include "ir/manager.h" #include "utils/hash_map.h" #include "utils/hash_set.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/common/node_pass.h b/mindspore/ccsrc/backend/common/optimizer/node_pass.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/common/node_pass.h rename to mindspore/ccsrc/backend/common/optimizer/node_pass.h index a790153f1b..00d7e6f822 100644 --- a/mindspore/ccsrc/backend/optimizer/common/node_pass.h +++ b/mindspore/ccsrc/backend/common/optimizer/node_pass.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/common/optimizer.cc b/mindspore/ccsrc/backend/common/optimizer/optimizer.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/common/optimizer.cc rename to mindspore/ccsrc/backend/common/optimizer/optimizer.cc index 053cf30087..61dbcc94ab 100644 --- a/mindspore/ccsrc/backend/optimizer/common/optimizer.cc +++ b/mindspore/ccsrc/backend/common/optimizer/optimizer.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include #include @@ -21,8 +21,8 @@ #include #include -#include "backend/optimizer/common/pass_manager.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/common/optimizer.h b/mindspore/ccsrc/backend/common/optimizer/optimizer.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/common/optimizer.h rename to mindspore/ccsrc/backend/common/optimizer/optimizer.h index 468a9b56d2..28eb7fd335 100644 --- a/mindspore/ccsrc/backend/optimizer/common/optimizer.h +++ b/mindspore/ccsrc/backend/common/optimizer/optimizer.h @@ -24,11 +24,11 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "ir/primitive.h" -#include "backend/optimizer/common/pass_manager.h" -#include "backend/optimizer/common/pattern_engine.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/optimizer/pattern_engine.h" #include "ir/graph_utils.h" #include "utils/ms_utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/common/pass.h b/mindspore/ccsrc/backend/common/optimizer/pass.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/common/pass.h rename to mindspore/ccsrc/backend/common/optimizer/pass.h diff --git a/mindspore/ccsrc/backend/optimizer/common/pass_manager.cc b/mindspore/ccsrc/backend/common/optimizer/pass_manager.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/common/pass_manager.cc rename to mindspore/ccsrc/backend/common/optimizer/pass_manager.cc index 96cd422091..a9654098cb 100644 --- a/mindspore/ccsrc/backend/optimizer/common/pass_manager.cc +++ b/mindspore/ccsrc/backend/common/optimizer/pass_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/optimizer/pass_manager.h" #include #include @@ -23,7 +23,7 @@ #include "ir/manager.h" #include "utils/ms_context.h" #include "debug/anf_ir_dump.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/common/pass_manager.h b/mindspore/ccsrc/backend/common/optimizer/pass_manager.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/common/pass_manager.h rename to mindspore/ccsrc/backend/common/optimizer/pass_manager.h index e72be44aed..d731b79cde 100644 --- a/mindspore/ccsrc/backend/optimizer/common/pass_manager.h +++ b/mindspore/ccsrc/backend/common/optimizer/pass_manager.h @@ -22,8 +22,8 @@ #include #include -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/node_pass.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/node_pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/common/pattern_engine.cc b/mindspore/ccsrc/backend/common/optimizer/pattern_engine.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/common/pattern_engine.cc rename to mindspore/ccsrc/backend/common/optimizer/pattern_engine.cc index cf30d76f5b..198a72a761 100644 --- a/mindspore/ccsrc/backend/optimizer/common/pattern_engine.cc +++ b/mindspore/ccsrc/backend/common/optimizer/pattern_engine.cc @@ -16,12 +16,12 @@ * limitations under the License. */ -#include "backend/optimizer/common/pattern_engine.h" +#include "backend/common/optimizer/pattern_engine.h" #include "frontend/optimizer/opt.h" #include "ir/anf.h" #include "utils/convert_utils_base.h" #include "utils/overload.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { static int GetNextTag() { diff --git a/mindspore/ccsrc/backend/optimizer/common/pattern_engine.h b/mindspore/ccsrc/backend/common/optimizer/pattern_engine.h similarity index 99% rename from mindspore/ccsrc/backend/optimizer/common/pattern_engine.h rename to mindspore/ccsrc/backend/common/optimizer/pattern_engine.h index 2625a914b0..cf6860b345 100644 --- a/mindspore/ccsrc/backend/optimizer/common/pattern_engine.h +++ b/mindspore/ccsrc/backend/common/optimizer/pattern_engine.h @@ -33,7 +33,7 @@ #include "utils/hash_map.h" #include "utils/hash_set.h" -#include "backend/optimizer/common/visit.h" +#include "backend/common/optimizer/visit.h" #include "base/base.h" #include "utils/log_adapter.h" #include "base/base_ref.h" diff --git a/mindspore/ccsrc/backend/optimizer/common/visit.cc b/mindspore/ccsrc/backend/common/optimizer/visit.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/common/visit.cc rename to mindspore/ccsrc/backend/common/optimizer/visit.cc index 70dd4ad825..5c0f05c643 100644 --- a/mindspore/ccsrc/backend/optimizer/common/visit.cc +++ b/mindspore/ccsrc/backend/common/optimizer/visit.cc @@ -16,12 +16,12 @@ * limitations under the License. */ -#include "backend/optimizer/common/visit.h" +#include "backend/common/optimizer/visit.h" #include #include #include -#include "backend/optimizer/common/pattern_engine.h" +#include "backend/common/optimizer/pattern_engine.h" #include "utils/any.h" #include "ir/anf.h" #include "ir/func_graph.h" diff --git a/mindspore/ccsrc/backend/optimizer/common/visit.h b/mindspore/ccsrc/backend/common/optimizer/visit.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/common/visit.h rename to mindspore/ccsrc/backend/common/optimizer/visit.h diff --git a/mindspore/ccsrc/backend/common/pass/CMakeLists.txt b/mindspore/ccsrc/backend/common/pass/CMakeLists.txt new file mode 100644 index 0000000000..ce4387719d --- /dev/null +++ b/mindspore/ccsrc/backend/common/pass/CMakeLists.txt @@ -0,0 +1,15 @@ +file(GLOB_RECURSE _PREACTIVATE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -Wno-user-defined-warnings -Wno-inconsistent-missing-override \ + -Wno-overloaded-virtual -Wno-unused-const-variable -Wno-pessimizing-move") +endif() + +set_property(SOURCE ${_PREACTIVATE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT) +add_library(_mindspore_backend_common_pass_obj OBJECT ${_PREACTIVATE_SRC_LIST}) diff --git a/mindspore/ccsrc/backend/optimizer/pass/add_akg_kernel_attrs.cc b/mindspore/ccsrc/backend/common/pass/add_akg_kernel_attrs.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/add_akg_kernel_attrs.cc rename to mindspore/ccsrc/backend/common/pass/add_akg_kernel_attrs.cc index cf0be9a901..ebe4786790 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/add_akg_kernel_attrs.cc +++ b/mindspore/ccsrc/backend/common/pass/add_akg_kernel_attrs.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/pass/add_akg_kernel_attrs.h" +#include "backend/common/pass/add_akg_kernel_attrs.h" #include #include #include #include "base/core_ops.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/add_akg_kernel_attrs.h b/mindspore/ccsrc/backend/common/pass/add_akg_kernel_attrs.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/add_akg_kernel_attrs.h rename to mindspore/ccsrc/backend/common/pass/add_akg_kernel_attrs.h index d613449a77..1abfa1bc33 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/add_akg_kernel_attrs.h +++ b/mindspore/ccsrc/backend/common/pass/add_akg_kernel_attrs.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_ADD_AKG_KERNEL_ATTRS_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_ADD_AKG_KERNEL_ATTRS_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/add_dynamic_shape_attr.cc b/mindspore/ccsrc/backend/common/pass/add_dynamic_shape_attr.cc similarity index 89% rename from mindspore/ccsrc/backend/optimizer/pass/add_dynamic_shape_attr.cc rename to mindspore/ccsrc/backend/common/pass/add_dynamic_shape_attr.cc index c1460dfa64..17c5c78ed2 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/add_dynamic_shape_attr.cc +++ b/mindspore/ccsrc/backend/common/pass/add_dynamic_shape_attr.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/pass/add_dynamic_shape_attr.h" +#include "backend/common/pass/add_dynamic_shape_attr.h" #include "ir/anf.h" #include "utils/convert_utils.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/add_dynamic_shape_attr.h b/mindspore/ccsrc/backend/common/pass/add_dynamic_shape_attr.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/add_dynamic_shape_attr.h rename to mindspore/ccsrc/backend/common/pass/add_dynamic_shape_attr.h index e21cecba45..60b35d3414 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/add_dynamic_shape_attr.h +++ b/mindspore/ccsrc/backend/common/pass/add_dynamic_shape_attr.h @@ -19,7 +19,7 @@ #include #include "ir/anf.h" #include "utils/convert_utils.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { class AddDynamicShapeAttr : public PatternProcessPass { diff --git a/mindspore/ccsrc/backend/optimizer/pass/add_training_attr.cc b/mindspore/ccsrc/backend/common/pass/add_training_attr.cc similarity index 89% rename from mindspore/ccsrc/backend/optimizer/pass/add_training_attr.cc rename to mindspore/ccsrc/backend/common/pass/add_training_attr.cc index 4a1a739f7b..5d06d3443d 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/add_training_attr.cc +++ b/mindspore/ccsrc/backend/common/pass/add_training_attr.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/pass/add_training_attr.h" +#include "backend/common/pass/add_training_attr.h" #include #include @@ -23,10 +23,10 @@ #include "utils/hash_map.h" #include "utils/hash_set.h" #include "ir/graph_utils.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 "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/add_training_attr.h b/mindspore/ccsrc/backend/common/pass/add_training_attr.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/pass/add_training_attr.h rename to mindspore/ccsrc/backend/common/pass/add_training_attr.h index 5fb6cc76b6..d54f99a4df 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/add_training_attr.h +++ b/mindspore/ccsrc/backend/common/pass/add_training_attr.h @@ -20,7 +20,7 @@ #include "ir/anf.h" #include "utils/convert_utils.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.cc b/mindspore/ccsrc/backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.cc rename to mindspore/ccsrc/backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.cc index 12b3f7dcbf..4542ed2b6e 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.cc +++ b/mindspore/ccsrc/backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h" +#include "backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h b/mindspore/ccsrc/backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h rename to mindspore/ccsrc/backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h index ac7cb665db..84a1033228 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h +++ b/mindspore/ccsrc/backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h @@ -21,11 +21,11 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.cc b/mindspore/ccsrc/backend/common/pass/common_subexpression_elimination.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.cc rename to mindspore/ccsrc/backend/common/pass/common_subexpression_elimination.cc index 1a25a49161..3c9693ecaf 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.cc +++ b/mindspore/ccsrc/backend/common/pass/common_subexpression_elimination.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/common_subexpression_elimination.h" +#include "backend/common/pass/common_subexpression_elimination.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "utils/flags.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.h b/mindspore/ccsrc/backend/common/pass/common_subexpression_elimination.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.h rename to mindspore/ccsrc/backend/common/pass/common_subexpression_elimination.h index 7888591557..ac9a809d49 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/common_subexpression_elimination.h +++ b/mindspore/ccsrc/backend/common/pass/common_subexpression_elimination.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_COMMON_SUBEXPRESSION_ELIMINATION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_COMMON_SUBEXPRESSION_ELIMINATION_H_ #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "frontend/optimizer/cse.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc b/mindspore/ccsrc/backend/common/pass/communication_op_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc rename to mindspore/ccsrc/backend/common/pass/communication_op_fusion.cc index 135a25c758..4cd1484e5e 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.cc +++ b/mindspore/ccsrc/backend/common/pass/communication_op_fusion.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/communication_op_fusion.h" +#include "backend/common/pass/communication_op_fusion.h" #include #include @@ -23,9 +23,9 @@ #include "ir/graph_utils.h" #include "base/core_ops.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/optimizer/helper.h" #include "frontend/parallel/context.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.h b/mindspore/ccsrc/backend/common/pass/communication_op_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.h rename to mindspore/ccsrc/backend/common/pass/communication_op_fusion.h index 5060e76883..eee1d6850b 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/communication_op_fusion.h +++ b/mindspore/ccsrc/backend/common/pass/communication_op_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc b/mindspore/ccsrc/backend/common/pass/const_to_attr_strided_slice_grad.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc rename to mindspore/ccsrc/backend/common/pass/const_to_attr_strided_slice_grad.cc index 2652bc7726..c0be520d84 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc +++ b/mindspore/ccsrc/backend/common/pass/const_to_attr_strided_slice_grad.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/const_to_attr_strided_slice_grad.h" +#include "backend/common/pass/const_to_attr_strided_slice_grad.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/ms_context.h" #include "utils/utils.h" #include "abstract/abstract_value.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.h b/mindspore/ccsrc/backend/common/pass/const_to_attr_strided_slice_grad.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.h rename to mindspore/ccsrc/backend/common/pass/const_to_attr_strided_slice_grad.h index ef0a6f8ae9..ff7213023e 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.h +++ b/mindspore/ccsrc/backend/common/pass/const_to_attr_strided_slice_grad.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_CONST_TO_ATTR_STRIDED_SLICE_GRAD_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/conv_transpose_to_conv_bp.cc b/mindspore/ccsrc/backend/common/pass/conv_transpose_to_conv_bp.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/pass/conv_transpose_to_conv_bp.cc rename to mindspore/ccsrc/backend/common/pass/conv_transpose_to_conv_bp.cc index 07ffb196c0..59b370fac4 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/conv_transpose_to_conv_bp.cc +++ b/mindspore/ccsrc/backend/common/pass/conv_transpose_to_conv_bp.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/conv_transpose_to_conv_bp.h" +#include "backend/common/pass/conv_transpose_to_conv_bp.h" #include #include #include "ir/primitive.h" #include "utils/utils.h" #include "utils/trace_base.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/conv_transpose_to_conv_bp.h b/mindspore/ccsrc/backend/common/pass/conv_transpose_to_conv_bp.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/conv_transpose_to_conv_bp.h rename to mindspore/ccsrc/backend/common/pass/conv_transpose_to_conv_bp.h index 367c7ceca2..b5d5f16c13 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/conv_transpose_to_conv_bp.h +++ b/mindspore/ccsrc/backend/common/pass/conv_transpose_to_conv_bp.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_CONV_TRANSPOSE_TO_CONV_BP_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_attr_to_unify_mindir.cc b/mindspore/ccsrc/backend/common/pass/convert_attr_to_unify_mindir.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/pass/convert_attr_to_unify_mindir.cc rename to mindspore/ccsrc/backend/common/pass/convert_attr_to_unify_mindir.cc index 6df79d7fa9..3d5abc71b2 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_attr_to_unify_mindir.cc +++ b/mindspore/ccsrc/backend/common/pass/convert_attr_to_unify_mindir.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/convert_attr_to_unify_mindir.h" +#include "backend/common/pass/convert_attr_to_unify_mindir.h" #include #include "utils/check_convert_utils.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_attr_to_unify_mindir.h b/mindspore/ccsrc/backend/common/pass/convert_attr_to_unify_mindir.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/convert_attr_to_unify_mindir.h rename to mindspore/ccsrc/backend/common/pass/convert_attr_to_unify_mindir.h index f599073c16..3ecf5f58cf 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_attr_to_unify_mindir.h +++ b/mindspore/ccsrc/backend/common/pass/convert_attr_to_unify_mindir.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_CONVERT_ATTR_TO_UNIFY_MINDIR_H_ #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc b/mindspore/ccsrc/backend/common/pass/convert_const_input_to_attr.cc similarity index 90% rename from mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc rename to mindspore/ccsrc/backend/common/pass/convert_const_input_to_attr.cc index 78506fe2a3..8e10298e34 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc +++ b/mindspore/ccsrc/backend/common/pass/convert_const_input_to_attr.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/convert_const_input_to_attr.h" -#include "backend/optimizer/common/const_input_to_attr_registry.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/pass/convert_const_input_to_attr.h" +#include "backend/common/optimizer/const_input_to_attr_registry.h" +#include "backend/common/optimizer/helper.h" #include "utils/utils.h" #include "utils/ms_context.h" #include "base/core_ops.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.h b/mindspore/ccsrc/backend/common/pass/convert_const_input_to_attr.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.h rename to mindspore/ccsrc/backend/common/pass/convert_const_input_to_attr.h index 303ffdcc9e..274359949c 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.h +++ b/mindspore/ccsrc/backend/common/pass/convert_const_input_to_attr.h @@ -20,7 +20,7 @@ #include "utils/hash_map.h" #include "utils/hash_set.h" #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc b/mindspore/ccsrc/backend/common/pass/convert_const_input_to_tensor_input.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc rename to mindspore/ccsrc/backend/common/pass/convert_const_input_to_tensor_input.cc index 8703e125b4..a60d09e452 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.cc +++ b/mindspore/ccsrc/backend/common/pass/convert_const_input_to_tensor_input.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/convert_const_input_to_tensor_input.h" +#include "backend/common/pass/convert_const_input_to_tensor_input.h" #include #include #include #include "ir/graph_utils.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 "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h b/mindspore/ccsrc/backend/common/pass/convert_const_input_to_tensor_input.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h rename to mindspore/ccsrc/backend/common/pass/convert_const_input_to_tensor_input.h index 06e7e6a699..3169acfd34 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_tensor_input.h +++ b/mindspore/ccsrc/backend/common/pass/convert_const_input_to_tensor_input.h @@ -19,7 +19,7 @@ #include "ir/anf.h" #include "utils/convert_utils.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.cc b/mindspore/ccsrc/backend/common/pass/convert_const_scalar_to_tensor.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.cc rename to mindspore/ccsrc/backend/common/pass/convert_const_scalar_to_tensor.cc index 4ba62de788..6130b3ee26 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.cc +++ b/mindspore/ccsrc/backend/common/pass/convert_const_scalar_to_tensor.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/convert_const_scalar_to_tensor.h" +#include "backend/common/pass/convert_const_scalar_to_tensor.h" #include #include #include "utils/convert_utils.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.h b/mindspore/ccsrc/backend/common/pass/convert_const_scalar_to_tensor.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.h rename to mindspore/ccsrc/backend/common/pass/convert_const_scalar_to_tensor.h index 520da08b45..f0cefd4977 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_scalar_to_tensor.h +++ b/mindspore/ccsrc/backend/common/pass/convert_const_scalar_to_tensor.h @@ -18,7 +18,7 @@ #include #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.cc b/mindspore/ccsrc/backend/common/pass/convert_tuple_input_to_dynamic_input.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.cc rename to mindspore/ccsrc/backend/common/pass/convert_tuple_input_to_dynamic_input.cc index e28dbe76a7..fd2fcf5ff7 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.cc +++ b/mindspore/ccsrc/backend/common/pass/convert_tuple_input_to_dynamic_input.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h" +#include "backend/common/pass/convert_tuple_input_to_dynamic_input.h" #include #include -#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 "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/common_utils.h" #include "runtime/device/kernel_info.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h b/mindspore/ccsrc/backend/common/pass/convert_tuple_input_to_dynamic_input.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h rename to mindspore/ccsrc/backend/common/pass/convert_tuple_input_to_dynamic_input.h index 34b566b0d8..ee2335dbf7 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_input_to_dynamic_input.h +++ b/mindspore/ccsrc/backend/common/pass/convert_tuple_input_to_dynamic_input.h @@ -20,7 +20,7 @@ #include #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.cc b/mindspore/ccsrc/backend/common/pass/convert_tuple_output_to_maketuple.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.cc rename to mindspore/ccsrc/backend/common/pass/convert_tuple_output_to_maketuple.cc index 5b5275393d..c3ff2d4368 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.cc +++ b/mindspore/ccsrc/backend/common/pass/convert_tuple_output_to_maketuple.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/convert_tuple_output_to_maketuple.h" +#include "backend/common/pass/convert_tuple_output_to_maketuple.h" #include #include #include "utils/hash_map.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.h b/mindspore/ccsrc/backend/common/pass/convert_tuple_output_to_maketuple.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.h rename to mindspore/ccsrc/backend/common/pass/convert_tuple_output_to_maketuple.h index 9ff5ca91ed..6ae75cf0e7 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_tuple_output_to_maketuple.h +++ b/mindspore/ccsrc/backend/common/pass/convert_tuple_output_to_maketuple.h @@ -20,7 +20,7 @@ #include #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/custom_op_const_input_to_attr.cc b/mindspore/ccsrc/backend/common/pass/custom_op_const_input_to_attr.cc similarity index 89% rename from mindspore/ccsrc/backend/optimizer/pass/custom_op_const_input_to_attr.cc rename to mindspore/ccsrc/backend/common/pass/custom_op_const_input_to_attr.cc index f8ea07e8a9..d9fa98b4a1 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/custom_op_const_input_to_attr.cc +++ b/mindspore/ccsrc/backend/common/pass/custom_op_const_input_to_attr.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/custom_op_const_input_to_attr.h" +#include "backend/common/pass/custom_op_const_input_to_attr.h" #include #include "utils/hash_set.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/custom_op_const_input_to_attr.h b/mindspore/ccsrc/backend/common/pass/custom_op_const_input_to_attr.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/custom_op_const_input_to_attr.h rename to mindspore/ccsrc/backend/common/pass/custom_op_const_input_to_attr.h index 3bc7cfd65d..4b9b8bd3a3 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/custom_op_const_input_to_attr.h +++ b/mindspore/ccsrc/backend/common/pass/custom_op_const_input_to_attr.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_CUSTOM_OP_CONST_INPUT_TO_ATTR_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_CUSTOM_OP_CONST_INPUT_TO_ATTR_H_ #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/custom_op_reg_info_to_attr.cc b/mindspore/ccsrc/backend/common/pass/custom_op_reg_info_to_attr.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/custom_op_reg_info_to_attr.cc rename to mindspore/ccsrc/backend/common/pass/custom_op_reg_info_to_attr.cc index 65eaa3ff70..086c0e0e72 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/custom_op_reg_info_to_attr.cc +++ b/mindspore/ccsrc/backend/common/pass/custom_op_reg_info_to_attr.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/custom_op_reg_info_to_attr.h" +#include "backend/common/pass/custom_op_reg_info_to_attr.h" #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/oplib/opinfo.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/oplib/opinfo.h" +#include "kernel/oplib/oplib.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/custom_op_reg_info_to_attr.h b/mindspore/ccsrc/backend/common/pass/custom_op_reg_info_to_attr.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/custom_op_reg_info_to_attr.h rename to mindspore/ccsrc/backend/common/pass/custom_op_reg_info_to_attr.h index 8ad9708d71..b8a3ac7728 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/custom_op_reg_info_to_attr.h +++ b/mindspore/ccsrc/backend/common/pass/custom_op_reg_info_to_attr.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_CUSTOM_OP_REG_INFO_TO_ATTR_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_CUSTOM_OP_REG_INFO_TO_ATTR_H_ #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/eliminate_func_data_type.cc b/mindspore/ccsrc/backend/common/pass/eliminate_func_data_type.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/eliminate_func_data_type.cc rename to mindspore/ccsrc/backend/common/pass/eliminate_func_data_type.cc index b5b4921eab..331a1514da 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/eliminate_func_data_type.cc +++ b/mindspore/ccsrc/backend/common/pass/eliminate_func_data_type.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/pass/eliminate_func_data_type.h" +#include "backend/common/pass/eliminate_func_data_type.h" #include #include #include "ir/anf.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/optimizer/helper.h" namespace mindspore::opt { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/pass/eliminate_func_data_type.h b/mindspore/ccsrc/backend/common/pass/eliminate_func_data_type.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/pass/eliminate_func_data_type.h rename to mindspore/ccsrc/backend/common/pass/eliminate_func_data_type.h index b52c02d11d..4af45ce3b0 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/eliminate_func_data_type.h +++ b/mindspore/ccsrc/backend/common/pass/eliminate_func_data_type.h @@ -19,8 +19,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pattern_engine.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pattern_engine.h" // In control flow case, the function data type wil existed in graph to avoid expanding closures. // The function data type will be processed in mindRT, but it is not supported in kernel graph. diff --git a/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc b/mindspore/ccsrc/backend/common/pass/eliminate_redundant_op.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc rename to mindspore/ccsrc/backend/common/pass/eliminate_redundant_op.cc index 6ece5200f6..f987cd67c4 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.cc +++ b/mindspore/ccsrc/backend/common/pass/eliminate_redundant_op.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/optimizer/pass/eliminate_redundant_op.h" +#include "backend/common/pass/eliminate_redundant_op.h" #include #include #include "utils/hash_map.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "base/core_ops.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.h b/mindspore/ccsrc/backend/common/pass/eliminate_redundant_op.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.h rename to mindspore/ccsrc/backend/common/pass/eliminate_redundant_op.h index 6f1968e855..78970a2b80 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/eliminate_redundant_op.h +++ b/mindspore/ccsrc/backend/common/pass/eliminate_redundant_op.h @@ -22,8 +22,8 @@ #include #include "utils/hash_map.h" #include "ir/anf.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.cc b/mindspore/ccsrc/backend/common/pass/erase_visit_attr.cc similarity index 84% rename from mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.cc rename to mindspore/ccsrc/backend/common/pass/erase_visit_attr.cc index 4cb660f24b..c9ffd898ce 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.cc +++ b/mindspore/ccsrc/backend/common/pass/erase_visit_attr.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/pass/erase_visit_attr.h" +#include "backend/common/pass/erase_visit_attr.h" #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "kernel/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.h b/mindspore/ccsrc/backend/common/pass/erase_visit_attr.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.h rename to mindspore/ccsrc/backend/common/pass/erase_visit_attr.h index e5c47d0f1d..1f2b11dff4 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/erase_visit_attr.h +++ b/mindspore/ccsrc/backend/common/pass/erase_visit_attr.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_ERASE_VISIT_ATTR_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc b/mindspore/ccsrc/backend/common/pass/getitem_tuple.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc rename to mindspore/ccsrc/backend/common/pass/getitem_tuple.cc index 4222d81757..764c35d5cd 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.cc +++ b/mindspore/ccsrc/backend/common/pass/getitem_tuple.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/pass/getitem_tuple.h" +#include "backend/common/pass/getitem_tuple.h" #include #include "base/core_ops.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.h b/mindspore/ccsrc/backend/common/pass/getitem_tuple.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.h rename to mindspore/ccsrc/backend/common/pass/getitem_tuple.h index ca29e53d2b..8a6f4f9212 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/getitem_tuple.h +++ b/mindspore/ccsrc/backend/common/pass/getitem_tuple.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_GETITEM_TUPLE_SPLIT_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_GETITEM_TUPLE_SPLIT_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc b/mindspore/ccsrc/backend/common/pass/optimize_dependence.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc rename to mindspore/ccsrc/backend/common/pass/optimize_dependence.cc index 7762cc7b41..f399b22608 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.cc +++ b/mindspore/ccsrc/backend/common/pass/optimize_dependence.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "backend/optimizer/pass/optimize_dependence.h" +#include "backend/common/pass/optimize_dependence.h" #include #include #include #include -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "base/core_ops.h" #include "utils/utils.h" #include "utils/trace_base.h" -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.h b/mindspore/ccsrc/backend/common/pass/optimize_dependence.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.h rename to mindspore/ccsrc/backend/common/pass/optimize_dependence.h index c1b2f53d71..4f3e5c3249 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/optimize_dependence.h +++ b/mindspore/ccsrc/backend/common/pass/optimize_dependence.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_OPTIMIZE_DEPENDENCE_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_OPTIMIZE_DEPENDENCE_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/optimize_updatestate.cc b/mindspore/ccsrc/backend/common/pass/optimize_updatestate.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/pass/optimize_updatestate.cc rename to mindspore/ccsrc/backend/common/pass/optimize_updatestate.cc index 8cce881275..d5c9f64ac5 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/optimize_updatestate.cc +++ b/mindspore/ccsrc/backend/common/pass/optimize_updatestate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/pass/optimize_updatestate.h" +#include "backend/common/pass/optimize_updatestate.h" #include #include #include diff --git a/mindspore/ccsrc/backend/optimizer/pass/optimize_updatestate.h b/mindspore/ccsrc/backend/common/pass/optimize_updatestate.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/optimize_updatestate.h rename to mindspore/ccsrc/backend/common/pass/optimize_updatestate.h index 937ba45703..6351be3293 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/optimize_updatestate.h +++ b/mindspore/ccsrc/backend/common/pass/optimize_updatestate.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_OPTIMIZE_UPDATESTATE_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_OPTIMIZE_UPDATESTATE_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/reduce_sum_optimizer.cc b/mindspore/ccsrc/backend/common/pass/reduce_sum_optimizer.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/pass/reduce_sum_optimizer.cc rename to mindspore/ccsrc/backend/common/pass/reduce_sum_optimizer.cc index 5b1da7f2e2..72c9579800 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/reduce_sum_optimizer.cc +++ b/mindspore/ccsrc/backend/common/pass/reduce_sum_optimizer.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/optimizer/pass/reduce_sum_optimizer.h" +#include "backend/common/pass/reduce_sum_optimizer.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/reduce_sum_optimizer.h b/mindspore/ccsrc/backend/common/pass/reduce_sum_optimizer.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/pass/reduce_sum_optimizer.h rename to mindspore/ccsrc/backend/common/pass/reduce_sum_optimizer.h index d7d745b2c1..40cb378db8 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/reduce_sum_optimizer.h +++ b/mindspore/ccsrc/backend/common/pass/reduce_sum_optimizer.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_REDUCE_SUM_OPTIMIZER_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_PASS_REDUCE_SUM_OPTIMIZER_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.cc b/mindspore/ccsrc/backend/common/pass/replace_node_by_proxy.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.cc rename to mindspore/ccsrc/backend/common/pass/replace_node_by_proxy.cc index 142f5588cb..78bb649651 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.cc +++ b/mindspore/ccsrc/backend/common/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 "backend/optimizer/pass/replace_node_by_proxy.h" +#include "backend/common/pass/replace_node_by_proxy.h" #include #include #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.h b/mindspore/ccsrc/backend/common/pass/replace_node_by_proxy.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.h rename to mindspore/ccsrc/backend/common/pass/replace_node_by_proxy.h index 0ecd8f3ed2..92e77c6c07 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/replace_node_by_proxy.h +++ b/mindspore/ccsrc/backend/common/pass/replace_node_by_proxy.h @@ -19,11 +19,11 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" #include "utils/utils.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/sparse_process.cc b/mindspore/ccsrc/backend/common/pass/sparse_process.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/pass/sparse_process.cc rename to mindspore/ccsrc/backend/common/pass/sparse_process.cc index 3ed0cd74b1..483353fd83 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/sparse_process.cc +++ b/mindspore/ccsrc/backend/common/pass/sparse_process.cc @@ -16,13 +16,13 @@ #include #include -#include "backend/optimizer/pass/sparse_process.h" +#include "backend/common/pass/sparse_process.h" #include "ir/anf.h" #include "utils/convert_utils.h" #include "utils/anf_utils.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/sparse_process.h b/mindspore/ccsrc/backend/common/pass/sparse_process.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/pass/sparse_process.h rename to mindspore/ccsrc/backend/common/pass/sparse_process.h index baaf2c48ce..a65d471ca7 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/sparse_process.h +++ b/mindspore/ccsrc/backend/common/pass/sparse_process.h @@ -19,7 +19,7 @@ #include "ir/anf.h" #include "utils/convert_utils.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/session/CMakeLists.txt b/mindspore/ccsrc/backend/common/session/CMakeLists.txt similarity index 91% rename from mindspore/ccsrc/backend/session/CMakeLists.txt rename to mindspore/ccsrc/backend/common/session/CMakeLists.txt index 136880690d..98c92bed90 100644 --- a/mindspore/ccsrc/backend/session/CMakeLists.txt +++ b/mindspore/ccsrc/backend/common/session/CMakeLists.txt @@ -34,9 +34,9 @@ if(ENABLE_D) "ascend_control_parser.cc" "ascend_auto_monad.cc" "ascend_inference_session.cc" - ) + ) list(APPEND _SESSION_SRC_LIST ${_D_SRC_LIST}) endif() set_property(SOURCE ${_SESSION_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_SESSION) -add_library(_mindspore_backend_session_obj OBJECT ${_SESSION_SRC_LIST}) +add_library(_mindspore_backend_common_session_obj OBJECT ${_SESSION_SRC_LIST}) diff --git a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc b/mindspore/ccsrc/backend/common/session/anf_runtime_algorithm.cc similarity index 99% rename from mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc rename to mindspore/ccsrc/backend/common/session/anf_runtime_algorithm.cc index d6dbcbba41..3f45ed5e9a 100644 --- a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc +++ b/mindspore/ccsrc/backend/common/session/anf_runtime_algorithm.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include #include #include @@ -28,9 +28,9 @@ #include "frontend/parallel/context.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 "backend/common/optimizer/helper.h" +#include "kernel/kernel.h" +#include "kernel/kernel_build_info.h" #include "utils/ms_device_shape_transfer.h" #include "abstract/param_validator.h" #include "pipeline/jit/static_analysis/static_analysis.h" diff --git a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.h b/mindspore/ccsrc/backend/common/session/anf_runtime_algorithm.h similarity index 99% rename from mindspore/ccsrc/backend/session/anf_runtime_algorithm.h rename to mindspore/ccsrc/backend/common/session/anf_runtime_algorithm.h index f39f7aaabe..447e8e74fe 100644 --- a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.h +++ b/mindspore/ccsrc/backend/common/session/anf_runtime_algorithm.h @@ -31,12 +31,12 @@ #include "ir/primitive.h" #include "ir/kernel_info_dev.h" #include "runtime/device/device_address.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel.h" +#include "kernel/kernel_build_info.h" #include "base/core_ops.h" #include "utils/contract.h" #include "utils/anf_utils.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/backend/session/ascend_auto_monad.cc b/mindspore/ccsrc/backend/common/session/ascend_auto_monad.cc similarity index 99% rename from mindspore/ccsrc/backend/session/ascend_auto_monad.cc rename to mindspore/ccsrc/backend/common/session/ascend_auto_monad.cc index e1cbe81537..b6fa12016b 100644 --- a/mindspore/ccsrc/backend/session/ascend_auto_monad.cc +++ b/mindspore/ccsrc/backend/common/session/ascend_auto_monad.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/session/ascend_auto_monad.h" +#include "backend/common/session/ascend_auto_monad.h" #include #include #include @@ -30,8 +30,8 @@ #include "base/core_ops.h" #include "debug/anf_ir_dump.h" #include "pipeline/jit/base.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "runtime/device/ascend/kernel_select_ascend.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/kernel_select_ascend.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/backend/session/ascend_auto_monad.h b/mindspore/ccsrc/backend/common/session/ascend_auto_monad.h similarity index 96% rename from mindspore/ccsrc/backend/session/ascend_auto_monad.h rename to mindspore/ccsrc/backend/common/session/ascend_auto_monad.h index 3238852ce8..e86e677b74 100644 --- a/mindspore/ccsrc/backend/session/ascend_auto_monad.h +++ b/mindspore/ccsrc/backend/common/session/ascend_auto_monad.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_SESSION_ASCEND_AUTO_MONAD_H #define MINDSPORE_CCSRC_BACKEND_SESSION_ASCEND_AUTO_MONAD_H -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/backend/session/ascend_inference_session.cc b/mindspore/ccsrc/backend/common/session/ascend_inference_session.cc similarity index 98% rename from mindspore/ccsrc/backend/session/ascend_inference_session.cc rename to mindspore/ccsrc/backend/common/session/ascend_inference_session.cc index fcf6829da8..09e5e73cc8 100644 --- a/mindspore/ccsrc/backend/session/ascend_inference_session.cc +++ b/mindspore/ccsrc/backend/common/session/ascend_inference_session.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/session/ascend_inference_session.h" +#include "backend/common/session/ascend_inference_session.h" #include #include "ir/tensor.h" #include "ir/anf.h" #include "ir/param_info.h" #include "runtime/device/kernel_runtime.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_utils.h" #include "utils/ms_device_shape_transfer.h" #include "utils/config_manager.h" diff --git a/mindspore/ccsrc/backend/session/ascend_inference_session.h b/mindspore/ccsrc/backend/common/session/ascend_inference_session.h similarity index 91% rename from mindspore/ccsrc/backend/session/ascend_inference_session.h rename to mindspore/ccsrc/backend/common/session/ascend_inference_session.h index bc9462c82c..0f19980099 100644 --- a/mindspore/ccsrc/backend/session/ascend_inference_session.h +++ b/mindspore/ccsrc/backend/common/session/ascend_inference_session.h @@ -24,10 +24,10 @@ #include #include #include "utils/hash_map.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/common/session/ascend_session.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/session_factory.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/backend/session/ascend_session.cc b/mindspore/ccsrc/backend/common/session/ascend_session.cc similarity index 98% rename from mindspore/ccsrc/backend/session/ascend_session.cc rename to mindspore/ccsrc/backend/common/session/ascend_session.cc index e3638264a2..a9fc9b7a3e 100644 --- a/mindspore/ccsrc/backend/session/ascend_session.cc +++ b/mindspore/ccsrc/backend/common/session/ascend_session.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/session/ascend_session.h" +#include "backend/common/session/ascend_session.h" #include #include #include @@ -28,20 +28,20 @@ #include "ir/anf.h" #include "utils/ms_device_shape_transfer.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/profiling/profiling_manager.h" -#include "runtime/device/ascend/ascend_memory_adapter.h" -#include "backend/optimizer/ascend/ascend_backend_optimization.h" -#include "backend/optimizer/common/common_backend_optimization.h" +#include "plugin/device/ascend/hal/device/kernel_select_ascend.h" +#include "plugin/device/ascend/hal/device/kernel_build_ascend.h" +#include "plugin/device/ascend/hal/device/ascend_kernel_runtime.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" +#include "plugin/device/ascend/hal/device/ascend_memory_adapter.h" +#include "plugin/device/ascend/optimizer/ascend_backend_optimization.h" +#include "backend/common/optimizer/common_backend_optimization.h" #include "runtime/device/kernel_adjust.h" -#include "runtime/device/ascend/ascend_stream_assign.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ascend_stream_assign.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_utils.h" #include "utils/utils.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_runtime_manager.h" #include "utils/config_manager.h" #ifndef ENABLE_SECURITY @@ -50,8 +50,8 @@ #include "debug/debugger/debugger_utils.h" #endif #include "debug/anf_ir_utils.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h" -#include "backend/session/ascend_auto_monad.h" +#include "common/graph_kernel/adapter/graph_kernel_optimization.h" +#include "backend/common/session/ascend_auto_monad.h" #include "debug/anf_ir_dump.h" #include "debug/dump_proto.h" #include "abstract/utils.h" @@ -73,7 +73,7 @@ #include "ps/util.h" #include "ps/ps_cache/ps_cache_manager.h" #endif -#include "runtime/device/ascend/ascend_bucket.h" +#include "plugin/device/ascend/hal/device/ascend_bucket.h" #ifndef ENABLE_SECURITY #include "profiler/device/ascend/memory_profiling.h" diff --git a/mindspore/ccsrc/backend/session/ascend_session.h b/mindspore/ccsrc/backend/common/session/ascend_session.h similarity index 97% rename from mindspore/ccsrc/backend/session/ascend_session.h rename to mindspore/ccsrc/backend/common/session/ascend_session.h index 19c37380f0..458d897f1b 100644 --- a/mindspore/ccsrc/backend/session/ascend_session.h +++ b/mindspore/ccsrc/backend/common/session/ascend_session.h @@ -26,11 +26,11 @@ #include #include #include "utils/hash_map.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/pynative_task_manager.h" +#include "backend/common/session/session_basic.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/session_factory.h" +#include "backend/common/session/pynative_task_manager.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/backend/session/cpu_session.cc b/mindspore/ccsrc/backend/common/session/cpu_session.cc similarity index 95% rename from mindspore/ccsrc/backend/session/cpu_session.cc rename to mindspore/ccsrc/backend/common/session/cpu_session.cc index 96df5bf82e..8d2f9ec7c5 100644 --- a/mindspore/ccsrc/backend/session/cpu_session.cc +++ b/mindspore/ccsrc/backend/common/session/cpu_session.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/session/cpu_session.h" +#include "backend/common/session/cpu_session.h" #include #include #include @@ -22,20 +22,20 @@ #include "utils/ms_utils.h" #include "utils/trace_base.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_runtime.h" -#include "backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "runtime/device/cpu/kernel_select_cpu.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" -#include "backend/optimizer/cpu/insert_cast_cpu.h" -#include "backend/optimizer/cpu/insert_format_transform_op.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h" -#include "backend/optimizer/pass/replace_node_by_proxy.h" -#include "backend/optimizer/pass/erase_visit_attr.h" +#include "plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/hal/device/kernel_select_cpu.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "plugin/device/cpu/optimizer/insert_cast_cpu.h" +#include "plugin/device/cpu/optimizer/insert_format_transform_op.h" +#include "common/graph_kernel/adapter/graph_kernel_optimization.h" +#include "backend/common/pass/replace_node_by_proxy.h" +#include "backend/common/pass/erase_visit_attr.h" #include "debug/anf_ir_dump.h" -#include "backend/optimizer/common/common_backend_optimization.h" +#include "backend/common/optimizer/common_backend_optimization.h" #include "debug/dump_proto.h" #ifndef ENABLE_SECURITY #include "debug/data_dump/dump_json_parser.h" diff --git a/mindspore/ccsrc/backend/session/cpu_session.h b/mindspore/ccsrc/backend/common/session/cpu_session.h similarity index 94% rename from mindspore/ccsrc/backend/session/cpu_session.h rename to mindspore/ccsrc/backend/common/session/cpu_session.h index b689a90e64..7bc583b6ad 100644 --- a/mindspore/ccsrc/backend/session/cpu_session.h +++ b/mindspore/ccsrc/backend/common/session/cpu_session.h @@ -19,10 +19,10 @@ #include #include #include -#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" +#include "backend/common/session/session_basic.h" +#include "backend/common/session/kernel_graph.h" +#include "plugin/device/cpu/hal/device/cpu_kernel_runtime.h" +#include "backend/common/session/session_factory.h" namespace mindspore { namespace session { class CPUSession : public SessionBasic { diff --git a/mindspore/ccsrc/backend/session/executor.cc b/mindspore/ccsrc/backend/common/session/executor.cc similarity index 99% rename from mindspore/ccsrc/backend/session/executor.cc rename to mindspore/ccsrc/backend/common/session/executor.cc index 9e020d9039..f383d106fd 100644 --- a/mindspore/ccsrc/backend/session/executor.cc +++ b/mindspore/ccsrc/backend/common/session/executor.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/session/executor.h" -#include "backend/session/executor_manager.h" +#include "backend/common/session/executor.h" +#include "backend/common/session/executor_manager.h" #include #include #include diff --git a/mindspore/ccsrc/backend/session/executor.h b/mindspore/ccsrc/backend/common/session/executor.h similarity index 99% rename from mindspore/ccsrc/backend/session/executor.h rename to mindspore/ccsrc/backend/common/session/executor.h index 06ece88ce7..5a56ba1ebb 100644 --- a/mindspore/ccsrc/backend/session/executor.h +++ b/mindspore/ccsrc/backend/common/session/executor.h @@ -27,7 +27,7 @@ #include #include #include -#include "backend/session/session_basic.h" +#include "backend/common/session/session_basic.h" #include "ir/anf.h" #include "ir/tensor.h" #include "utils/any.h" diff --git a/mindspore/ccsrc/backend/session/executor_manager.cc b/mindspore/ccsrc/backend/common/session/executor_manager.cc similarity index 96% rename from mindspore/ccsrc/backend/session/executor_manager.cc rename to mindspore/ccsrc/backend/common/session/executor_manager.cc index c9601650ec..917e0425b3 100644 --- a/mindspore/ccsrc/backend/session/executor_manager.cc +++ b/mindspore/ccsrc/backend/common/session/executor_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/session/executor_manager.h" +#include "backend/common/session/executor_manager.h" #include "common/thread_pool.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/backend/session/executor_manager.h b/mindspore/ccsrc/backend/common/session/executor_manager.h similarity index 94% rename from mindspore/ccsrc/backend/session/executor_manager.h rename to mindspore/ccsrc/backend/common/session/executor_manager.h index 1c13986282..00d1fbe541 100644 --- a/mindspore/ccsrc/backend/session/executor_manager.h +++ b/mindspore/ccsrc/backend/common/session/executor_manager.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/session/executor.h" +#include "backend/common/session/executor.h" namespace mindspore { namespace session { class Executor; diff --git a/mindspore/ccsrc/backend/session/gpu_inference_session.cc b/mindspore/ccsrc/backend/common/session/gpu_inference_session.cc similarity index 98% rename from mindspore/ccsrc/backend/session/gpu_inference_session.cc rename to mindspore/ccsrc/backend/common/session/gpu_inference_session.cc index 331dbdca8a..fcafde3501 100644 --- a/mindspore/ccsrc/backend/session/gpu_inference_session.cc +++ b/mindspore/ccsrc/backend/common/session/gpu_inference_session.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/session/gpu_inference_session.h" +#include "backend/common/session/gpu_inference_session.h" #include #include "ir/tensor.h" #include "ir/anf.h" #include "ir/param_info.h" #include "runtime/device/kernel_runtime.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_utils.h" #include "utils/ms_device_shape_transfer.h" #include "utils/config_manager.h" diff --git a/mindspore/ccsrc/backend/session/gpu_inference_session.h b/mindspore/ccsrc/backend/common/session/gpu_inference_session.h similarity index 91% rename from mindspore/ccsrc/backend/session/gpu_inference_session.h rename to mindspore/ccsrc/backend/common/session/gpu_inference_session.h index bfe66a5289..a46203719c 100644 --- a/mindspore/ccsrc/backend/session/gpu_inference_session.h +++ b/mindspore/ccsrc/backend/common/session/gpu_inference_session.h @@ -24,10 +24,10 @@ #include #include #include "utils/hash_map.h" -#include "backend/session/gpu_session.h" -#include "backend/session/kernel_graph.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/session_factory.h" +#include "backend/common/session/gpu_session.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/session_factory.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/backend/session/gpu_session.cc b/mindspore/ccsrc/backend/common/session/gpu_session.cc similarity index 90% rename from mindspore/ccsrc/backend/session/gpu_session.cc rename to mindspore/ccsrc/backend/common/session/gpu_session.cc index 05e93742db..401165c30b 100644 --- a/mindspore/ccsrc/backend/session/gpu_session.cc +++ b/mindspore/ccsrc/backend/common/session/gpu_session.cc @@ -13,51 +13,51 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/session/gpu_session.h" +#include "backend/common/session/gpu_session.h" #include #include -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" -#include "backend/optimizer/common/common_backend_optimization.h" -#include "backend/optimizer/gpu/adam_weight_decay_fusion.h" -#include "backend/optimizer/gpu/adam_fusion.h" -#include "backend/optimizer/gpu/alltoall_fusion.h" -#include "backend/optimizer/gpu/apply_momentum_weight_scale_fusion.h" -#include "backend/optimizer/gpu/apply_momentum_scale_fusion.h" -#include "backend/optimizer/gpu/apply_momentum_weight_fusion.h" -#include "backend/optimizer/gpu/batch_norm_relu_fusion.h" -#include "backend/optimizer/gpu/batch_norm_relu_grad_fusion.h" -#include "backend/optimizer/gpu/batch_norm_add_relu_fusion.h" -#include "backend/optimizer/gpu/post_batch_norm_add_relu_fusion.h" -#include "backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.h" -#include "backend/optimizer/gpu/combine_momentum_fusion.h" -#include "backend/optimizer/gpu/combine_cast_fusion.h" -#include "backend/optimizer/gpu/cudnn_inplace_fusion.h" -#include "backend/optimizer/gpu/insert_format_transform_op.h" -#include "backend/optimizer/gpu/replace_momentum_cast_fusion.h" -#include "backend/optimizer/gpu/replace_addn_fusion.h" -#include "backend/optimizer/gpu/print_reduce_fusion.h" -#include "backend/optimizer/gpu/bce_with_logits_loss_fusion.h" -#include "backend/optimizer/gpu/remove_format_transform_pair.h" -#include "backend/optimizer/gpu/remove_redundant_format_transform.h" -#include "backend/optimizer/gpu/reduce_precision_fusion.h" -#include "backend/optimizer/gpu/insert_cast_gpu.h" -#include "backend/optimizer/gpu/relu_v2_pass.h" -#include "backend/optimizer/gpu/add_relu_v2_fusion.h" -#include "backend/optimizer/gpu/add_relu_grad_v2_fusion.h" -#include "backend/optimizer/gpu/matmul_biasadd_fusion.h" -#include "backend/optimizer/gpu/neighbor_exchange_v2_fusion.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/optimizer/common_backend_optimization.h" +#include "plugin/device/gpu/optimizer/adam_weight_decay_fusion.h" +#include "plugin/device/gpu/optimizer/adam_fusion.h" +#include "plugin/device/gpu/optimizer/alltoall_fusion.h" +#include "plugin/device/gpu/optimizer/apply_momentum_weight_scale_fusion.h" +#include "plugin/device/gpu/optimizer/apply_momentum_scale_fusion.h" +#include "plugin/device/gpu/optimizer/apply_momentum_weight_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_relu_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.h" +#include "plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.h" +#include "plugin/device/gpu/optimizer/combine_momentum_fusion.h" +#include "plugin/device/gpu/optimizer/combine_cast_fusion.h" +#include "plugin/device/gpu/optimizer/cudnn_inplace_fusion.h" +#include "plugin/device/gpu/optimizer/insert_format_transform_op.h" +#include "plugin/device/gpu/optimizer/replace_momentum_cast_fusion.h" +#include "plugin/device/gpu/optimizer/replace_addn_fusion.h" +#include "plugin/device/gpu/optimizer/print_reduce_fusion.h" +#include "plugin/device/gpu/optimizer/bce_with_logits_loss_fusion.h" +#include "plugin/device/gpu/optimizer/remove_format_transform_pair.h" +#include "plugin/device/gpu/optimizer/remove_redundant_format_transform.h" +#include "plugin/device/gpu/optimizer/reduce_precision_fusion.h" +#include "plugin/device/gpu/optimizer/insert_cast_gpu.h" +#include "plugin/device/gpu/optimizer/relu_v2_pass.h" +#include "plugin/device/gpu/optimizer/add_relu_v2_fusion.h" +#include "plugin/device/gpu/optimizer/add_relu_grad_v2_fusion.h" +#include "plugin/device/gpu/optimizer/matmul_biasadd_fusion.h" +#include "plugin/device/gpu/optimizer/neighbor_exchange_v2_fusion.h" #ifdef ENABLE_GPU_INFER -#include "backend/optimizer/trt_pass/graph_converter.h" +#include "plugin/device/gpu/optimizer/trt_pass/graph_converter.h" #endif -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h" -#include "backend/optimizer/pass/communication_op_fusion.h" -#include "backend/optimizer/gpu/concat_outputs_for_all_gather.h" -#include "backend/optimizer/pass/getitem_tuple.h" -#include "backend/optimizer/pass/optimize_updatestate.h" -#include "backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h" +#include "common/graph_kernel/adapter/graph_kernel_optimization.h" +#include "backend/common/pass/communication_op_fusion.h" +#include "plugin/device/gpu/optimizer/concat_outputs_for_all_gather.h" +#include "backend/common/pass/getitem_tuple.h" +#include "backend/common/pass/optimize_updatestate.h" +#include "backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h" #include "utils/ms_device_shape_transfer.h" #include "debug/anf_ir_dump.h" #include "debug/dump_proto.h" @@ -70,15 +70,15 @@ #else #include "debug/debugger/proto_exporter_stub.h" #endif -#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 "runtime/device/gpu/kernel_info_setter.h" +#include "plugin/device/gpu/hal/device/gpu_kernel_build.h" +#include "plugin/device/gpu/hal/device/gpu_kernel_runtime.h" +#include "plugin/device/gpu/hal/device/gpu_stream_assign.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" #include "runtime/device/kernel_runtime_manager.h" -#include "runtime/device/gpu/cuda_driver.h" -#include "runtime/device/gpu/distribution/collective_init.h" -#include "runtime/device/gpu/gpu_bucket.h" -#include "runtime/device/gpu/gpu_device_address.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" +#include "plugin/device/gpu/hal/device/distribution/collective_init.h" +#include "plugin/device/gpu/hal/device/gpu_bucket.h" +#include "plugin/device/gpu/hal/device/gpu_device_address.h" #include "utils/ms_utils.h" #include "utils/config_manager.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/backend/session/gpu_session.h b/mindspore/ccsrc/backend/common/session/gpu_session.h similarity index 96% rename from mindspore/ccsrc/backend/session/gpu_session.h rename to mindspore/ccsrc/backend/common/session/gpu_session.h index acbf3ebcce..9c86f802d0 100644 --- a/mindspore/ccsrc/backend/session/gpu_session.h +++ b/mindspore/ccsrc/backend/common/session/gpu_session.h @@ -21,9 +21,9 @@ #include #include #include -#include "backend/session/session_basic.h" -#include "backend/session/kernel_graph.h" -#include "backend/session/session_factory.h" +#include "backend/common/session/session_basic.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/session_factory.h" using KernelGraph = mindspore::session::KernelGraph; namespace mindspore { diff --git a/mindspore/ccsrc/backend/session/kernel_build_client.cc b/mindspore/ccsrc/backend/common/session/kernel_build_client.cc similarity index 98% rename from mindspore/ccsrc/backend/session/kernel_build_client.cc rename to mindspore/ccsrc/backend/common/session/kernel_build_client.cc index 9cb27d1dca..6d32de16b2 100644 --- a/mindspore/ccsrc/backend/session/kernel_build_client.cc +++ b/mindspore/ccsrc/backend/common/session/kernel_build_client.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/session/kernel_build_client.h" +#include "backend/common/session/kernel_build_client.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/backend/session/kernel_build_client.h b/mindspore/ccsrc/backend/common/session/kernel_build_client.h similarity index 100% rename from mindspore/ccsrc/backend/session/kernel_build_client.h rename to mindspore/ccsrc/backend/common/session/kernel_build_client.h diff --git a/mindspore/ccsrc/backend/session/kernel_graph.cc b/mindspore/ccsrc/backend/common/session/kernel_graph.cc similarity index 99% rename from mindspore/ccsrc/backend/session/kernel_graph.cc rename to mindspore/ccsrc/backend/common/session/kernel_graph.cc index f6e9a91655..bf060e9e1c 100644 --- a/mindspore/ccsrc/backend/session/kernel_graph.cc +++ b/mindspore/ccsrc/backend/common/session/kernel_graph.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include #include #include @@ -23,12 +23,12 @@ #include "ir/param_info.h" #include "utils/utils.h" #include "utils/check_convert_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" #include "runtime/device/kernel_runtime_manager.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/common/helper.h" +#include "kernel/common_utils.h" +#include "backend/common/optimizer/helper.h" #include "utils/anf_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/session/kernel_graph.h b/mindspore/ccsrc/backend/common/session/kernel_graph.h similarity index 100% rename from mindspore/ccsrc/backend/session/kernel_graph.h rename to mindspore/ccsrc/backend/common/session/kernel_graph.h diff --git a/mindspore/ccsrc/backend/session/pynative_task_manager.h b/mindspore/ccsrc/backend/common/session/pynative_task_manager.h similarity index 97% rename from mindspore/ccsrc/backend/session/pynative_task_manager.h rename to mindspore/ccsrc/backend/common/session/pynative_task_manager.h index 527af53e7e..75da147a41 100644 --- a/mindspore/ccsrc/backend/session/pynative_task_manager.h +++ b/mindspore/ccsrc/backend/common/session/pynative_task_manager.h @@ -23,8 +23,8 @@ #include #include #include -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/backend/session/session_basic.cc b/mindspore/ccsrc/backend/common/session/session_basic.cc similarity index 99% rename from mindspore/ccsrc/backend/session/session_basic.cc rename to mindspore/ccsrc/backend/common/session/session_basic.cc index 146526e3e6..9018a5c5a7 100644 --- a/mindspore/ccsrc/backend/session/session_basic.cc +++ b/mindspore/ccsrc/backend/common/session/session_basic.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/session/session_basic.h" +#include "backend/common/session/session_basic.h" #include #include @@ -26,15 +26,15 @@ #include "ops/primitive_c.h" #include "ir/manager.h" #include "abstract/utils.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" #include "base/core_ops.h" #include "base/base_ref_utils.h" #include "utils/ms_device_shape_transfer.h" #include "utils/config_manager.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/executor_manager.h" -#include "backend/optimizer/common/common_backend_optimization.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/executor_manager.h" +#include "backend/common/optimizer/common_backend_optimization.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_runtime_manager.h" #include "utils/ms_utils.h" #include "ir/anf.h" @@ -52,8 +52,8 @@ #include "ps/ps_context.h" #include "abstract/abstract_value.h" #endif -#include "backend/session/session_factory.h" -#include "backend/session/pynative_task_manager.h" +#include "backend/common/session/session_factory.h" +#include "backend/common/session/pynative_task_manager.h" #include "pipeline/pynative/pynative_execute.h" #include "runtime/op_builder/op_lazy_builder.h" #ifdef ENABLE_DEBUGGER diff --git a/mindspore/ccsrc/backend/session/session_basic.h b/mindspore/ccsrc/backend/common/session/session_basic.h similarity index 98% rename from mindspore/ccsrc/backend/session/session_basic.h rename to mindspore/ccsrc/backend/common/session/session_basic.h index 37efb3e233..e17c9003dc 100644 --- a/mindspore/ccsrc/backend/session/session_basic.h +++ b/mindspore/ccsrc/backend/common/session/session_basic.h @@ -23,9 +23,9 @@ #include #include #include "utils/hash_map.h" -#include "backend/session/session_context.h" -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/session_context.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/anf.h" #include "ir/tensor.h" #include "utils/any.h" @@ -37,7 +37,7 @@ #include "debug/debugger/debugger.h" #endif #include "runtime/hardware/device_context.h" -#include "backend/session/pynative_task_manager.h" +#include "backend/common/session/pynative_task_manager.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/backend/session/session_context.cc b/mindspore/ccsrc/backend/common/session/session_context.cc similarity index 94% rename from mindspore/ccsrc/backend/session/session_context.cc rename to mindspore/ccsrc/backend/common/session/session_context.cc index f5ec49c090..cfeb2cbb8d 100644 --- a/mindspore/ccsrc/backend/session/session_context.cc +++ b/mindspore/ccsrc/backend/common/session/session_context.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/session/session_context.h" +#include "backend/common/session/session_context.h" namespace mindspore { namespace session { std::shared_ptr Context::GetInstance() { diff --git a/mindspore/ccsrc/backend/session/session_context.h b/mindspore/ccsrc/backend/common/session/session_context.h similarity index 100% rename from mindspore/ccsrc/backend/session/session_context.h rename to mindspore/ccsrc/backend/common/session/session_context.h diff --git a/mindspore/ccsrc/backend/session/session_factory.cc b/mindspore/ccsrc/backend/common/session/session_factory.cc similarity index 96% rename from mindspore/ccsrc/backend/session/session_factory.cc rename to mindspore/ccsrc/backend/common/session/session_factory.cc index dc244a283a..9647244b1c 100644 --- a/mindspore/ccsrc/backend/session/session_factory.cc +++ b/mindspore/ccsrc/backend/common/session/session_factory.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/session/session_factory.h" +#include "backend/common/session/session_factory.h" #include #include diff --git a/mindspore/ccsrc/backend/session/session_factory.h b/mindspore/ccsrc/backend/common/session/session_factory.h similarity index 97% rename from mindspore/ccsrc/backend/session/session_factory.h rename to mindspore/ccsrc/backend/common/session/session_factory.h index 6e4833fc2f..bde7e44a4c 100644 --- a/mindspore/ccsrc/backend/session/session_factory.h +++ b/mindspore/ccsrc/backend/common/session/session_factory.h @@ -22,7 +22,7 @@ #include #include #include "utils/ms_utils.h" -#include "backend/session/session_basic.h" +#include "backend/common/session/session_basic.h" namespace mindspore { namespace session { using SessionCreator = std::function()>; diff --git a/mindspore/ccsrc/backend/session/single_kernel_graph.cc b/mindspore/ccsrc/backend/common/session/single_kernel_graph.cc similarity index 95% rename from mindspore/ccsrc/backend/session/single_kernel_graph.cc rename to mindspore/ccsrc/backend/common/session/single_kernel_graph.cc index 61c9ca380a..d3ba86caa2 100644 --- a/mindspore/ccsrc/backend/session/single_kernel_graph.cc +++ b/mindspore/ccsrc/backend/common/session/single_kernel_graph.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/session/single_kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/single_kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/session/single_kernel_graph.h b/mindspore/ccsrc/backend/common/session/single_kernel_graph.h similarity index 96% rename from mindspore/ccsrc/backend/session/single_kernel_graph.h rename to mindspore/ccsrc/backend/common/session/single_kernel_graph.h index 445ab64792..d7d0901017 100644 --- a/mindspore/ccsrc/backend/session/single_kernel_graph.h +++ b/mindspore/ccsrc/backend/common/session/single_kernel_graph.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/backend/common/somas/CMakeLists.txt b/mindspore/ccsrc/backend/common/somas/CMakeLists.txt new file mode 100644 index 0000000000..ab20964d6a --- /dev/null +++ b/mindspore/ccsrc/backend/common/somas/CMakeLists.txt @@ -0,0 +1,15 @@ +file(GLOB_RECURSE _PREACTIVATE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -Wno-user-defined-warnings -Wno-inconsistent-missing-override \ + -Wno-overloaded-virtual -Wno-unused-const-variable -Wno-pessimizing-move") +endif() + +set_property(SOURCE ${_PREACTIVATE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT) +add_library(_mindspore_backend_common_somas_obj OBJECT ${_PREACTIVATE_SRC_LIST}) diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas.cc b/mindspore/ccsrc/backend/common/somas/somas.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/somas/somas.cc rename to mindspore/ccsrc/backend/common/somas/somas.cc index 7965b595c6..36325d1a62 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas.cc +++ b/mindspore/ccsrc/backend/common/somas/somas.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/somas/somas.h" +#include "backend/common/somas/somas.h" #include #include #include @@ -23,14 +23,14 @@ #include #include -#include "backend/optimizer/somas/somas_node.h" -#include "backend/optimizer/somas/somas_solver_pre.h" -#include "backend/optimizer/somas/somas_stream.h" -#include "backend/optimizer/somas/somas_tensor.h" +#include "backend/common/somas/somas_node.h" +#include "backend/common/somas/somas_solver_pre.h" +#include "backend/common/somas/somas_stream.h" +#include "backend/common/somas/somas_tensor.h" #ifdef ENABLE_D -#include "runtime/device/ascend/ascend_stream_assign.h" +#include "plugin/device/ascend/hal/device/ascend_stream_assign.h" #endif -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "utils/ms_context.h" #include "debug/common.h" #ifdef ENABLE_DUMP_IR diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas.h b/mindspore/ccsrc/backend/common/somas/somas.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/somas/somas.h rename to mindspore/ccsrc/backend/common/somas/somas.h index 2cf3b0f777..1c434288c7 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas.h +++ b/mindspore/ccsrc/backend/common/somas/somas.h @@ -25,13 +25,13 @@ #include "utils/hash_map.h" #include "utils/hash_set.h" -#include "backend/kernel_compiler/tbe/tbe_utils.h" -#include "backend/optimizer/somas/somas_node.h" -#include "backend/optimizer/somas/somas_solver_pre.h" -#include "backend/optimizer/somas/somas_stream.h" -#include "backend/optimizer/somas/somas_parameter.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" +#include "backend/common/somas/somas_node.h" +#include "backend/common/somas/somas_solver_pre.h" +#include "backend/common/somas/somas_stream.h" +#include "backend/common/somas/somas_parameter.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace somas { diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_node.h b/mindspore/ccsrc/backend/common/somas/somas_node.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/somas/somas_node.h rename to mindspore/ccsrc/backend/common/somas/somas_node.h index 56003ee62e..767fd23bca 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_node.h +++ b/mindspore/ccsrc/backend/common/somas/somas_node.h @@ -24,9 +24,9 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/somas/somas_stream.h" -#include "backend/optimizer/somas/somas_tensor.h" -#include "backend/optimizer/somas/somas_parameter.h" +#include "backend/common/somas/somas_stream.h" +#include "backend/common/somas/somas_tensor.h" +#include "backend/common/somas/somas_parameter.h" namespace mindspore { namespace somas { diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_parameter.h b/mindspore/ccsrc/backend/common/somas/somas_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/somas/somas_parameter.h rename to mindspore/ccsrc/backend/common/somas/somas_parameter.h diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_alg.cc b/mindspore/ccsrc/backend/common/somas/somas_solver_alg.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/somas/somas_solver_alg.cc rename to mindspore/ccsrc/backend/common/somas/somas_solver_alg.cc index c12e5c525a..25435a9e16 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_alg.cc +++ b/mindspore/ccsrc/backend/common/somas/somas_solver_alg.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/somas/somas_solver_alg.h" +#include "backend/common/somas/somas_solver_alg.h" #include #include diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_alg.h b/mindspore/ccsrc/backend/common/somas/somas_solver_alg.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/somas/somas_solver_alg.h rename to mindspore/ccsrc/backend/common/somas/somas_solver_alg.h index 9615e03257..39f1d0e4a0 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_alg.h +++ b/mindspore/ccsrc/backend/common/somas/somas_solver_alg.h @@ -31,7 +31,7 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/somas/somas_solver_pre.h" +#include "backend/common/somas/somas_solver_pre.h" #include "utils/ms_context.h" using std::pair; diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_core.cc b/mindspore/ccsrc/backend/common/somas/somas_solver_core.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/somas/somas_solver_core.cc rename to mindspore/ccsrc/backend/common/somas/somas_solver_core.cc index 7bbcb5b06a..28b9cbfe36 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_core.cc +++ b/mindspore/ccsrc/backend/common/somas/somas_solver_core.cc @@ -23,9 +23,9 @@ #include #include #include "utils/hash_map.h" -#include "backend/optimizer/somas/somas_solver_alg.h" -#include "backend/optimizer/somas/somas_solver_core.h" -#include "backend/optimizer/somas/somas_solver_pre.h" +#include "backend/common/somas/somas_solver_alg.h" +#include "backend/common/somas/somas_solver_core.h" +#include "backend/common/somas/somas_solver_pre.h" using mindspore::HashMap; using std::sort; diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_core.h b/mindspore/ccsrc/backend/common/somas/somas_solver_core.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/somas/somas_solver_core.h rename to mindspore/ccsrc/backend/common/somas/somas_solver_core.h index 8b44ec99f9..2fb8337759 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_core.h +++ b/mindspore/ccsrc/backend/common/somas/somas_solver_core.h @@ -24,8 +24,8 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/somas/somas_solver_alg.h" -#include "backend/optimizer/somas/somas_solver_pre.h" +#include "backend/common/somas/somas_solver_alg.h" +#include "backend/common/somas/somas_solver_pre.h" namespace mindspore { namespace somas { diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_pre.cc b/mindspore/ccsrc/backend/common/somas/somas_solver_pre.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/somas/somas_solver_pre.cc rename to mindspore/ccsrc/backend/common/somas/somas_solver_pre.cc index f99e205da1..ca3c65194b 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_pre.cc +++ b/mindspore/ccsrc/backend/common/somas/somas_solver_pre.cc @@ -21,8 +21,8 @@ #include #include "common/thread_pool.h" -#include "backend/optimizer/somas/somas_solver_core.h" -#include "backend/optimizer/somas/somas_solver_pre.h" +#include "backend/common/somas/somas_solver_core.h" +#include "backend/common/somas/somas_solver_pre.h" #include "debug/common.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_pre.h b/mindspore/ccsrc/backend/common/somas/somas_solver_pre.h similarity index 99% rename from mindspore/ccsrc/backend/optimizer/somas/somas_solver_pre.h rename to mindspore/ccsrc/backend/common/somas/somas_solver_pre.h index ac72e60da7..d8e9ad212a 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_solver_pre.h +++ b/mindspore/ccsrc/backend/common/somas/somas_solver_pre.h @@ -27,7 +27,7 @@ #include #include #include "utils/hash_map.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" using mindspore::HashMap; using std::vector; diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_stream.h b/mindspore/ccsrc/backend/common/somas/somas_stream.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/somas/somas_stream.h rename to mindspore/ccsrc/backend/common/somas/somas_stream.h index b04bdb3476..3607c818cd 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_stream.h +++ b/mindspore/ccsrc/backend/common/somas/somas_stream.h @@ -17,8 +17,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_SOMAS_SOMAS_STREAM_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_SOMAS_SOMAS_STREAM_H_ -#include "backend/optimizer/somas/somas_node.h" -#include "backend/optimizer/somas/somas_tensor.h" +#include "backend/common/somas/somas_node.h" +#include "backend/common/somas/somas_tensor.h" #include #include diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_tensor.cc b/mindspore/ccsrc/backend/common/somas/somas_tensor.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/somas/somas_tensor.cc rename to mindspore/ccsrc/backend/common/somas/somas_tensor.cc index 40ebdeefdb..df1195316b 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_tensor.cc +++ b/mindspore/ccsrc/backend/common/somas/somas_tensor.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/somas/somas_tensor.h" +#include "backend/common/somas/somas_tensor.h" #include -#include "backend/optimizer/somas/somas_node.h" -#include "backend/optimizer/somas/somas_stream.h" -#include "backend/optimizer/somas/somas.h" +#include "backend/common/somas/somas_node.h" +#include "backend/common/somas/somas_stream.h" +#include "backend/common/somas/somas.h" namespace mindspore { namespace somas { diff --git a/mindspore/ccsrc/backend/optimizer/somas/somas_tensor.h b/mindspore/ccsrc/backend/common/somas/somas_tensor.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/somas/somas_tensor.h rename to mindspore/ccsrc/backend/common/somas/somas_tensor.h index af26b4dc41..e6ebf2d317 100644 --- a/mindspore/ccsrc/backend/optimizer/somas/somas_tensor.h +++ b/mindspore/ccsrc/backend/common/somas/somas_tensor.h @@ -22,9 +22,9 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/somas/somas_node.h" -#include "backend/optimizer/somas/somas_solver_pre.h" -#include "backend/optimizer/somas/somas_stream.h" +#include "backend/common/somas/somas_node.h" +#include "backend/common/somas/somas_solver_pre.h" +#include "backend/common/somas/somas_stream.h" namespace mindspore { namespace somas { diff --git a/mindspore/ccsrc/vm/CMakeLists.txt b/mindspore/ccsrc/backend/graph_compiler/CMakeLists.txt similarity index 54% rename from mindspore/ccsrc/vm/CMakeLists.txt rename to mindspore/ccsrc/backend/graph_compiler/CMakeLists.txt index 45c9cef795..f79d1ba547 100644 --- a/mindspore/ccsrc/vm/CMakeLists.txt +++ b/mindspore/ccsrc/backend/graph_compiler/CMakeLists.txt @@ -1,9 +1,9 @@ include_directories(${CMAKE_SOURCE_DIR}/mindspore/core/mindrt/include) include_directories(${CMAKE_SOURCE_DIR}/mindspore/core/mindrt/src) -file(GLOB_RECURSE _VM_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") -set_property(SOURCE ${_VM_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_VM) -add_library(_mindspore_vm_obj OBJECT ${_VM_SRC_LIST}) +file(GLOB_RECURSE _GRAPH_COMPILER_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") +set_property(SOURCE ${_GRAPH_COMPILER_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_VM) +add_library(_mindspore_backend_graph_compiler_obj OBJECT ${_GRAPH_COMPILER_SRC_LIST}) if("${ENABLE_HIDDEN}" STREQUAL "OFF") string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") diff --git a/mindspore/ccsrc/vm/backend.cc b/mindspore/ccsrc/backend/graph_compiler/backend.cc similarity index 99% rename from mindspore/ccsrc/vm/backend.cc rename to mindspore/ccsrc/backend/graph_compiler/backend.cc index d53972bdd4..d88cf941bf 100644 --- a/mindspore/ccsrc/vm/backend.cc +++ b/mindspore/ccsrc/backend/graph_compiler/backend.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "vm/backend.h" +#include "backend/graph_compiler/backend.h" #include #include #include -#include "vm/transform.h" -#include "backend/session/session_factory.h" +#include "backend/graph_compiler/transform.h" +#include "backend/common/session/session_factory.h" #include "runtime/op_builder/op_lazy_builder.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "pipeline/pynative/pynative_execute.h" #include "pipeline/jit/parse/data_converter.h" #include "ir/anf.h" @@ -33,7 +33,7 @@ #include "utils/log_adapter.h" #include "utils/ms_utils.h" #include "runtime/hardware/device_context_manager.h" -#include "runtime/framework/graph_compiler.h" +#include "runtime/graph_scheduler/graph_compiler.h" #include "utils/scoped_long_running.h" #ifdef ENABLE_D #include "utils/callbacks_ge.h" diff --git a/mindspore/ccsrc/vm/backend.h b/mindspore/ccsrc/backend/graph_compiler/backend.h similarity index 97% rename from mindspore/ccsrc/vm/backend.h rename to mindspore/ccsrc/backend/graph_compiler/backend.h index 3d817d83f1..0fa136b483 100644 --- a/mindspore/ccsrc/vm/backend.h +++ b/mindspore/ccsrc/backend/graph_compiler/backend.h @@ -27,12 +27,12 @@ #include "utils/hash_map.h" #include "utils/contract.h" #include "ir/anf.h" -#include "vm/segment_runner.h" -#include "vm/graph_partition.h" -#include "vm/vm.h" -#include "backend/session/session_basic.h" +#include "backend/graph_compiler/segment_runner.h" +#include "backend/graph_compiler/graph_partition.h" +#include "backend/graph_compiler/vm.h" +#include "backend/common/session/session_basic.h" #include "runtime/hardware/device_context.h" -#include "runtime/framework/graph_scheduler.h" +#include "runtime/graph_scheduler/graph_scheduler.h" #include "runtime/op_builder/op_lazy_builder.h" namespace mindspore { diff --git a/mindspore/ccsrc/vm/graph_partition.cc b/mindspore/ccsrc/backend/graph_compiler/graph_partition.cc similarity index 97% rename from mindspore/ccsrc/vm/graph_partition.cc rename to mindspore/ccsrc/backend/graph_compiler/graph_partition.cc index 0dc41c32ab..1b23594e21 100644 --- a/mindspore/ccsrc/vm/graph_partition.cc +++ b/mindspore/ccsrc/backend/graph_compiler/graph_partition.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "vm/graph_partition.h" +#include "backend/graph_compiler/graph_partition.h" #include #include #include diff --git a/mindspore/ccsrc/vm/graph_partition.h b/mindspore/ccsrc/backend/graph_compiler/graph_partition.h similarity index 100% rename from mindspore/ccsrc/vm/graph_partition.h rename to mindspore/ccsrc/backend/graph_compiler/graph_partition.h diff --git a/mindspore/ccsrc/vm/segment_runner.cc b/mindspore/ccsrc/backend/graph_compiler/segment_runner.cc similarity index 99% rename from mindspore/ccsrc/vm/segment_runner.cc rename to mindspore/ccsrc/backend/graph_compiler/segment_runner.cc index d7fb530003..4df97f6f5d 100644 --- a/mindspore/ccsrc/vm/segment_runner.cc +++ b/mindspore/ccsrc/backend/graph_compiler/segment_runner.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "vm/segment_runner.h" +#include "backend/graph_compiler/segment_runner.h" #include #include diff --git a/mindspore/ccsrc/vm/segment_runner.h b/mindspore/ccsrc/backend/graph_compiler/segment_runner.h similarity index 94% rename from mindspore/ccsrc/vm/segment_runner.h rename to mindspore/ccsrc/backend/graph_compiler/segment_runner.h index 1407c81412..4075920190 100644 --- a/mindspore/ccsrc/vm/segment_runner.h +++ b/mindspore/ccsrc/backend/graph_compiler/segment_runner.h @@ -26,8 +26,8 @@ #include "utils/hash_map.h" #include "ir/anf.h" -#include "vm/vmimpl.h" -#include "vm/graph_partition.h" +#include "backend/graph_compiler/vmimpl.h" +#include "backend/graph_compiler/graph_partition.h" namespace mindspore { namespace compile { diff --git a/mindspore/ccsrc/vm/transform.cc b/mindspore/ccsrc/backend/graph_compiler/transform.cc similarity index 99% rename from mindspore/ccsrc/vm/transform.cc rename to mindspore/ccsrc/backend/graph_compiler/transform.cc index ed764fd50e..0ac6888d87 100644 --- a/mindspore/ccsrc/vm/transform.cc +++ b/mindspore/ccsrc/backend/graph_compiler/transform.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "vm/transform.h" +#include "backend/graph_compiler/transform.h" #include #include diff --git a/mindspore/ccsrc/vm/transform.h b/mindspore/ccsrc/backend/graph_compiler/transform.h similarity index 96% rename from mindspore/ccsrc/vm/transform.h rename to mindspore/ccsrc/backend/graph_compiler/transform.h index cc456c3236..5f8db0b08d 100644 --- a/mindspore/ccsrc/vm/transform.h +++ b/mindspore/ccsrc/backend/graph_compiler/transform.h @@ -26,12 +26,12 @@ #include #include "utils/hash_map.h" -#include "vm/vm.h" +#include "backend/graph_compiler/vm.h" #include "ir/anf.h" #include "frontend/operator/ops.h" -#include "vm/segment_runner.h" -#include "vm/backend.h" -#include "vm/graph_partition.h" +#include "backend/graph_compiler/segment_runner.h" +#include "backend/graph_compiler/backend.h" +#include "backend/graph_compiler/graph_partition.h" // mindspore namespace is the top level namespace of MindSpore project. // Other namespace should be a sub namespace of mindspore namespace in the ME project. diff --git a/mindspore/ccsrc/vm/vm.cc b/mindspore/ccsrc/backend/graph_compiler/vm.cc similarity index 99% rename from mindspore/ccsrc/vm/vm.cc rename to mindspore/ccsrc/backend/graph_compiler/vm.cc index 0a5572b571..0bae2329ec 100644 --- a/mindspore/ccsrc/vm/vm.cc +++ b/mindspore/ccsrc/backend/graph_compiler/vm.cc @@ -16,10 +16,10 @@ * limitations under the License. */ -#include "vm/vm.h" +#include "backend/graph_compiler/vm.h" #include -#include "vm/vmimpl.h" -#include "vm/backend.h" +#include "backend/graph_compiler/vmimpl.h" +#include "backend/graph_compiler/backend.h" #include "pipeline/jit/parse/data_converter.h" #include "pybind_api/ir/base_ref_py.h" #include "pybind_api/ir/primitive_py.h" diff --git a/mindspore/ccsrc/vm/vm.h b/mindspore/ccsrc/backend/graph_compiler/vm.h similarity index 100% rename from mindspore/ccsrc/vm/vm.h rename to mindspore/ccsrc/backend/graph_compiler/vm.h diff --git a/mindspore/ccsrc/vm/vmimpl.cc b/mindspore/ccsrc/backend/graph_compiler/vmimpl.cc similarity index 99% rename from mindspore/ccsrc/vm/vmimpl.cc rename to mindspore/ccsrc/backend/graph_compiler/vmimpl.cc index 4f3ddb9d1e..b1f6c22ba7 100644 --- a/mindspore/ccsrc/vm/vmimpl.cc +++ b/mindspore/ccsrc/backend/graph_compiler/vmimpl.cc @@ -16,7 +16,7 @@ * limitations under the License. */ -#include "vm/vmimpl.h" +#include "backend/graph_compiler/vmimpl.h" #include #include diff --git a/mindspore/ccsrc/vm/vmimpl.h b/mindspore/ccsrc/backend/graph_compiler/vmimpl.h similarity index 100% rename from mindspore/ccsrc/vm/vmimpl.h rename to mindspore/ccsrc/backend/graph_compiler/vmimpl.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/CMakeLists.txt b/mindspore/ccsrc/backend/kernel_compiler/CMakeLists.txt deleted file mode 100644 index e0e875ba71..0000000000 --- a/mindspore/ccsrc/backend/kernel_compiler/CMakeLists.txt +++ /dev/null @@ -1,136 +0,0 @@ -file(GLOB_RECURSE KERNEL_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "kernel_build_info.cc" - "kernel.cc" - "kash/*.cc" - "common_utils.cc" - "oplib/*.cc" - "environ_manager.cc" -) - -if(CMAKE_SYSTEM_NAME MATCHES "Darwin") - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-abstract-non-virtual-dtor -Wno-overloaded-virtual") -endif() - -if(ENABLE_D) - file(GLOB_RECURSE D_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "ascend_kernel_mod.cc" - "kernel_query.cc" - "tbe/*.cc" - "host/*.cc" - "aicpu/*.cc" - "rts/*.cc" - "hccl/*.cc" - ) - file(GLOB_RECURSE AICPU_OPS_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "aicpu/aicpu_ops/*.cc" - ) - list(REMOVE_ITEM D_SRC_LIST ${AICPU_OPS_SRC}) - add_compile_definitions(ENABLE_D) -endif() - -if(ENABLE_CPU) - file(GLOB CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "cpu/*.cc" - "cpu/eigen/*.cc" - "cpu/mkldnn/*.cc" - "cpu/fl/*.cc" - "cpu/ps/*.cc" - "cpu/pyfunc/*.cc" - "cpu/rl/*.cc" - "cpu/custom/*.cc" - "cpu/environ/*.cc" - ) - - if(NOT ENABLE_MPI) - list(REMOVE_ITEM CPU_SRC_LIST "cpu/allgather_cpu_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/reduce_scatter_cpu_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/embedding_look_up_comm_grad_cpu_kernel.cc") - endif() - - if(PLATFORM_ARM64) - add_compile_definitions(ENABLE_ARM) - endif() -endif() - -if(NOT ENABLE_CPU OR WIN32) - list(REMOVE_ITEM CPU_SRC_LIST "cpu/ps/apply_momentum_ps_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/ps/embedding_look_up_proxy_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/ps/embedding_look_up_ps_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/ps/pserver_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/ps/pull_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/ps/push_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/ps/sparse_apply_adam_ps_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/ps/sparse_apply_ftrl_ps_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/ps/sparse_apply_lazy_adam_ps_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/fl/fused_pull_weight_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/fl/fused_push_weight_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/fl/get_model_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/fl/start_fl_job_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/fl/update_model_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/fl/push_metrics_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/fl/get_keys_kernel.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/fl/exchange_keys_kernel.cc") -endif() - -if(ENABLE_SECURITY) - list(REMOVE_ITEM D_SRC_LIST "rts/profiling_kernel_mod.cc") -endif() - -if(ENABLE_GPU) - file(GLOB_RECURSE CUDA_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "gpu/*.cu" - ) - - file(GLOB_RECURSE GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "gpu/*.cc") - list(REMOVE_ITEM GPU_SRC_LIST "gpu/nccl/nccl_collective_gpu_kernel.cc") - list(REMOVE_ITEM GPU_SRC_LIST "gpu/nccl/nccl_p2p_gpu_kernel.cc") - list(REMOVE_ITEM GPU_SRC_LIST "gpu/nccl/nccl_send_gpu_kernel.cc") - list(REMOVE_ITEM GPU_SRC_LIST "gpu/nccl/nccl_recv_gpu_kernel.cc") - list(REMOVE_ITEM GPU_SRC_LIST "gpu/trt/trt_kernel.cc") - - if(ENABLE_MPI) - include(ExternalProject) - file(GLOB_RECURSE GPU_NCCL_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "gpu/nccl/*.cc") - list(APPEND GPU_SRC_LIST ${GPU_NCCL_LIST}) - endif() - - if(ENABLE_GPU_INFER) - file(GLOB_RECURSE GPU_TRT_KERNEL_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "gpu/trt/*.cc") - list(APPEND GPU_SRC_LIST ${GPU_TRT_KERNEL_LIST}) - endif() - - # add_library(_mindspore_kernel_cuda_obj OBJECT ${CUDA_SRC_LIST}) -endif() - -if(ENABLE_AKG AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") - file(GLOB_RECURSE AKG_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "akg/akg_kernel_build.cc" - "akg/akg_kernel_json_generator.cc" - "akg/akg_kernel_json_decoder.cc" - ) - if(ENABLE_GPU) - file(GLOB_RECURSE AKG_GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "akg/gpu/*.cc" - ) - list(APPEND AKG_SRC_LIST ${AKG_GPU_SRC_LIST}) - endif() - if(ENABLE_D) - file(GLOB_RECURSE AKG_D_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "akg/ascend/*.cc" - "akg/akg_kernel_metadata.cc" - ) - list(APPEND AKG_SRC_LIST ${AKG_D_SRC_LIST}) - endif() - if(ENABLE_CPU) - set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp") - file(GLOB_RECURSE AKG_CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "akg/cpu/*.cc" - ) - list(APPEND AKG_SRC_LIST ${AKG_CPU_SRC_LIST}) - endif() -endif() - -set_property(SOURCE ${KERNEL_SRC_LIST} ${CPU_SRC_LIST} ${GPU_SRC_LIST} ${D_SRC_LIST} ${AKG_SRC_LIST} - PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_KERNEL) -add_library(_mindspore_backend_kernel_compiler_obj OBJECT ${KERNEL_SRC_LIST} ${CPU_SRC_LIST} - ${GPU_SRC_LIST} ${D_SRC_LIST} ${AKG_SRC_LIST}) diff --git a/mindspore/ccsrc/backend/optimizer/CMakeLists.txt b/mindspore/ccsrc/backend/optimizer/CMakeLists.txt deleted file mode 100644 index 1bc9035d57..0000000000 --- a/mindspore/ccsrc/backend/optimizer/CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -file(GLOB_RECURSE _PREACTIVATE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "common/*.cc" - "mem_reuse/*.cc" - "pass/*.cc" - "somas/*.cc" -) - -if("${ENABLE_HIDDEN}" STREQUAL "OFF") - string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") - string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") -endif() - -if(ENABLE_D OR ENABLE_ACL) - file(GLOB_RECURSE _D_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "ascend/*.cc" - ) - list(APPEND _PREACTIVATE_SRC_LIST ${_D_SRC_LIST}) -endif() - -if(ENABLE_GPU) - file(GLOB_RECURSE _GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "gpu/*.cc" - ) - list(APPEND _PREACTIVATE_SRC_LIST ${_GPU_SRC_LIST}) -endif() - -if(ENABLE_GPU_INFER) - file(GLOB_RECURSE GPU_SRC_TRT_PASS_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "trt_pass/*.cc") - list(APPEND _PREACTIVATE_SRC_LIST ${GPU_SRC_TRT_PASS_LIST}) -endif() - -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") - set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -Wno-user-defined-warnings -Wno-inconsistent-missing-override \ - -Wno-overloaded-virtual -Wno-unused-const-variable -Wno-pessimizing-move") -endif() - -if(ENABLE_CPU) - file(GLOB_RECURSE _CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "cpu/*.cc") - list(APPEND _PREACTIVATE_SRC_LIST ${_CPU_SRC_LIST}) -endif() - -if(ENABLE_AKG AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") - file(GLOB_RECURSE _GK_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "graph_kernel/*.cc" - ) - file(GLOB_RECURSE _GK_LITE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "graph_kernel/lite_adapter/*.cc" - ) - list(REMOVE_ITEM _GK_SRC_LIST ${_GK_LITE_LIST}) - list(APPEND _PREACTIVATE_SRC_LIST ${_GK_SRC_LIST}) -endif() - -set_property(SOURCE ${_PREACTIVATE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS - SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT) -add_library(_mindspore_backend_optimizer_obj OBJECT ${_PREACTIVATE_SRC_LIST}) diff --git a/mindspore/ccsrc/common/CMakeLists.txt b/mindspore/ccsrc/common/CMakeLists.txt index 85e5a3234a..068e25a55d 100644 --- a/mindspore/ccsrc/common/CMakeLists.txt +++ b/mindspore/ccsrc/common/CMakeLists.txt @@ -1,15 +1,24 @@ if(CMAKE_SYSTEM_NAME MATCHES "Windows") file(GLOB_RECURSE _COMMON_ALL_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "utils.cc" "duplex_pipe_win.cc" "thread_pool.cc" - ) + ) else() file(GLOB_RECURSE _COMMON_ALL_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "utils.cc" "duplex_pipe.cc" "thread_pool.cc" - ) + ) +endif() + +if(ENABLE_AKG AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") + file(GLOB_RECURSE _GK_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "graph_kernel/*.cc" + ) + file(GLOB_RECURSE _GK_LITE_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "graph_kernel/lite_adapter/*.cc" + ) + list(REMOVE_ITEM _GK_SRC_LIST ${_GK_LITE_LIST}) + list(APPEND _COMMON_ALL_SRC_FILES ${_GK_SRC_LIST}) endif() set_property(SOURCE ${_COMMON_ALL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/callback_impl.cc b/mindspore/ccsrc/common/graph_kernel/adapter/callback_impl.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/callback_impl.cc rename to mindspore/ccsrc/common/graph_kernel/adapter/callback_impl.cc index b9e903d639..ebd8d30508 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/callback_impl.cc +++ b/mindspore/ccsrc/common/graph_kernel/adapter/callback_impl.cc @@ -14,22 +14,22 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/adapter/callback_impl.h" +#include "common/graph_kernel/adapter/callback_impl.h" #include #include #include #include #include "utils/ms_context.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/adapter/fake_abstract_shape.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/adapter/fake_abstract_shape.h" #if ENABLE_D -#include "runtime/device/ascend/kernel_select_ascend.h" +#include "plugin/device/ascend/hal/device/kernel_select_ascend.h" #elif ENABLE_GPU -#include "runtime/device/gpu/kernel_info_setter.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" #endif -#include "runtime/device/cpu/kernel_select_cpu.h" +#include "plugin/device/cpu/hal/device/kernel_select_cpu.h" namespace mindspore::graphkernel { // register the callback object diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/callback_impl.h b/mindspore/ccsrc/common/graph_kernel/adapter/callback_impl.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/callback_impl.h rename to mindspore/ccsrc/common/graph_kernel/adapter/callback_impl.h index 9ed7fb0ed9..489af1d0f6 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/callback_impl.h +++ b/mindspore/ccsrc/common/graph_kernel/adapter/callback_impl.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_ADAPTER_CALLBACK_IMPL_H_ #include #include -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" namespace mindspore::graphkernel { class CallbackImpl : public Callback { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/fake_abstract_shape.cc b/mindspore/ccsrc/common/graph_kernel/adapter/fake_abstract_shape.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/fake_abstract_shape.cc rename to mindspore/ccsrc/common/graph_kernel/adapter/fake_abstract_shape.cc index 8a19f98e75..3c5c46e043 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/fake_abstract_shape.cc +++ b/mindspore/ccsrc/common/graph_kernel/adapter/fake_abstract_shape.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/adapter/fake_abstract_shape.h" +#include "common/graph_kernel/adapter/fake_abstract_shape.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/fake_abstract_shape.h b/mindspore/ccsrc/common/graph_kernel/adapter/fake_abstract_shape.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/fake_abstract_shape.h rename to mindspore/ccsrc/common/graph_kernel/adapter/fake_abstract_shape.h diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.cc b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_expander_with_py.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.cc rename to mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_expander_with_py.cc index d244051ff1..f03a50af00 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.cc +++ b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_expander_with_py.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.h" +#include "common/graph_kernel/adapter/graph_kernel_expander_with_py.h" #include #include @@ -23,11 +23,11 @@ #include "utils/ms_context.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/optimizer/graph_kernel/split_umonad.h" -#include "backend/optimizer/graph_kernel/substitute_dropout.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/akg/akg_kernel_json_generator.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/split_umonad.h" +#include "common/graph_kernel/substitute_dropout.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "mindspore/core/ir/graph_utils.h" #include "pipeline/jit/parse/python_adapter.h" #include "pybind_api/ir/primitive_py.h" diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.h b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_expander_with_py.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.h rename to mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_expander_with_py.h index 5eb559ba9b..231fa386f2 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.h +++ b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_expander_with_py.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/graph_kernel/core/graph_kernel_expander.h" +#include "common/graph_kernel/core/graph_kernel_expander.h" #include "ir/func_graph.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.cc b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_optimization.cc similarity index 81% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.cc rename to mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_optimization.cc index 91604b9fcf..ad32792345 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.cc +++ b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_optimization.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h" +#include "common/graph_kernel/adapter/graph_kernel_optimization.h" #include #include @@ -22,37 +22,37 @@ #include "ir/func_graph.h" #include "utils/ms_context.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/graph_kernel/add_atomic_clean.h" -#include "backend/optimizer/graph_kernel/add_stitch_atomic_clean_gpu.h" -#include "backend/optimizer/graph_kernel/arithmetic_simplify.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_cluster.h" -#include "backend/optimizer/graph_kernel/core/eliminate_redundant_output.h" -#include "backend/optimizer/graph_kernel/insert_pad.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_splitter_with_py.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.h" -#include "backend/optimizer/graph_kernel/cast_matmul_fusion.h" -#include "backend/optimizer/graph_kernel/raise_reduction_precision.h" -#include "backend/optimizer/graph_kernel/graph_kernel_cse.h" -#include "backend/optimizer/graph_kernel/core/shape_ops_splitter.h" -#include "backend/optimizer/graph_kernel/value_graph_binder.h" -#include "backend/optimizer/graph_kernel/parallel_fusion.h" -#include "backend/optimizer/graph_kernel/optimize_assign.h" -#include "backend/optimizer/graph_kernel/split_umonad.h" -#include "backend/optimizer/graph_kernel/reorder_ops.h" -#include "backend/optimizer/graph_kernel/core/update_state_formatter.h" -#include "backend/optimizer/graph_kernel/axis_normalizer.h" -#include "backend/optimizer/graph_kernel/decrease_compute_precision.h" -#include "backend/optimizer/graph_kernel/decrease_transfer_precision.h" -#include "backend/optimizer/graph_kernel/tsa_atomic_add_to_first_tensor.h" -#include "backend/optimizer/graph_kernel/uss_atomic_add.h" -#include "backend/optimizer/pass/getitem_tuple.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_pass_manager.h" -#include "backend/optimizer/graph_kernel/transform_op_optimizer.h" -#include "backend/optimizer/graph_kernel/rewrite_output_shape.h" -#include "backend/optimizer/graph_kernel/graph_kernel_recompute.h" -#include "backend/optimizer/graph_kernel/reduce_fake_out_mem.h" -#include "backend/optimizer/graph_kernel/depend_elimination.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" +#include "common/graph_kernel/add_atomic_clean.h" +#include "common/graph_kernel/add_stitch_atomic_clean_gpu.h" +#include "common/graph_kernel/arithmetic_simplify.h" +#include "common/graph_kernel/core/graph_kernel_cluster.h" +#include "common/graph_kernel/core/eliminate_redundant_output.h" +#include "common/graph_kernel/insert_pad.h" +#include "common/graph_kernel/adapter/graph_kernel_splitter_with_py.h" +#include "common/graph_kernel/adapter/graph_kernel_expander_with_py.h" +#include "common/graph_kernel/cast_matmul_fusion.h" +#include "common/graph_kernel/raise_reduction_precision.h" +#include "common/graph_kernel/graph_kernel_cse.h" +#include "common/graph_kernel/core/shape_ops_splitter.h" +#include "common/graph_kernel/value_graph_binder.h" +#include "common/graph_kernel/parallel_fusion.h" +#include "common/graph_kernel/optimize_assign.h" +#include "common/graph_kernel/split_umonad.h" +#include "common/graph_kernel/reorder_ops.h" +#include "common/graph_kernel/core/update_state_formatter.h" +#include "common/graph_kernel/axis_normalizer.h" +#include "common/graph_kernel/decrease_compute_precision.h" +#include "common/graph_kernel/decrease_transfer_precision.h" +#include "common/graph_kernel/tsa_atomic_add_to_first_tensor.h" +#include "common/graph_kernel/uss_atomic_add.h" +#include "backend/common/pass/getitem_tuple.h" +#include "common/graph_kernel/adapter/graph_kernel_pass_manager.h" +#include "common/graph_kernel/transform_op_optimizer.h" +#include "common/graph_kernel/rewrite_output_shape.h" +#include "common/graph_kernel/graph_kernel_recompute.h" +#include "common/graph_kernel/reduce_fake_out_mem.h" +#include "common/graph_kernel/depend_elimination.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" namespace mindspore::graphkernel { using opt::CommonSubexpressionElimination; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_optimization.h similarity index 91% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h rename to mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_optimization.h index a72646e810..e3ef434860 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h +++ b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_optimization.h @@ -18,9 +18,9 @@ #include "ir/anf.h" #include "ir/func_graph.h" -#include "backend/session/kernel_graph.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" namespace mindspore::graphkernel { using opt::PassManagerPtr; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_pass_manager.cc b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_pass_manager.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_pass_manager.cc rename to mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_pass_manager.cc index 16785d7b56..96afaad208 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_pass_manager.cc +++ b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_pass_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_pass_manager.h" +#include "common/graph_kernel/adapter/graph_kernel_pass_manager.h" #include diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_pass_manager.h b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_pass_manager.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_pass_manager.h rename to mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_pass_manager.h index ee1ac53ab9..190f23c916 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_pass_manager.h +++ b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_pass_manager.h @@ -22,7 +22,7 @@ #include #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/optimizer/pass_manager.h" namespace mindspore::graphkernel { using opt::PassManager; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_splitter_with_py.cc b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_splitter_with_py.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_splitter_with_py.cc rename to mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_splitter_with_py.cc index 30409710cf..4ed74b08dc 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_splitter_with_py.cc +++ b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_splitter_with_py.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_splitter_with_py.h" +#include "common/graph_kernel/adapter/graph_kernel_splitter_with_py.h" #include #include @@ -24,10 +24,10 @@ #include "utils/hash_map.h" #include "utils/ms_context.h" #include "pipeline/jit/parse/python_adapter.h" -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/akg/akg_kernel_json_generator.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/context/graph_kernel_flags.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_splitter_with_py.h b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_splitter_with_py.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_splitter_with_py.h rename to mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_splitter_with_py.h index 55d8295604..50225cd0d9 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/adapter/graph_kernel_splitter_with_py.h +++ b/mindspore/ccsrc/common/graph_kernel/adapter/graph_kernel_splitter_with_py.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_ADAPTER_GRAPH_KERNEL_SPLITTER_WITH_PY_H_ #include #include -#include "backend/optimizer/graph_kernel/core/graph_kernel_splitter.h" +#include "common/graph_kernel/core/graph_kernel_splitter.h" namespace mindspore::graphkernel { class GraphKernelSplitterWithPy : public GraphKernelSplitter { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/add_atomic_clean.cc b/mindspore/ccsrc/common/graph_kernel/add_atomic_clean.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/add_atomic_clean.cc rename to mindspore/ccsrc/common/graph_kernel/add_atomic_clean.cc index acb46d25f1..a57100e435 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/add_atomic_clean.cc +++ b/mindspore/ccsrc/common/graph_kernel/add_atomic_clean.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/add_atomic_clean.h" +#include "common/graph_kernel/add_atomic_clean.h" #include #include #include @@ -28,13 +28,13 @@ #include "ir/tensor.h" #include "utils/utils.h" #include "utils/log_adapter.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" #include "debug/anf_ir_dump.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/add_atomic_clean.h b/mindspore/ccsrc/common/graph_kernel/add_atomic_clean.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/add_atomic_clean.h rename to mindspore/ccsrc/common/graph_kernel/add_atomic_clean.h index 632fda076f..9ea9433ad1 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/add_atomic_clean.h +++ b/mindspore/ccsrc/common/graph_kernel/add_atomic_clean.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::graphkernel { struct AtomicAddInfo { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/add_stitch_atomic_clean_gpu.cc b/mindspore/ccsrc/common/graph_kernel/add_stitch_atomic_clean_gpu.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/add_stitch_atomic_clean_gpu.cc rename to mindspore/ccsrc/common/graph_kernel/add_stitch_atomic_clean_gpu.cc index 6d35ed13cb..70adf28a40 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/add_stitch_atomic_clean_gpu.cc +++ b/mindspore/ccsrc/common/graph_kernel/add_stitch_atomic_clean_gpu.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/add_stitch_atomic_clean_gpu.h" +#include "common/graph_kernel/add_stitch_atomic_clean_gpu.h" #include #include @@ -22,12 +22,12 @@ #include "ir/tensor.h" #include "utils/utils.h" #include "utils/log_adapter.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::graphkernel { void StitchAtomicCleanInsertter::CorrectKernelBuildInfo( diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/add_stitch_atomic_clean_gpu.h b/mindspore/ccsrc/common/graph_kernel/add_stitch_atomic_clean_gpu.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/add_stitch_atomic_clean_gpu.h rename to mindspore/ccsrc/common/graph_kernel/add_stitch_atomic_clean_gpu.h index 1bceb76664..ebe69ec081 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/add_stitch_atomic_clean_gpu.h +++ b/mindspore/ccsrc/common/graph_kernel/add_stitch_atomic_clean_gpu.h @@ -21,9 +21,9 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/graph_kernel/add_atomic_clean.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/optimizer/optimizer.h" +#include "common/graph_kernel/add_atomic_clean.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::graphkernel { class StitchAtomicCleanInsertter : public AtomicCleanInsertter { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/arithmetic_simplify.cc b/mindspore/ccsrc/common/graph_kernel/arithmetic_simplify.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/arithmetic_simplify.cc rename to mindspore/ccsrc/common/graph_kernel/arithmetic_simplify.cc index 079db23009..1cd9a23129 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/arithmetic_simplify.cc +++ b/mindspore/ccsrc/common/graph_kernel/arithmetic_simplify.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/arithmetic_simplify.h" +#include "common/graph_kernel/arithmetic_simplify.h" #include #include @@ -24,10 +24,10 @@ #include "utils/hash_map.h" #include "utils/hash_set.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/optimizer/graph_kernel/core/graph_builder.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/core/graph_builder.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/anf.h" #include "utils/context/graph_kernel_flags.h" diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/arithmetic_simplify.h b/mindspore/ccsrc/common/graph_kernel/arithmetic_simplify.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/arithmetic_simplify.h rename to mindspore/ccsrc/common/graph_kernel/arithmetic_simplify.h index 32da7fe9b9..0ec379731c 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/arithmetic_simplify.h +++ b/mindspore/ccsrc/common/graph_kernel/arithmetic_simplify.h @@ -21,9 +21,9 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "ir/func_graph.h" -#include "backend/optimizer/graph_kernel/model/lite_graph.h" +#include "common/graph_kernel/model/lite_graph.h" namespace mindspore::graphkernel { class PatternTree; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/axis_normalizer.cc b/mindspore/ccsrc/common/graph_kernel/axis_normalizer.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/axis_normalizer.cc rename to mindspore/ccsrc/common/graph_kernel/axis_normalizer.cc index 0d0f292841..3aba2c6451 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/axis_normalizer.cc +++ b/mindspore/ccsrc/common/graph_kernel/axis_normalizer.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/axis_normalizer.h" +#include "common/graph_kernel/axis_normalizer.h" #include #include #include "ir/scalar.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore::graphkernel { int64_t AxisNormalizer::NormAxis(int64_t x, size_t rank) const { return x >= 0 ? x : x + static_cast(rank); } diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/axis_normalizer.h b/mindspore/ccsrc/common/graph_kernel/axis_normalizer.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/axis_normalizer.h rename to mindspore/ccsrc/common/graph_kernel/axis_normalizer.h index 98ca7a80b4..b62cfff3e2 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/axis_normalizer.h +++ b/mindspore/ccsrc/common/graph_kernel/axis_normalizer.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_AXIS_NORMALIZER_H_ #include "ir/func_graph.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::graphkernel { // change Reduce nodes' axis to non-negative value diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/cast_matmul_fusion.cc b/mindspore/ccsrc/common/graph_kernel/cast_matmul_fusion.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/cast_matmul_fusion.cc rename to mindspore/ccsrc/common/graph_kernel/cast_matmul_fusion.cc index 922345c734..a83cf5e7ef 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/cast_matmul_fusion.cc +++ b/mindspore/ccsrc/common/graph_kernel/cast_matmul_fusion.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/cast_matmul_fusion.h" +#include "common/graph_kernel/cast_matmul_fusion.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/cast_matmul_fusion.h b/mindspore/ccsrc/common/graph_kernel/cast_matmul_fusion.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/cast_matmul_fusion.h rename to mindspore/ccsrc/common/graph_kernel/cast_matmul_fusion.h index 60f04cf265..c47ffb21fb 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/cast_matmul_fusion.h +++ b/mindspore/ccsrc/common/graph_kernel/cast_matmul_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/eliminate_redundant_output.cc b/mindspore/ccsrc/common/graph_kernel/core/eliminate_redundant_output.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/eliminate_redundant_output.cc rename to mindspore/ccsrc/common/graph_kernel/core/eliminate_redundant_output.cc index d81b49a142..b8c686836f 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/eliminate_redundant_output.cc +++ b/mindspore/ccsrc/common/graph_kernel/core/eliminate_redundant_output.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/core/eliminate_redundant_output.h" +#include "common/graph_kernel/core/eliminate_redundant_output.h" #include #include @@ -25,8 +25,8 @@ #include "ir/anf.h" #include "ir/graph_utils.h" #include "utils/anf_utils.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" -#include "backend/optimizer/graph_kernel/core/graph_builder.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/graph_builder.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/eliminate_redundant_output.h b/mindspore/ccsrc/common/graph_kernel/core/eliminate_redundant_output.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/eliminate_redundant_output.h rename to mindspore/ccsrc/common/graph_kernel/core/eliminate_redundant_output.h index c53732aff8..852ffd26e2 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/eliminate_redundant_output.h +++ b/mindspore/ccsrc/common/graph_kernel/core/eliminate_redundant_output.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_CORE_ELIMINATE_REDUNDANT_OUTPUT_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_CORE_ELIMINATE_REDUNDANT_OUTPUT_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::graphkernel { /* Eliminate the output without external user diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_builder.cc b/mindspore/ccsrc/common/graph_kernel/core/graph_builder.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_builder.cc rename to mindspore/ccsrc/common/graph_kernel/core/graph_builder.cc index d0576bf9bb..e14b3b88dc 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_builder.cc +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_builder.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/core/graph_builder.h" +#include "common/graph_kernel/core/graph_builder.h" #include #include @@ -27,8 +27,8 @@ #include "utils/utils.h" #include "utils/anf_utils.h" #include "utils/ordered_set.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_builder.h b/mindspore/ccsrc/common/graph_kernel/core/graph_builder.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_builder.h rename to mindspore/ccsrc/common/graph_kernel/core/graph_builder.h diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_callback.cc b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_callback.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_callback.cc rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_callback.cc index f8bfe528cf..0a1f9b336b 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_callback.cc +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_callback.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" #include namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_callback.h b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_callback.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_callback.h rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_callback.h index 02a64324ce..5e39305fd8 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_callback.h +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_callback.h @@ -23,7 +23,7 @@ #include "ir/anf.h" #include "ir/dtype/type_id.h" #include "utils/shape_utils.h" -#include "backend/optimizer/graph_kernel/model/node.h" +#include "common/graph_kernel/model/node.h" namespace mindspore::graphkernel { class Callback { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_cluster.cc b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_cluster.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_cluster.cc rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_cluster.cc index 1c30c91822..4e7b8f6323 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_cluster.cc +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_cluster.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/core/graph_kernel_cluster.h" +#include "common/graph_kernel/core/graph_kernel_cluster.h" #include #include @@ -28,10 +28,10 @@ #include "utils/ms_context.h" #include "utils/file_utils.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/pass/getitem_tuple.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" -#include "backend/optimizer/graph_kernel/core/graph_builder.h" +#include "backend/common/pass/getitem_tuple.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" +#include "common/graph_kernel/core/graph_builder.h" namespace mindspore::graphkernel { using opt::GetitemTuple; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_cluster.h b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_cluster.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_cluster.h rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_cluster.h index 91ae862b10..e66a152b82 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_cluster.h +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_cluster.h @@ -22,7 +22,7 @@ #include "utils/hash_map.h" #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_expander.cc b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_expander.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_expander.cc rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_expander.cc index 0769167939..47182fe94b 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_expander.cc +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_expander.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/core/graph_kernel_expander.h" +#include "common/graph_kernel/core/graph_kernel_expander.h" #include #include @@ -25,10 +25,10 @@ #include "utils/anf_utils.h" #include "utils/ms_context.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/graph_kernel/core/graph_builder.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/core/graph_builder.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" +#include "common/graph_kernel/expanders/expander_factory.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_expander.h b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_expander.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_expander.h rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_expander.h index e1a0a3288e..fe2967b5a9 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_expander.h +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_expander.h @@ -18,7 +18,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_splitter.cc b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_splitter.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_splitter.cc rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_splitter.cc index ffcca6502d..5a1208865b 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_splitter.cc +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_splitter.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/core/graph_kernel_splitter.h" +#include "common/graph_kernel/core/graph_kernel_splitter.h" #include #include #include @@ -26,10 +26,10 @@ #include "utils/hash_map.h" #include "utils/hash_set.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" -#include "backend/optimizer/graph_kernel/split_model/split_model_factory.h" +#include "kernel/akg/akg_kernel_json_generator.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" +#include "common/graph_kernel/split_model/split_model_factory.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_splitter.h b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_splitter.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_splitter.h rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_splitter.h index 2cb30a5f34..19f483e067 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_splitter.h +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_splitter.h @@ -17,11 +17,12 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_CORE_GRAPH_KERNEL_SPLITTER_H_ #include #include +#include #include #include #include #include "ir/func_graph.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore::graphkernel { struct StitchInfo { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_utils.cc b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_utils.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_utils.cc rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_utils.cc index 357999bfba..b3b64fd451 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_utils.cc +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_utils.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" #include #include #include @@ -22,7 +22,7 @@ #include "base/core_ops.h" #include "utils/anf_utils.h" #include "utils/utils.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" namespace mindspore::graphkernel { std::string GkUtils::ExtractGraphKernelName(const AnfNodePtrList &nodes, const std::string &prefix, diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_utils.h b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_utils.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_utils.h rename to mindspore/ccsrc/common/graph_kernel/core/graph_kernel_utils.h index 51fd8782df..92d3b94927 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/graph_kernel_utils.h +++ b/mindspore/ccsrc/common/graph_kernel/core/graph_kernel_utils.h @@ -23,7 +23,7 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "utils/hash_map.h" -#include "backend/optimizer/graph_kernel/model/lite_graph.h" +#include "common/graph_kernel/model/lite_graph.h" namespace mindspore::graphkernel { constexpr auto kGraphKernelDumpPath = "graph_kernel_dump"; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/shape_ops_splitter.cc b/mindspore/ccsrc/common/graph_kernel/core/shape_ops_splitter.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/shape_ops_splitter.cc rename to mindspore/ccsrc/common/graph_kernel/core/shape_ops_splitter.cc index 7a8566d0e2..a1c20c91f1 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/shape_ops_splitter.cc +++ b/mindspore/ccsrc/common/graph_kernel/core/shape_ops_splitter.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/core/shape_ops_splitter.h" +#include "common/graph_kernel/core/shape_ops_splitter.h" #include #include diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/shape_ops_splitter.h b/mindspore/ccsrc/common/graph_kernel/core/shape_ops_splitter.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/shape_ops_splitter.h rename to mindspore/ccsrc/common/graph_kernel/core/shape_ops_splitter.h index 290194483a..b43094f850 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/shape_ops_splitter.h +++ b/mindspore/ccsrc/common/graph_kernel/core/shape_ops_splitter.h @@ -19,7 +19,7 @@ #include #include #include "ir/func_graph.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore::graphkernel { class ShapeOpsSplitter : public opt::Pass { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/update_state_formatter.cc b/mindspore/ccsrc/common/graph_kernel/core/update_state_formatter.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/update_state_formatter.cc rename to mindspore/ccsrc/common/graph_kernel/core/update_state_formatter.cc index a1d60955d9..bfde065fab 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/update_state_formatter.cc +++ b/mindspore/ccsrc/common/graph_kernel/core/update_state_formatter.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/core/update_state_formatter.h" +#include "common/graph_kernel/core/update_state_formatter.h" #include #include @@ -21,9 +21,9 @@ #include #include #include "ir/anf.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" -#include "backend/optimizer/graph_kernel/core/eliminate_redundant_output.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/eliminate_redundant_output.h" namespace mindspore::graphkernel { AnfNodePtrList GetUpdateStateList(const FuncGraphPtr &func_graph) { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/update_state_formatter.h b/mindspore/ccsrc/common/graph_kernel/core/update_state_formatter.h similarity index 99% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/core/update_state_formatter.h rename to mindspore/ccsrc/common/graph_kernel/core/update_state_formatter.h index 294eca4c8c..820770a68f 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/core/update_state_formatter.h +++ b/mindspore/ccsrc/common/graph_kernel/core/update_state_formatter.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_CORE_UPDATE_STATE_FORMATTER_H_ #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_compute_precision.cc b/mindspore/ccsrc/common/graph_kernel/decrease_compute_precision.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_compute_precision.cc rename to mindspore/ccsrc/common/graph_kernel/decrease_compute_precision.cc index 01d9cf5748..822bcc8638 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_compute_precision.cc +++ b/mindspore/ccsrc/common/graph_kernel/decrease_compute_precision.cc @@ -20,15 +20,15 @@ #include #include #include "base/core_ops.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/decrease_compute_precision.h" +#include "kernel/kernel_build_info.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/decrease_compute_precision.h" namespace mindspore::graphkernel { // Add CastCNode diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_compute_precision.h b/mindspore/ccsrc/common/graph_kernel/decrease_compute_precision.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_compute_precision.h rename to mindspore/ccsrc/common/graph_kernel/decrease_compute_precision.h index e2a42ae2ea..31d3aed3fa 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_compute_precision.h +++ b/mindspore/ccsrc/common/graph_kernel/decrease_compute_precision.h @@ -19,8 +19,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::graphkernel { class DecreaseComputePrecision : public opt::Pass { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_transfer_precision.cc b/mindspore/ccsrc/common/graph_kernel/decrease_transfer_precision.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_transfer_precision.cc rename to mindspore/ccsrc/common/graph_kernel/decrease_transfer_precision.cc index e4adcd3a53..41eb2b8407 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_transfer_precision.cc +++ b/mindspore/ccsrc/common/graph_kernel/decrease_transfer_precision.cc @@ -21,15 +21,15 @@ #include #include "base/core_ops.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/tensor.h" #include "ir/manager.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/kernel_build_info.h" +#include "kernel/common_utils.h" #include "runtime/device/kernel_info.h" -#include "backend/optimizer/graph_kernel/decrease_transfer_precision.h" +#include "common/graph_kernel/decrease_transfer_precision.h" namespace mindspore::graphkernel { static const size_t GK_MIN_SIZE = 2; // 2 diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_transfer_precision.h b/mindspore/ccsrc/common/graph_kernel/decrease_transfer_precision.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_transfer_precision.h rename to mindspore/ccsrc/common/graph_kernel/decrease_transfer_precision.h index da202ee94f..55ba3ef4a3 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/decrease_transfer_precision.h +++ b/mindspore/ccsrc/common/graph_kernel/decrease_transfer_precision.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_DECREASE_TRANSFER_PRECISION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::graphkernel { class DecreaseTransferPrecision : public opt::Pass { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/depend_elimination.cc b/mindspore/ccsrc/common/graph_kernel/depend_elimination.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/depend_elimination.cc rename to mindspore/ccsrc/common/graph_kernel/depend_elimination.cc index 59b1960699..53d1c5c698 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/depend_elimination.cc +++ b/mindspore/ccsrc/common/graph_kernel/depend_elimination.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/depend_elimination.h" +#include "common/graph_kernel/depend_elimination.h" #include "utils/utils.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/depend_elimination.h b/mindspore/ccsrc/common/graph_kernel/depend_elimination.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/depend_elimination.h rename to mindspore/ccsrc/common/graph_kernel/depend_elimination.h index becf1e43fe..8f5fbdc1ae 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/depend_elimination.h +++ b/mindspore/ccsrc/common/graph_kernel/depend_elimination.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_DEPEND_ELIMINATION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_DEPEND_ELIMINATION_H_ -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore::graphkernel { // Optimize cases like %1 = Depend(%0, %0). This depend statement is necessary in frontend, but not here. diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/adam.cc b/mindspore/ccsrc/common/graph_kernel/expanders/adam.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/adam.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/adam.cc index defc47e887..87a6c3d4f0 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/adam.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/adam.cc @@ -17,7 +17,7 @@ #include #include -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/expanders/expander_factory.h" #include "ir/dtype.h" namespace mindspore::graphkernel::expanders { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/assign_add.cc b/mindspore/ccsrc/common/graph_kernel/expanders/assign_add.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/assign_add.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/assign_add.cc index 7f1528f620..005321e639 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/assign_add.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/assign_add.cc @@ -17,7 +17,7 @@ #include #include -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/expanders/expander_factory.h" #include "ir/dtype.h" namespace mindspore::graphkernel::expanders { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/bias_add.cc b/mindspore/ccsrc/common/graph_kernel/expanders/bias_add.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/bias_add.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/bias_add.cc index 2607a1bb16..770a4cfc32 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/bias_add.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/bias_add.cc @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" -#include "backend/optimizer/graph_kernel/expanders/utils.h" +#include "common/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/expanders/utils.h" namespace mindspore::graphkernel::expanders { class BiasAdd : public OpDesc { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/expander_factory.h b/mindspore/ccsrc/common/graph_kernel/expanders/expander_factory.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/expander_factory.h rename to mindspore/ccsrc/common/graph_kernel/expanders/expander_factory.h index b07bc080db..6529ab3bdb 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/expander_factory.h +++ b/mindspore/ccsrc/common/graph_kernel/expanders/expander_factory.h @@ -21,7 +21,7 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/graph_kernel/expanders/utils.h" +#include "common/graph_kernel/expanders/utils.h" namespace mindspore::graphkernel::expanders { class OpExpanderFactory { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/lamb_apply_optimizer_assign.cc b/mindspore/ccsrc/common/graph_kernel/expanders/lamb_apply_optimizer_assign.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/lamb_apply_optimizer_assign.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/lamb_apply_optimizer_assign.cc index 915696635f..a290666772 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/lamb_apply_optimizer_assign.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/lamb_apply_optimizer_assign.cc @@ -17,7 +17,7 @@ #include #include -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/expanders/expander_factory.h" #include "ir/dtype.h" namespace mindspore::graphkernel::expanders { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/lamb_apply_weight_assign.cc b/mindspore/ccsrc/common/graph_kernel/expanders/lamb_apply_weight_assign.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/lamb_apply_weight_assign.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/lamb_apply_weight_assign.cc index fb5f8568ac..552f48a468 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/lamb_apply_weight_assign.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/lamb_apply_weight_assign.cc @@ -17,7 +17,7 @@ #include #include -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/expanders/expander_factory.h" #include "ir/dtype.h" namespace mindspore::graphkernel::expanders { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/reshape.cc b/mindspore/ccsrc/common/graph_kernel/expanders/reshape.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/reshape.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/reshape.cc index 0bbdc06174..674be3f220 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/reshape.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/reshape.cc @@ -16,7 +16,7 @@ #include #include -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/expanders/expander_factory.h" namespace mindspore::graphkernel::expanders { class ExpandDims : public OpDesc { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/softplus.cc b/mindspore/ccsrc/common/graph_kernel/expanders/softplus.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/softplus.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/softplus.cc index 3df16b7eee..8d77c5acc4 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/softplus.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/softplus.cc @@ -17,7 +17,7 @@ #include #include -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/expanders/expander_factory.h" #include "ir/dtype.h" namespace mindspore::graphkernel::expanders { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/softplus_grad.cc b/mindspore/ccsrc/common/graph_kernel/expanders/softplus_grad.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/softplus_grad.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/softplus_grad.cc index d5edf727bf..909d8008cd 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/softplus_grad.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/softplus_grad.cc @@ -17,7 +17,7 @@ #include #include -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/expanders/expander_factory.h" #include "ir/dtype.h" namespace mindspore::graphkernel::expanders { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/standard_normal.cc b/mindspore/ccsrc/common/graph_kernel/expanders/standard_normal.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/standard_normal.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/standard_normal.cc index 406621eedc..36bcb35f36 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/standard_normal.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/standard_normal.cc @@ -17,7 +17,7 @@ #include #include -#include "backend/optimizer/graph_kernel/expanders/expander_factory.h" +#include "common/graph_kernel/expanders/expander_factory.h" namespace mindspore::graphkernel::expanders { class StandardNormal : public OpDesc { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/utils.cc b/mindspore/ccsrc/common/graph_kernel/expanders/utils.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/utils.cc rename to mindspore/ccsrc/common/graph_kernel/expanders/utils.cc index a06348ab42..de22ce4e8a 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/utils.cc +++ b/mindspore/ccsrc/common/graph_kernel/expanders/utils.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/expanders/utils.h" +#include "common/graph_kernel/expanders/utils.h" #include #include #include -#include "backend/optimizer/graph_kernel/model/lite_graph.h" -#include "backend/optimizer/graph_kernel/model/node.h" +#include "common/graph_kernel/model/lite_graph.h" +#include "common/graph_kernel/model/node.h" namespace mindspore::graphkernel::expanders { inner::LiteGraphPtr OpDesc::Run(const BaseInfoList &inputs, const BaseInfoList &outputs, const inner::DAttrs &attrs, diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/utils.h b/mindspore/ccsrc/common/graph_kernel/expanders/utils.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/utils.h rename to mindspore/ccsrc/common/graph_kernel/expanders/utils.h index 605de0fb6b..7f16598683 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/expanders/utils.h +++ b/mindspore/ccsrc/common/graph_kernel/expanders/utils.h @@ -20,8 +20,8 @@ #include #include -#include "backend/optimizer/graph_kernel/model/lite_graph.h" -#include "backend/optimizer/graph_kernel/model/node.h" +#include "common/graph_kernel/model/lite_graph.h" +#include "common/graph_kernel/model/node.h" namespace mindspore::graphkernel::expanders { using inner::NodePtrList; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_cse.cc b/mindspore/ccsrc/common/graph_kernel/graph_kernel_cse.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_cse.cc rename to mindspore/ccsrc/common/graph_kernel/graph_kernel_cse.cc index a134c93346..f4b7767392 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_cse.cc +++ b/mindspore/ccsrc/common/graph_kernel/graph_kernel_cse.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/graph_kernel_cse.h" +#include "common/graph_kernel/graph_kernel_cse.h" #include #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "utils/ms_utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_cse.h b/mindspore/ccsrc/common/graph_kernel/graph_kernel_cse.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_cse.h rename to mindspore/ccsrc/common/graph_kernel/graph_kernel_cse.h index e2d592d65c..5a93b42424 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_cse.h +++ b/mindspore/ccsrc/common/graph_kernel/graph_kernel_cse.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_GRAPH_KERNEL_CSE_H_ #include -#include "backend/optimizer/pass/common_subexpression_elimination.h" +#include "backend/common/pass/common_subexpression_elimination.h" namespace mindspore::graphkernel { using opt::BackendCSE; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_helper.cc b/mindspore/ccsrc/common/graph_kernel/graph_kernel_helper.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_helper.cc rename to mindspore/ccsrc/common/graph_kernel/graph_kernel_helper.cc index 1e463433b2..a96e3242a0 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_helper.cc +++ b/mindspore/ccsrc/common/graph_kernel/graph_kernel_helper.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/graph_kernel_helper.h" #include #include @@ -22,14 +22,14 @@ #include #include "utils/hash_set.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" -#include "backend/kernel_compiler/akg/akg_kernel_json_decoder.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/const_input_to_attr_registry.h" -#include "backend/optimizer/graph_kernel/adapter/fake_abstract_shape.h" -#include "backend/optimizer/graph_kernel/core/graph_builder.h" +#include "kernel/common_utils.h" +#include "kernel/akg/akg_kernel_json_generator.h" +#include "kernel/akg/akg_kernel_json_decoder.h" +#include "kernel/kernel.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/const_input_to_attr_registry.h" +#include "common/graph_kernel/adapter/fake_abstract_shape.h" +#include "common/graph_kernel/core/graph_builder.h" #include "ir/func_graph_cloner.h" #include "ir/func_graph.h" #include "pipeline/jit/parse/python_adapter.h" diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_helper.h b/mindspore/ccsrc/common/graph_kernel/graph_kernel_helper.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_helper.h rename to mindspore/ccsrc/common/graph_kernel/graph_kernel_helper.h index 53d13e059d..dc5b23adbe 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_helper.h +++ b/mindspore/ccsrc/common/graph_kernel/graph_kernel_helper.h @@ -27,11 +27,11 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "ir/primitive.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/akg/akg_kernel_json_generator.h" #include -#include "backend/optimizer/graph_kernel/model/lite_graph.h" +#include "common/graph_kernel/model/lite_graph.h" namespace mindspore::graphkernel { constexpr auto kIsFeatureMapOutput = "IsFeatureMapOutput"; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_recompute.cc b/mindspore/ccsrc/common/graph_kernel/graph_kernel_recompute.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_recompute.cc rename to mindspore/ccsrc/common/graph_kernel/graph_kernel_recompute.cc index f0997dd7b3..28ebee37d4 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_recompute.cc +++ b/mindspore/ccsrc/common/graph_kernel/graph_kernel_recompute.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/graph_kernel_recompute.h" +#include "common/graph_kernel/graph_kernel_recompute.h" #include #include @@ -28,9 +28,9 @@ #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/optimizer/graph_kernel/core/graph_builder.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/core/graph_builder.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_recompute.h b/mindspore/ccsrc/common/graph_kernel/graph_kernel_recompute.h similarity index 99% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_recompute.h rename to mindspore/ccsrc/common/graph_kernel/graph_kernel_recompute.h index 7205c30981..4706f06e17 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/graph_kernel_recompute.h +++ b/mindspore/ccsrc/common/graph_kernel/graph_kernel_recompute.h @@ -23,7 +23,7 @@ #include #include #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/insert_pad.cc b/mindspore/ccsrc/common/graph_kernel/insert_pad.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/insert_pad.cc rename to mindspore/ccsrc/common/graph_kernel/insert_pad.cc index 7e18f17c6d..b4d8783fe8 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/insert_pad.cc +++ b/mindspore/ccsrc/common/graph_kernel/insert_pad.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/insert_pad.h" +#include "common/graph_kernel/insert_pad.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" namespace mindspore { namespace prim { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/insert_pad.h b/mindspore/ccsrc/common/graph_kernel/insert_pad.h similarity index 89% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/insert_pad.h rename to mindspore/ccsrc/common/graph_kernel/insert_pad.h index e1ac1da94f..0f54dab4d1 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/insert_pad.h +++ b/mindspore/ccsrc/common/graph_kernel/insert_pad.h @@ -19,9 +19,9 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/graph_kernel_helper.h" namespace mindspore::graphkernel { class InsertPadOps : public opt::Pass { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/akg_build.cc b/mindspore/ccsrc/common/graph_kernel/lite_adapter/akg_build.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/akg_build.cc rename to mindspore/ccsrc/common/graph_kernel/lite_adapter/akg_build.cc index 8726a8adb7..acac06c471 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/akg_build.cc +++ b/mindspore/ccsrc/common/graph_kernel/lite_adapter/akg_build.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/lite_adapter/akg_build.h" +#include "common/graph_kernel/lite_adapter/akg_build.h" #include #include @@ -25,7 +25,7 @@ #include #include -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" +#include "kernel/akg/akg_kernel_json_generator.h" #include "ir/anf.h" #include "ir/func_graph.h" #include "utils/file_utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/akg_build.h b/mindspore/ccsrc/common/graph_kernel/lite_adapter/akg_build.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/akg_build.h rename to mindspore/ccsrc/common/graph_kernel/lite_adapter/akg_build.h diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/callback_impl.cc b/mindspore/ccsrc/common/graph_kernel/lite_adapter/callback_impl.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/callback_impl.cc rename to mindspore/ccsrc/common/graph_kernel/lite_adapter/callback_impl.cc index db9a4482b1..df5cea06f0 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/callback_impl.cc +++ b/mindspore/ccsrc/common/graph_kernel/lite_adapter/callback_impl.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/lite_adapter/callback_impl.h" +#include "common/graph_kernel/lite_adapter/callback_impl.h" #include #include diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/callback_impl.h b/mindspore/ccsrc/common/graph_kernel/lite_adapter/callback_impl.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/callback_impl.h rename to mindspore/ccsrc/common/graph_kernel/lite_adapter/callback_impl.h index f7ec5cd896..13057203ba 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/callback_impl.h +++ b/mindspore/ccsrc/common/graph_kernel/lite_adapter/callback_impl.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" namespace mindspore::graphkernel { using KernelWithIndex = std::pair; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_optimization.cc b/mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_optimization.cc similarity index 82% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_optimization.cc rename to mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_optimization.cc index 9da7102677..a91bb7b2e0 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_optimization.cc +++ b/mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_optimization.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/lite_adapter/graph_kernel_optimization.h" +#include "common/graph_kernel/lite_adapter/graph_kernel_optimization.h" #include #include @@ -21,14 +21,14 @@ #include "ir/func_graph.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/pass/getitem_tuple.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_cluster.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_expander.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_splitter.h" -#include "backend/optimizer/graph_kernel/core/eliminate_redundant_output.h" -#include "backend/optimizer/graph_kernel/core/shape_ops_splitter.h" -#include "backend/optimizer/graph_kernel/core/update_state_formatter.h" -#include "backend/optimizer/graph_kernel/lite_adapter/graph_kernel_pass_manager.h" +#include "backend/common/pass/getitem_tuple.h" +#include "common/graph_kernel/core/graph_kernel_cluster.h" +#include "common/graph_kernel/core/graph_kernel_expander.h" +#include "common/graph_kernel/core/graph_kernel_splitter.h" +#include "common/graph_kernel/core/eliminate_redundant_output.h" +#include "common/graph_kernel/core/shape_ops_splitter.h" +#include "common/graph_kernel/core/update_state_formatter.h" +#include "common/graph_kernel/lite_adapter/graph_kernel_pass_manager.h" namespace mindspore::graphkernel { using opt::GetitemTuple; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_optimization.h b/mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_optimization.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_optimization.h rename to mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_optimization.h index bfa545fddf..7e8e0a7b57 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_optimization.h +++ b/mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_optimization.h @@ -18,8 +18,8 @@ #include "ir/anf.h" #include "ir/func_graph.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" namespace mindspore::graphkernel { using opt::PassManagerPtr; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_pass_manager.cc b/mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_pass_manager.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_pass_manager.cc rename to mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_pass_manager.cc index 301c284217..d4ac50d9de 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_pass_manager.cc +++ b/mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_pass_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/lite_adapter/graph_kernel_pass_manager.h" +#include "common/graph_kernel/lite_adapter/graph_kernel_pass_manager.h" #include diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_pass_manager.h b/mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_pass_manager.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_pass_manager.h rename to mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_pass_manager.h index d3fd89e3a6..1c6b623ca5 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_pass_manager.h +++ b/mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_pass_manager.h @@ -22,7 +22,7 @@ #include #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/optimizer/pass_manager.h" namespace mindspore::graphkernel { using opt::PassManager; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/lite_graph.cc b/mindspore/ccsrc/common/graph_kernel/model/lite_graph.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/model/lite_graph.cc rename to mindspore/ccsrc/common/graph_kernel/model/lite_graph.cc index af7ce4e614..e8f6a3170f 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/lite_graph.cc +++ b/mindspore/ccsrc/common/graph_kernel/model/lite_graph.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/model/lite_graph.h" +#include "common/graph_kernel/model/lite_graph.h" #include #include @@ -24,9 +24,9 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/graph_kernel/model/node.h" -#include "backend/optimizer/graph_kernel/model/op_node.h" -#include "backend/optimizer/graph_kernel/model/op_register.h" +#include "common/graph_kernel/model/node.h" +#include "common/graph_kernel/model/op_node.h" +#include "common/graph_kernel/model/op_register.h" namespace mindspore::graphkernel::inner { std::string LiteGraph::ToString(bool reset_node_name) const { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/lite_graph.h b/mindspore/ccsrc/common/graph_kernel/model/lite_graph.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/model/lite_graph.h rename to mindspore/ccsrc/common/graph_kernel/model/lite_graph.h index 67dd3afd29..72abd15a84 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/lite_graph.h +++ b/mindspore/ccsrc/common/graph_kernel/model/lite_graph.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/graph_kernel/model/node.h" -#include "backend/optimizer/graph_kernel/model/op_node.h" +#include "common/graph_kernel/model/node.h" +#include "common/graph_kernel/model/op_node.h" namespace mindspore::graphkernel::inner { class LiteGraph { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/node.cc b/mindspore/ccsrc/common/graph_kernel/model/node.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/model/node.cc rename to mindspore/ccsrc/common/graph_kernel/model/node.cc index d1dbc80698..d9015c432e 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/node.cc +++ b/mindspore/ccsrc/common/graph_kernel/model/node.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/model/node.h" +#include "common/graph_kernel/model/node.h" #include #include diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/node.h b/mindspore/ccsrc/common/graph_kernel/model/node.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/model/node.h rename to mindspore/ccsrc/common/graph_kernel/model/node.h diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_node.cc b/mindspore/ccsrc/common/graph_kernel/model/op_node.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_node.cc rename to mindspore/ccsrc/common/graph_kernel/model/op_node.cc index f8d1ae78b7..e33b6363a0 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_node.cc +++ b/mindspore/ccsrc/common/graph_kernel/model/op_node.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/model/op_node.h" +#include "common/graph_kernel/model/op_node.h" #include #include @@ -24,7 +24,7 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/graph_kernel/model/node.h" +#include "common/graph_kernel/model/node.h" namespace mindspore::graphkernel::inner { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_node.h b/mindspore/ccsrc/common/graph_kernel/model/op_node.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_node.h rename to mindspore/ccsrc/common/graph_kernel/model/op_node.h index 3548a7aa5f..57c8dde69f 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_node.h +++ b/mindspore/ccsrc/common/graph_kernel/model/op_node.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/graph_kernel/model/node.h" +#include "common/graph_kernel/model/node.h" #include "ir/dtype/type.h" namespace mindspore::graphkernel::inner { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_register.cc b/mindspore/ccsrc/common/graph_kernel/model/op_register.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_register.cc rename to mindspore/ccsrc/common/graph_kernel/model/op_register.cc index f55a9577ef..6c97e12a7b 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_register.cc +++ b/mindspore/ccsrc/common/graph_kernel/model/op_register.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/model/op_register.h" +#include "common/graph_kernel/model/op_register.h" #include namespace mindspore::graphkernel::inner { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_register.h b/mindspore/ccsrc/common/graph_kernel/model/op_register.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_register.h rename to mindspore/ccsrc/common/graph_kernel/model/op_register.h index b8ea1c5100..0396c4d470 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/model/op_register.h +++ b/mindspore/ccsrc/common/graph_kernel/model/op_register.h @@ -20,7 +20,7 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/graph_kernel/model/op_node.h" +#include "common/graph_kernel/model/op_node.h" namespace mindspore::graphkernel::inner { using CreatorFunc = std::function; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/optimize_assign.cc b/mindspore/ccsrc/common/graph_kernel/optimize_assign.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/optimize_assign.cc rename to mindspore/ccsrc/common/graph_kernel/optimize_assign.cc index b80230d6f2..7ab561a9e9 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/optimize_assign.cc +++ b/mindspore/ccsrc/common/graph_kernel/optimize_assign.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/optimize_assign.h" +#include "common/graph_kernel/optimize_assign.h" #include #include @@ -21,9 +21,9 @@ #include #include "base/core_ops.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "common/graph_kernel/graph_kernel_helper.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/optimize_assign.h b/mindspore/ccsrc/common/graph_kernel/optimize_assign.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/optimize_assign.h rename to mindspore/ccsrc/common/graph_kernel/optimize_assign.h index 07a5f0b421..9c4cab90bf 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/optimize_assign.h +++ b/mindspore/ccsrc/common/graph_kernel/optimize_assign.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_OPTIMIZE_ASSIGN_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::graphkernel { class OptimizeAssign : public opt::Pass { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_cost_model.cc b/mindspore/ccsrc/common/graph_kernel/parallel_cost_model.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_cost_model.cc rename to mindspore/ccsrc/common/graph_kernel/parallel_cost_model.cc index 208563acd4..8c588f20bb 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_cost_model.cc +++ b/mindspore/ccsrc/common/graph_kernel/parallel_cost_model.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/parallel_cost_model.h" +#include "common/graph_kernel/parallel_cost_model.h" #include -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" +#include "kernel/akg/akg_kernel_json_generator.h" +#include "common/graph_kernel/graph_kernel_helper.h" #include "pipeline/jit/parse/python_adapter.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_cost_model.h b/mindspore/ccsrc/common/graph_kernel/parallel_cost_model.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_cost_model.h rename to mindspore/ccsrc/common/graph_kernel/parallel_cost_model.h index 70a92081a7..90f85d36d6 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_cost_model.h +++ b/mindspore/ccsrc/common/graph_kernel/parallel_cost_model.h @@ -25,10 +25,10 @@ #include #include "base/base.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/graph_kernel/parallel_cost_model.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "common/graph_kernel/parallel_cost_model.h" +#include "backend/common/session/kernel_graph.h" #include "pipeline/jit/parse/python_adapter.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_fusion.cc b/mindspore/ccsrc/common/graph_kernel/parallel_fusion.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_fusion.cc rename to mindspore/ccsrc/common/graph_kernel/parallel_fusion.cc index d753c62eed..a5c49ae2fa 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_fusion.cc +++ b/mindspore/ccsrc/common/graph_kernel/parallel_fusion.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/parallel_fusion.h" +#include "common/graph_kernel/parallel_fusion.h" #include #include @@ -22,13 +22,13 @@ #include #include #include "utils/context/graph_kernel_flags.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/kernel.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "kernel/common_utils.h" #include "frontend/operator/ops.h" #include "ir/func_graph_cloner.h" -#include "backend/optimizer/graph_kernel/core/update_state_formatter.h" -#include "backend/optimizer/graph_kernel/core/graph_builder.h" +#include "common/graph_kernel/core/update_state_formatter.h" +#include "common/graph_kernel/core/graph_builder.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_fusion.h b/mindspore/ccsrc/common/graph_kernel/parallel_fusion.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_fusion.h rename to mindspore/ccsrc/common/graph_kernel/parallel_fusion.h index 24bc54c67e..76e4bee023 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/parallel_fusion.h +++ b/mindspore/ccsrc/common/graph_kernel/parallel_fusion.h @@ -26,10 +26,10 @@ #include #include "base/base.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/graph_kernel/parallel_cost_model.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "common/graph_kernel/parallel_cost_model.h" +#include "backend/common/session/kernel_graph.h" #include "utils/ms_context.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/raise_reduction_precision.cc b/mindspore/ccsrc/common/graph_kernel/raise_reduction_precision.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/raise_reduction_precision.cc rename to mindspore/ccsrc/common/graph_kernel/raise_reduction_precision.cc index 19370f864e..0444a7bee5 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/raise_reduction_precision.cc +++ b/mindspore/ccsrc/common/graph_kernel/raise_reduction_precision.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/raise_reduction_precision.h" +#include "common/graph_kernel/raise_reduction_precision.h" #include #include "base/core_ops.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/tensor.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/kernel_build_info.h" +#include "kernel/common_utils.h" #include "runtime/device/kernel_info.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/raise_reduction_precision.h b/mindspore/ccsrc/common/graph_kernel/raise_reduction_precision.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/raise_reduction_precision.h rename to mindspore/ccsrc/common/graph_kernel/raise_reduction_precision.h index d794aa043d..bd99254e09 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/raise_reduction_precision.h +++ b/mindspore/ccsrc/common/graph_kernel/raise_reduction_precision.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_RAISE_REDUCTION_PRECISION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::graphkernel { class RaiseReductionPrecision : public opt::Pass { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/reduce_fake_out_mem.cc b/mindspore/ccsrc/common/graph_kernel/reduce_fake_out_mem.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/reduce_fake_out_mem.cc rename to mindspore/ccsrc/common/graph_kernel/reduce_fake_out_mem.cc index 4a2a0d2282..c13274de31 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/reduce_fake_out_mem.cc +++ b/mindspore/ccsrc/common/graph_kernel/reduce_fake_out_mem.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/reduce_fake_out_mem.h" +#include "common/graph_kernel/reduce_fake_out_mem.h" #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" namespace mindspore::graphkernel { constexpr auto kFakeOut = "fake_output"; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/reduce_fake_out_mem.h b/mindspore/ccsrc/common/graph_kernel/reduce_fake_out_mem.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/reduce_fake_out_mem.h rename to mindspore/ccsrc/common/graph_kernel/reduce_fake_out_mem.h index a92595e4fc..0ee2e9b315 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/reduce_fake_out_mem.h +++ b/mindspore/ccsrc/common/graph_kernel/reduce_fake_out_mem.h @@ -19,8 +19,8 @@ #include #include #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/graph_kernel/add_atomic_clean.h" +#include "backend/common/optimizer/pass.h" +#include "common/graph_kernel/add_atomic_clean.h" #include "ir/func_graph.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/reorder_ops.cc b/mindspore/ccsrc/common/graph_kernel/reorder_ops.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/reorder_ops.cc rename to mindspore/ccsrc/common/graph_kernel/reorder_ops.cc index 9bd6627971..b50ff54c81 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/reorder_ops.cc +++ b/mindspore/ccsrc/common/graph_kernel/reorder_ops.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/reorder_ops.h" +#include "common/graph_kernel/reorder_ops.h" #include #include #include @@ -22,9 +22,9 @@ #include "base/core_ops.h" #include "utils/utils.h" #include "utils/log_adapter.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "debug/anf_ir_dump.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/reorder_ops.h b/mindspore/ccsrc/common/graph_kernel/reorder_ops.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/reorder_ops.h rename to mindspore/ccsrc/common/graph_kernel/reorder_ops.h index 73dbf13095..833b56fec6 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/reorder_ops.h +++ b/mindspore/ccsrc/common/graph_kernel/reorder_ops.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore::graphkernel { struct NodeIOInfo { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/rewrite_output_shape.cc b/mindspore/ccsrc/common/graph_kernel/rewrite_output_shape.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/rewrite_output_shape.cc rename to mindspore/ccsrc/common/graph_kernel/rewrite_output_shape.cc index 2dae706cda..0e5dfd1f6a 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/rewrite_output_shape.cc +++ b/mindspore/ccsrc/common/graph_kernel/rewrite_output_shape.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/rewrite_output_shape.h" +#include "common/graph_kernel/rewrite_output_shape.h" #include #include #include "ir/scalar.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore::graphkernel { bool SaveOutputShape::Run(const FuncGraphPtr &func_graph) { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/rewrite_output_shape.h b/mindspore/ccsrc/common/graph_kernel/rewrite_output_shape.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/rewrite_output_shape.h rename to mindspore/ccsrc/common/graph_kernel/rewrite_output_shape.h index e59a3bdd83..2c04ca7ca7 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/rewrite_output_shape.h +++ b/mindspore/ccsrc/common/graph_kernel/rewrite_output_shape.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_REWRITE_OUTPUT_SHAPE_H_ #include #include "ir/func_graph.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore::graphkernel { class SaveOutputShape : public opt::Pass { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/area.cc b/mindspore/ccsrc/common/graph_kernel/split_model/area.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/area.cc rename to mindspore/ccsrc/common/graph_kernel/split_model/area.cc index e30d884b7a..e80b38ff0c 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/area.cc +++ b/mindspore/ccsrc/common/graph_kernel/split_model/area.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/split_model/area.h" +#include "common/graph_kernel/split_model/area.h" #include #include diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/area.h b/mindspore/ccsrc/common/graph_kernel/split_model/area.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/area.h rename to mindspore/ccsrc/common/graph_kernel/split_model/area.h index f3690d31da..7d1f07187b 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/area.h +++ b/mindspore/ccsrc/common/graph_kernel/split_model/area.h @@ -21,7 +21,7 @@ #include #include #include "utils/hash_map.h" -#include "backend/optimizer/graph_kernel/model/op_node.h" +#include "common/graph_kernel/model/op_node.h" namespace mindspore::graphkernel::inner { using NodePattern = PrimOp::ComputeType; diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/fuse_pattern.cc b/mindspore/ccsrc/common/graph_kernel/split_model/fuse_pattern.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/fuse_pattern.cc rename to mindspore/ccsrc/common/graph_kernel/split_model/fuse_pattern.cc index 9f307bcbd2..63951db6ca 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/fuse_pattern.cc +++ b/mindspore/ccsrc/common/graph_kernel/split_model/fuse_pattern.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/split_model/fuse_pattern.h" +#include "common/graph_kernel/split_model/fuse_pattern.h" #include namespace mindspore::graphkernel::inner { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/fuse_pattern.h b/mindspore/ccsrc/common/graph_kernel/split_model/fuse_pattern.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/fuse_pattern.h rename to mindspore/ccsrc/common/graph_kernel/split_model/fuse_pattern.h index 390d086442..dbb52b6c13 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/fuse_pattern.h +++ b/mindspore/ccsrc/common/graph_kernel/split_model/fuse_pattern.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/graph_kernel/split_model/area.h" +#include "common/graph_kernel/split_model/area.h" namespace mindspore::graphkernel::inner { class CircleChecker { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model.cc b/mindspore/ccsrc/common/graph_kernel/split_model/split_model.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model.cc rename to mindspore/ccsrc/common/graph_kernel/split_model/split_model.cc index 5545faac51..63ba88d736 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model.cc +++ b/mindspore/ccsrc/common/graph_kernel/split_model/split_model.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/split_model/split_model.h" +#include "common/graph_kernel/split_model/split_model.h" #include #include "utils/hash_set.h" diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model.h b/mindspore/ccsrc/common/graph_kernel/split_model/split_model.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model.h rename to mindspore/ccsrc/common/graph_kernel/split_model/split_model.h index 2f5e43cac7..0d783d9e55 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model.h +++ b/mindspore/ccsrc/common/graph_kernel/split_model/split_model.h @@ -21,9 +21,9 @@ #include #include #include -#include "backend/optimizer/graph_kernel/model/lite_graph.h" -#include "backend/optimizer/graph_kernel/split_model/area.h" -#include "backend/optimizer/graph_kernel/split_model/fuse_pattern.h" +#include "common/graph_kernel/model/lite_graph.h" +#include "common/graph_kernel/split_model/area.h" +#include "common/graph_kernel/split_model/fuse_pattern.h" namespace mindspore::graphkernel::inner { class ReachTable : public CircleChecker { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_cpu.cc b/mindspore/ccsrc/common/graph_kernel/split_model/split_model_cpu.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_cpu.cc rename to mindspore/ccsrc/common/graph_kernel/split_model/split_model_cpu.cc index a44f0a2dfe..c499a41051 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_cpu.cc +++ b/mindspore/ccsrc/common/graph_kernel/split_model/split_model_cpu.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/split_model/split_model_cpu.h" +#include "common/graph_kernel/split_model/split_model_cpu.h" #include namespace mindspore::graphkernel::inner { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_cpu.h b/mindspore/ccsrc/common/graph_kernel/split_model/split_model_cpu.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_cpu.h rename to mindspore/ccsrc/common/graph_kernel/split_model/split_model_cpu.h index e13b848302..ce84468968 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_cpu.h +++ b/mindspore/ccsrc/common/graph_kernel/split_model/split_model_cpu.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_SPLIT_MODEL_SPLIT_MODEL_CPU_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_SPLIT_MODEL_SPLIT_MODEL_CPU_H_ -#include "backend/optimizer/graph_kernel/split_model/split_model.h" +#include "common/graph_kernel/split_model/split_model.h" namespace mindspore::graphkernel::inner { class SplitModelCpu : public SplitModel { public: diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_factory.cc b/mindspore/ccsrc/common/graph_kernel/split_model/split_model_factory.cc similarity index 86% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_factory.cc rename to mindspore/ccsrc/common/graph_kernel/split_model/split_model_factory.cc index 1eadc7051c..b5de263f19 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_factory.cc +++ b/mindspore/ccsrc/common/graph_kernel/split_model/split_model_factory.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/split_model/split_model_factory.h" +#include "common/graph_kernel/split_model/split_model_factory.h" #include #include "utils/ms_context.h" -#include "backend/optimizer/graph_kernel/split_model/split_model_cpu.h" +#include "common/graph_kernel/split_model/split_model_cpu.h" namespace mindspore::graphkernel::inner { SplitModelPtr SplitModelFactory::CreateSplitModel(const std::string &processor) { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_factory.h b/mindspore/ccsrc/common/graph_kernel/split_model/split_model_factory.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_factory.h rename to mindspore/ccsrc/common/graph_kernel/split_model/split_model_factory.h index c62389864f..319e1ab83f 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_model/split_model_factory.h +++ b/mindspore/ccsrc/common/graph_kernel/split_model/split_model_factory.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_SPLIT_MODEL_SPLIT_MODEL_FACTORY_H_ #include -#include "backend/optimizer/graph_kernel/split_model/split_model.h" +#include "common/graph_kernel/split_model/split_model.h" namespace mindspore::graphkernel::inner { class SplitModelFactory { public: diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_umonad.cc b/mindspore/ccsrc/common/graph_kernel/split_umonad.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_umonad.cc rename to mindspore/ccsrc/common/graph_kernel/split_umonad.cc index 6251eb01f6..c617f15e14 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_umonad.cc +++ b/mindspore/ccsrc/common/graph_kernel/split_umonad.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/split_umonad.h" +#include "common/graph_kernel/split_umonad.h" #include #include @@ -23,7 +23,7 @@ #include "base/core_ops.h" #include "utils/utils.h" #include "runtime/device/kernel_info.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore::graphkernel { const BaseRef SplitAssign::DefinePattern() const { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_umonad.h b/mindspore/ccsrc/common/graph_kernel/split_umonad.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/split_umonad.h rename to mindspore/ccsrc/common/graph_kernel/split_umonad.h index 622e12108f..6381dc3ece 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/split_umonad.h +++ b/mindspore/ccsrc/common/graph_kernel/split_umonad.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_SPLIT_UMONAD_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_SPLIT_UMONAD_H_ -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.h" +#include "backend/common/optimizer/optimizer.h" +#include "common/graph_kernel/adapter/graph_kernel_expander_with_py.h" namespace mindspore::graphkernel { class SplitAssign : public opt::PatternProcessPass { public: diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/substitute_dropout.cc b/mindspore/ccsrc/common/graph_kernel/substitute_dropout.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/substitute_dropout.cc rename to mindspore/ccsrc/common/graph_kernel/substitute_dropout.cc index 1455d16355..048918feee 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/substitute_dropout.cc +++ b/mindspore/ccsrc/common/graph_kernel/substitute_dropout.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/substitute_dropout.h" +#include "common/graph_kernel/substitute_dropout.h" #include #include @@ -22,11 +22,11 @@ #include "base/core_ops.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/tensor.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" #include "runtime/device/kernel_info.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/substitute_dropout.h b/mindspore/ccsrc/common/graph_kernel/substitute_dropout.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/substitute_dropout.h rename to mindspore/ccsrc/common/graph_kernel/substitute_dropout.h index 31849e5d3e..41bd1db01b 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/substitute_dropout.h +++ b/mindspore/ccsrc/common/graph_kernel/substitute_dropout.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_SUBSTITUTE_DROPOUT_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_SUBSTITUTE_DROPOUT_H_ -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_expander_with_py.h" +#include "common/graph_kernel/adapter/graph_kernel_expander_with_py.h" namespace mindspore::graphkernel { class DropoutExpander : public PyExpander { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/transform_op_optimizer.cc b/mindspore/ccsrc/common/graph_kernel/transform_op_optimizer.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/transform_op_optimizer.cc rename to mindspore/ccsrc/common/graph_kernel/transform_op_optimizer.cc index a6423bce3d..89cb90638f 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/transform_op_optimizer.cc +++ b/mindspore/ccsrc/common/graph_kernel/transform_op_optimizer.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/transform_op_optimizer.h" +#include "common/graph_kernel/transform_op_optimizer.h" #include #include #include @@ -26,13 +26,13 @@ #include "base/core_ops.h" #include "ir/graph_utils.h" #include "debug/common.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/optimizer/graph_kernel/model/lite_graph.h" -#include "backend/optimizer/graph_kernel/model/op_register.h" -#include "backend/optimizer/graph_kernel/core/graph_builder.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" +#include "kernel/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/model/lite_graph.h" +#include "common/graph_kernel/model/op_register.h" +#include "common/graph_kernel/core/graph_builder.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" namespace mindspore::graphkernel { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/transform_op_optimizer.h b/mindspore/ccsrc/common/graph_kernel/transform_op_optimizer.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/transform_op_optimizer.h rename to mindspore/ccsrc/common/graph_kernel/transform_op_optimizer.h index 42da94d684..3c4612fa90 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/transform_op_optimizer.h +++ b/mindspore/ccsrc/common/graph_kernel/transform_op_optimizer.h @@ -18,9 +18,9 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" -#include "backend/optimizer/graph_kernel/model/lite_graph.h" +#include "common/graph_kernel/model/lite_graph.h" namespace mindspore::graphkernel { /** diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/tsa_atomic_add_to_first_tensor.cc b/mindspore/ccsrc/common/graph_kernel/tsa_atomic_add_to_first_tensor.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/tsa_atomic_add_to_first_tensor.cc rename to mindspore/ccsrc/common/graph_kernel/tsa_atomic_add_to_first_tensor.cc index d44bd620e0..f5ffc5b8b0 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/tsa_atomic_add_to_first_tensor.cc +++ b/mindspore/ccsrc/common/graph_kernel/tsa_atomic_add_to_first_tensor.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/tsa_atomic_add_to_first_tensor.h" +#include "common/graph_kernel/tsa_atomic_add_to_first_tensor.h" #include #include #include @@ -23,12 +23,12 @@ #include "ir/tensor.h" #include "utils/utils.h" #include "utils/log_adapter.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "common/graph_kernel/core/graph_kernel_utils.h" namespace mindspore::graphkernel { class TsaChecker : public AtomicAddChecker { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/tsa_atomic_add_to_first_tensor.h b/mindspore/ccsrc/common/graph_kernel/tsa_atomic_add_to_first_tensor.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/tsa_atomic_add_to_first_tensor.h rename to mindspore/ccsrc/common/graph_kernel/tsa_atomic_add_to_first_tensor.h index e8b9c2a16a..b390203cf1 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/tsa_atomic_add_to_first_tensor.h +++ b/mindspore/ccsrc/common/graph_kernel/tsa_atomic_add_to_first_tensor.h @@ -21,9 +21,9 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/graph_kernel/add_atomic_clean.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/optimizer/optimizer.h" +#include "common/graph_kernel/add_atomic_clean.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::graphkernel { /* diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/uss_atomic_add.cc b/mindspore/ccsrc/common/graph_kernel/uss_atomic_add.cc similarity index 88% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/uss_atomic_add.cc rename to mindspore/ccsrc/common/graph_kernel/uss_atomic_add.cc index 40031a68b7..c3d836b86e 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/uss_atomic_add.cc +++ b/mindspore/ccsrc/common/graph_kernel/uss_atomic_add.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/optimizer/graph_kernel/uss_atomic_add.h" +#include "common/graph_kernel/uss_atomic_add.h" #include #include "base/core_ops.h" #include "ir/tensor.h" #include "utils/utils.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::graphkernel { class UssChecker : public AtomicAddChecker { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/uss_atomic_add.h b/mindspore/ccsrc/common/graph_kernel/uss_atomic_add.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/uss_atomic_add.h rename to mindspore/ccsrc/common/graph_kernel/uss_atomic_add.h index 2e9dc51aa8..9f63347efd 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/uss_atomic_add.h +++ b/mindspore/ccsrc/common/graph_kernel/uss_atomic_add.h @@ -21,9 +21,9 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/graph_kernel/add_atomic_clean.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/optimizer/optimizer.h" +#include "common/graph_kernel/add_atomic_clean.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::graphkernel { /* diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.cc b/mindspore/ccsrc/common/graph_kernel/value_graph_binder.cc similarity index 87% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.cc rename to mindspore/ccsrc/common/graph_kernel/value_graph_binder.cc index ab4e3ad34a..b4dde800d1 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.cc +++ b/mindspore/ccsrc/common/graph_kernel/value_graph_binder.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/graph_kernel/value_graph_binder.h" +#include "common/graph_kernel/value_graph_binder.h" #include "frontend/optimizer/irpass.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/graph_kernel_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/graph_kernel_helper.h" namespace mindspore::graphkernel { bool BindValueToGraph::Run(const FuncGraphPtr &func_graph) { diff --git a/mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.h b/mindspore/ccsrc/common/graph_kernel/value_graph_binder.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.h rename to mindspore/ccsrc/common/graph_kernel/value_graph_binder.h index fef251781f..6657eb54b7 100644 --- a/mindspore/ccsrc/backend/optimizer/graph_kernel/value_graph_binder.h +++ b/mindspore/ccsrc/common/graph_kernel/value_graph_binder.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GRAPH_KERNEL_VALUE_GRAPH_BINDER_H_ #include #include "ir/func_graph.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore::graphkernel { class BindValueToGraph : public opt::Pass { diff --git a/mindspore/ccsrc/common/mem_reuse/CMakeLists.txt b/mindspore/ccsrc/common/mem_reuse/CMakeLists.txt new file mode 100644 index 0000000000..6d6baad9ff --- /dev/null +++ b/mindspore/ccsrc/common/mem_reuse/CMakeLists.txt @@ -0,0 +1,15 @@ +file(GLOB_RECURSE _PREACTIVATE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -Wno-user-defined-warnings -Wno-inconsistent-missing-override \ + -Wno-overloaded-virtual -Wno-unused-const-variable -Wno-pessimizing-move") +endif() + +set_property(SOURCE ${_PREACTIVATE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT) +add_library(_mindspore_common_mem_reuse_obj OBJECT ${_PREACTIVATE_SRC_LIST}) diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.cc b/mindspore/ccsrc/common/mem_reuse/kernel_refcount.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.cc rename to mindspore/ccsrc/common/mem_reuse/kernel_refcount.cc index bc7ad78d70..aae543da6e 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.cc +++ b/mindspore/ccsrc/common/mem_reuse/kernel_refcount.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/mem_reuse/kernel_refcount.h" +#include "common/mem_reuse/kernel_refcount.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.h b/mindspore/ccsrc/common/mem_reuse/kernel_refcount.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.h rename to mindspore/ccsrc/common/mem_reuse/kernel_refcount.h index 53dcca8eec..15bdf983fc 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/kernel_refcount.h +++ b/mindspore/ccsrc/common/mem_reuse/kernel_refcount.h @@ -32,7 +32,7 @@ class KernelRefCount { public: uint32_t stream_id_; int ref_count_; - // used by dynamic memory pool, it will be reseted by ref_count_ when one minibatch end + // used by dynamic memory pool, it will be reset by ref_count_ when one minibatch end int ref_count_dynamic_use_; size_t offset_; size_t size_; diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_copy_manager.h b/mindspore/ccsrc/common/mem_reuse/mem_copy_manager.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/mem_copy_manager.h rename to mindspore/ccsrc/common/mem_reuse/mem_copy_manager.h index 469d5d7bc6..68e344e935 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_copy_manager.h +++ b/mindspore/ccsrc/common/mem_reuse/mem_copy_manager.h @@ -23,8 +23,8 @@ #include #include #include -#include "backend/session/kernel_graph.h" -#include "backend/kernel_compiler/kernel.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/kernel.h" using HostAddress = mindspore::kernel::Address; namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc b/mindspore/ccsrc/common/mem_reuse/mem_dynamic_allocator.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc rename to mindspore/ccsrc/common/mem_reuse/mem_dynamic_allocator.cc index a36d85cdf8..0e542d7f7e 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc +++ b/mindspore/ccsrc/common/mem_reuse/mem_dynamic_allocator.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/mem_reuse/mem_dynamic_allocator.h" +#include "common/mem_reuse/mem_dynamic_allocator.h" #include #include "utils/ms_utils.h" #include "utils/convert_utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.h b/mindspore/ccsrc/common/mem_reuse/mem_dynamic_allocator.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.h rename to mindspore/ccsrc/common/mem_reuse/mem_dynamic_allocator.h diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.cc b/mindspore/ccsrc/common/mem_reuse/mem_reuse.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.cc rename to mindspore/ccsrc/common/mem_reuse/mem_reuse.cc index 7b7cfb7b7f..8ffab8b1c3 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.cc +++ b/mindspore/ccsrc/common/mem_reuse/mem_reuse.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/mem_reuse/mem_reuse.h" +#include "common/mem_reuse/mem_reuse.h" #include #include #include #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/mem_reuse/mem_reuse_checker.h" -#include "backend/optimizer/common/helper.h" +#include "common/mem_reuse/mem_reuse_checker.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace memreuse { diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.h b/mindspore/ccsrc/common/mem_reuse/mem_reuse.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.h rename to mindspore/ccsrc/common/mem_reuse/mem_reuse.h index 31773cad7f..c8f88d9c46 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse.h +++ b/mindspore/ccsrc/common/mem_reuse/mem_reuse.h @@ -20,10 +20,10 @@ #include #include #include "utils/hash_map.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" +#include "common/mem_reuse/kernel_refcount.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" #include "utils/ms_context.h" using mindspore::kernel::tbe::TbeUtils; namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.cc b/mindspore/ccsrc/common/mem_reuse/mem_reuse_checker.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.cc rename to mindspore/ccsrc/common/mem_reuse/mem_reuse_checker.cc index 8b97e77674..682c27bc91 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.cc +++ b/mindspore/ccsrc/common/mem_reuse/mem_reuse_checker.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/mem_reuse/mem_reuse_checker.h" +#include "common/mem_reuse/mem_reuse_checker.h" #include #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.h b/mindspore/ccsrc/common/mem_reuse/mem_reuse_checker.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.h rename to mindspore/ccsrc/common/mem_reuse/mem_reuse_checker.h index 6037017259..f454bd8018 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_reuse_checker.h +++ b/mindspore/ccsrc/common/mem_reuse/mem_reuse_checker.h @@ -23,9 +23,9 @@ #include #include #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/common/session/anf_runtime_algorithm.h" +#include "common/mem_reuse/mem_reuse.h" +#include "kernel/common_utils.h" namespace mindspore { namespace memreuse { constexpr auto kSplitC = '/'; diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.cc b/mindspore/ccsrc/common/mem_reuse/mem_swap_manager.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.cc rename to mindspore/ccsrc/common/mem_reuse/mem_swap_manager.cc index 3d5e8d79e3..ef7a11668c 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.cc +++ b/mindspore/ccsrc/common/mem_reuse/mem_swap_manager.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/optimizer/mem_reuse/mem_swap_manager.h" +#include "common/mem_reuse/mem_swap_manager.h" #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_runtime_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.h b/mindspore/ccsrc/common/mem_reuse/mem_swap_manager.h similarity index 99% rename from mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.h rename to mindspore/ccsrc/common/mem_reuse/mem_swap_manager.h index 9e2f9a78de..5731bd250c 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_swap_manager.h +++ b/mindspore/ccsrc/common/mem_reuse/mem_swap_manager.h @@ -23,7 +23,7 @@ #include #include "utils/hash_map.h" #include "utils/hash_set.h" -#include "backend/optimizer/mem_reuse/mem_copy_manager.h" +#include "common/mem_reuse/mem_copy_manager.h" using PerformPair = std::pair; namespace mindspore { diff --git a/mindspore/ccsrc/cxx_api/CMakeLists.txt b/mindspore/ccsrc/cxx_api/CMakeLists.txt index ba2883fe68..4502114e38 100644 --- a/mindspore/ccsrc/cxx_api/CMakeLists.txt +++ b/mindspore/ccsrc/cxx_api/CMakeLists.txt @@ -82,7 +82,7 @@ if(BUILD_LITE) target_link_libraries(mindspore_shared_lib PRIVATE $) elseif(ENABLE_ACL AND NOT ENABLE_D) target_link_libraries(mindspore_shared_lib PRIVATE $ - $) + $) endif() if(NOT BUILD_LITE) set_target_properties(mindspore_shared_lib PROPERTIES OUTPUT_NAME mindspore) diff --git a/mindspore/ccsrc/cxx_api/akg_kernel_register.cc b/mindspore/ccsrc/cxx_api/akg_kernel_register.cc index 6ab67f918d..6faf77ba45 100644 --- a/mindspore/ccsrc/cxx_api/akg_kernel_register.cc +++ b/mindspore/ccsrc/cxx_api/akg_kernel_register.cc @@ -19,7 +19,7 @@ #include #include #include -#include "backend/kernel_compiler/oplib/oplib.h" +#include "kernel/oplib/oplib.h" static std::mutex init_mutex; static bool Initialized = false; diff --git a/mindspore/ccsrc/cxx_api/graph/ascend/ascend_graph_impl.cc b/mindspore/ccsrc/cxx_api/graph/ascend/ascend_graph_impl.cc index 5b190287d7..f8bd8127dd 100644 --- a/mindspore/ccsrc/cxx_api/graph/ascend/ascend_graph_impl.cc +++ b/mindspore/ccsrc/cxx_api/graph/ascend/ascend_graph_impl.cc @@ -22,8 +22,8 @@ #include "utils/log_adapter.h" #include "utils/context/context_extends.h" #include "mindspore/core/base/base_ref_utils.h" -#include "backend/session/session_factory.h" -#include "backend/session/executor_manager.h" +#include "backend/common/session/session_factory.h" +#include "backend/common/session/executor_manager.h" #include "runtime/device/kernel_runtime_manager.h" #include "runtime/dev.h" #include "pipeline/jit/pipeline.h" diff --git a/mindspore/ccsrc/cxx_api/graph/ascend/ascend_graph_impl.h b/mindspore/ccsrc/cxx_api/graph/ascend/ascend_graph_impl.h index a38d5b491f..b335ee7919 100644 --- a/mindspore/ccsrc/cxx_api/graph/ascend/ascend_graph_impl.h +++ b/mindspore/ccsrc/cxx_api/graph/ascend/ascend_graph_impl.h @@ -24,7 +24,7 @@ #include "include/api/status.h" #include "include/api/graph.h" #include "cxx_api/graph/graph_impl.h" -#include "backend/session/session_basic.h" +#include "backend/common/session/session_basic.h" #include "ir/anf.h" #include "cxx_api/model/model_impl.h" #include "runtime/context.h" diff --git a/mindspore/ccsrc/cxx_api/graph/gpu/gpu_graph_impl.cc b/mindspore/ccsrc/cxx_api/graph/gpu/gpu_graph_impl.cc index f55f90a0d8..acb45a9729 100644 --- a/mindspore/ccsrc/cxx_api/graph/gpu/gpu_graph_impl.cc +++ b/mindspore/ccsrc/cxx_api/graph/gpu/gpu_graph_impl.cc @@ -20,10 +20,10 @@ #include "cxx_api/akg_kernel_register.h" #include "utils/log_adapter.h" #include "mindspore/core/base/base_ref_utils.h" -#include "backend/session/session_factory.h" -#include "backend/session/executor_manager.h" +#include "backend/common/session/session_factory.h" +#include "backend/common/session/executor_manager.h" #include "runtime/device/kernel_runtime_manager.h" -#include "runtime/device/gpu/cuda_driver.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" namespace mindspore { API_FACTORY_REG(GraphCell::GraphImpl, GPUGraphImpl); diff --git a/mindspore/ccsrc/cxx_api/graph/gpu/gpu_graph_impl.h b/mindspore/ccsrc/cxx_api/graph/gpu/gpu_graph_impl.h index 2e6c6c0683..5ab677063b 100644 --- a/mindspore/ccsrc/cxx_api/graph/gpu/gpu_graph_impl.h +++ b/mindspore/ccsrc/cxx_api/graph/gpu/gpu_graph_impl.h @@ -22,7 +22,7 @@ #include "include/api/status.h" #include "include/api/graph.h" #include "cxx_api/graph/graph_impl.h" -#include "backend/session/session_basic.h" +#include "backend/common/session/session_basic.h" #include "ir/anf.h" #include "cxx_api/model/model_impl.h" diff --git a/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_multi_graph_session.cc b/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_multi_graph_session.cc index 4df94a5ba0..2032009f24 100644 --- a/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_multi_graph_session.cc +++ b/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_multi_graph_session.cc @@ -17,9 +17,9 @@ #include #include #include -#include "backend/session/session_factory.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_rnn.h" +#include "backend/common/session/session_factory.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_rnn.h" #include "cxx_api/model/acl/model_converter.h" #include "cxx_api/model/acl/acl_model_options.h" #include "cxx_api/model/acl/acl_vm/ms_tensor_ref.h" diff --git a/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_multi_graph_session.h b/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_multi_graph_session.h index bc64149418..956ac59c05 100644 --- a/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_multi_graph_session.h +++ b/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_multi_graph_session.h @@ -22,7 +22,7 @@ #include #include "include/api/types.h" #include "include/api/cell.h" -#include "backend/session/session_basic.h" +#include "backend/common/session/session_basic.h" namespace mindspore { class AclModelOptions; diff --git a/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_vm.h b/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_vm.h index c5ead37928..2d0799b567 100644 --- a/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_vm.h +++ b/mindspore/ccsrc/cxx_api/model/acl/acl_vm/acl_vm.h @@ -19,8 +19,8 @@ #include #include #include -#include "vm/transform.h" -#include "vm/backend.h" +#include "backend/graph_compiler/transform.h" +#include "backend/graph_compiler/backend.h" #include "cxx_api/model/acl/acl_vm/ms_tensor_ref.h" namespace mindspore { diff --git a/mindspore/ccsrc/cxx_api/model/ms/ms_model.h b/mindspore/ccsrc/cxx_api/model/ms/ms_model.h index 93c012a350..2d382ac6f2 100644 --- a/mindspore/ccsrc/cxx_api/model/ms/ms_model.h +++ b/mindspore/ccsrc/cxx_api/model/ms/ms_model.h @@ -23,7 +23,7 @@ #include #include -#include "backend/session/session_basic.h" +#include "backend/common/session/session_basic.h" #include "ir/anf.h" #include "include/api/status.h" #include "cxx_api/model/model_impl.h" diff --git a/mindspore/ccsrc/debug/anf_ir_dump.cc b/mindspore/ccsrc/debug/anf_ir_dump.cc index cfc0ecf31e..463e1febc1 100644 --- a/mindspore/ccsrc/debug/anf_ir_dump.cc +++ b/mindspore/ccsrc/debug/anf_ir_dump.cc @@ -25,7 +25,7 @@ #include "ir/func_graph.h" #include "runtime/device/kernel_info.h" #include "ir/graph_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/parallel/ops_info/operator_info.h" #include "pipeline/jit/base.h" #include "debug/trace.h" diff --git a/mindspore/ccsrc/debug/data_dump/cpu_e2e_dump.cc b/mindspore/ccsrc/debug/data_dump/cpu_e2e_dump.cc index 1a504e5bc0..859c742e79 100644 --- a/mindspore/ccsrc/debug/data_dump/cpu_e2e_dump.cc +++ b/mindspore/ccsrc/debug/data_dump/cpu_e2e_dump.cc @@ -16,7 +16,7 @@ #include "debug/data_dump/cpu_e2e_dump.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "debug/anf_ir_utils.h" #include "debug/common.h" diff --git a/mindspore/ccsrc/debug/data_dump/dump_json_parser.cc b/mindspore/ccsrc/debug/data_dump/dump_json_parser.cc index 866e162c07..811631c338 100644 --- a/mindspore/ccsrc/debug/data_dump/dump_json_parser.cc +++ b/mindspore/ccsrc/debug/data_dump/dump_json_parser.cc @@ -19,7 +19,7 @@ #include "debug/common.h" #include "utils/ms_context.h" #include "utils/convert_utils_base.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "debug/data_dump/npy_header.h" #include "debug/anf_ir_utils.h" #include "utils/comm_manager.h" diff --git a/mindspore/ccsrc/debug/data_dump/dump_json_parser.h b/mindspore/ccsrc/debug/data_dump/dump_json_parser.h index bc04d25368..307971ee02 100644 --- a/mindspore/ccsrc/debug/data_dump/dump_json_parser.h +++ b/mindspore/ccsrc/debug/data_dump/dump_json_parser.h @@ -24,7 +24,7 @@ #include #include "nlohmann/json.hpp" #include "utils/ms_utils.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { class DumpJsonParser { public: diff --git a/mindspore/ccsrc/debug/data_dump/dump_utils.cc b/mindspore/ccsrc/debug/data_dump/dump_utils.cc index 520b6d21ec..8310dec59f 100644 --- a/mindspore/ccsrc/debug/data_dump/dump_utils.cc +++ b/mindspore/ccsrc/debug/data_dump/dump_utils.cc @@ -22,11 +22,11 @@ #include "utils/ms_context.h" #include "debug/anf_ir_utils.h" #include "debug/data_dump/dump_json_parser.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_runtime_manager.h" #include "utils/utils.h" #include "debug/common.h" -#include "runtime/framework/device_tensor_store.h" +#include "runtime/graph_scheduler/device_tensor_store.h" using mindspore::runtime::DeviceTensorStore; diff --git a/mindspore/ccsrc/debug/data_dump/dump_utils.h b/mindspore/ccsrc/debug/data_dump/dump_utils.h index 0b27748d8a..32dc12ada4 100644 --- a/mindspore/ccsrc/debug/data_dump/dump_utils.h +++ b/mindspore/ccsrc/debug/data_dump/dump_utils.h @@ -21,7 +21,7 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "runtime/device/device_address.h" using DeviceTensor = mindspore::device::DeviceAddress; diff --git a/mindspore/ccsrc/debug/data_dump/e2e_dump.cc b/mindspore/ccsrc/debug/data_dump/e2e_dump.cc index 39bf6b2d87..a5ea3fadd9 100644 --- a/mindspore/ccsrc/debug/data_dump/e2e_dump.cc +++ b/mindspore/ccsrc/debug/data_dump/e2e_dump.cc @@ -28,7 +28,7 @@ #include "utils/ms_device_shape_transfer.h" #include "debug/anf_ir_utils.h" #include "debug/common.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_context.h" #include "runtime/device/kernel_runtime_manager.h" #include "utils/config_manager.h" diff --git a/mindspore/ccsrc/debug/data_dump/e2e_dump.h b/mindspore/ccsrc/debug/data_dump/e2e_dump.h index aa337d3b9a..786d01eaa7 100644 --- a/mindspore/ccsrc/debug/data_dump/e2e_dump.h +++ b/mindspore/ccsrc/debug/data_dump/e2e_dump.h @@ -21,7 +21,7 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "runtime/device/device_address.h" #include "debug/data_dump/dump_json_parser.h" #include "debug/data_dump/dump_utils.h" diff --git a/mindspore/ccsrc/debug/debug_services.cc b/mindspore/ccsrc/debug/debug_services.cc index ebe7972be7..b005415c1b 100644 --- a/mindspore/ccsrc/debug/debug_services.cc +++ b/mindspore/ccsrc/debug/debug_services.cc @@ -32,7 +32,7 @@ #include "debug/common.h" #include "debug/debugger/debugger.h" #include "debug/anf_ir_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #endif #include "nlohmann/json.hpp" #include "debug/debugger/tensor_summary.h" diff --git a/mindspore/ccsrc/debug/debugger/debugger.cc b/mindspore/ccsrc/debug/debugger/debugger.cc index 80ba5ff06c..e41b4e079c 100644 --- a/mindspore/ccsrc/debug/debugger/debugger.cc +++ b/mindspore/ccsrc/debug/debugger/debugger.cc @@ -28,7 +28,7 @@ #include "debug/debugger/debugger.h" #include "debug/data_dump/dump_json_parser.h" #include "pipeline/jit/pipeline.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_runtime_manager.h" #include "runtime/device/kernel_runtime.h" #include "debug/data_dump/e2e_dump.h" @@ -38,7 +38,7 @@ #include "runtime/hardware/device_context_manager.h" #include "debug/anf_ir_dump.h" #include "debug/anf_ir_utils.h" -#include "runtime/framework/device_tensor_store.h" +#include "runtime/graph_scheduler/device_tensor_store.h" #ifdef ENABLE_DEBUGGER #include "debug/debugger/proto_exporter.h" #else diff --git a/mindspore/ccsrc/debug/debugger/debugger.h b/mindspore/ccsrc/debug/debugger/debugger.h index 51c631158a..c598096a4d 100644 --- a/mindspore/ccsrc/debug/debugger/debugger.h +++ b/mindspore/ccsrc/debug/debugger/debugger.h @@ -22,7 +22,7 @@ #include #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "debug/debugger/grpc_client.h" #include "debug/debug_services.h" #include "utils/ms_device_shape_transfer.h" diff --git a/mindspore/ccsrc/debug/debugger/debugger_utils.cc b/mindspore/ccsrc/debug/debugger/debugger_utils.cc index a3d1897b20..2a226a5e9a 100644 --- a/mindspore/ccsrc/debug/debugger/debugger_utils.cc +++ b/mindspore/ccsrc/debug/debugger/debugger_utils.cc @@ -21,16 +21,16 @@ #include #include "debug/anf_ir_utils.h" #include "debug/debugger/debugger.h" -#include "runtime/device/gpu/gpu_device_address.h" +#include "plugin/device/gpu/hal/device/gpu_device_address.h" #include "debug/data_dump/dump_json_parser.h" #ifdef ENABLE_D #include "debug/dump_data_builder.h" #endif -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/kernel.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/kernel.h" #include "debug/data_dump/e2e_dump.h" #include "utils/config_manager.h" -#include "backend/session/session_basic.h" +#include "backend/common/session/session_basic.h" constexpr int kFailure = 1; diff --git a/mindspore/ccsrc/debug/debugger/debugger_utils.h b/mindspore/ccsrc/debug/debugger/debugger_utils.h index 1d9ebb8d4f..b22fecf0f9 100644 --- a/mindspore/ccsrc/debug/debugger/debugger_utils.h +++ b/mindspore/ccsrc/debug/debugger/debugger_utils.h @@ -18,7 +18,7 @@ #include #include #include "debug/debugger/debugger.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #include "runtime/hardware/device_context.h" #ifdef ENABLE_D #include "toolchain/adx_datadump_callback.h" diff --git a/mindspore/ccsrc/debug/rdr/graph_exec_order_recorder.cc b/mindspore/ccsrc/debug/rdr/graph_exec_order_recorder.cc index a2de668517..602e7c84bc 100644 --- a/mindspore/ccsrc/debug/rdr/graph_exec_order_recorder.cc +++ b/mindspore/ccsrc/debug/rdr/graph_exec_order_recorder.cc @@ -18,7 +18,7 @@ #include #include "mindspore/core/ir/anf.h" #include "mindspore/core/utils/log_adapter.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/debug/rdr/graph_recorder.cc b/mindspore/ccsrc/debug/rdr/graph_recorder.cc index e1d387cc75..4e96372fb4 100644 --- a/mindspore/ccsrc/debug/rdr/graph_recorder.cc +++ b/mindspore/ccsrc/debug/rdr/graph_recorder.cc @@ -16,7 +16,7 @@ #include "debug/rdr/graph_recorder.h" #include "mindspore/core/base/base.h" #include "mindspore/core/ir/func_graph.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "mindspore/core/utils/log_adapter.h" #include "debug/anf_ir_dump.h" #include "debug/anf_ir_utils.h" diff --git a/mindspore/ccsrc/debug/rdr/mem_address_recorder.cc b/mindspore/ccsrc/debug/rdr/mem_address_recorder.cc index a216b71f6f..2cd5a04d8d 100644 --- a/mindspore/ccsrc/debug/rdr/mem_address_recorder.cc +++ b/mindspore/ccsrc/debug/rdr/mem_address_recorder.cc @@ -17,7 +17,7 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace { diff --git a/mindspore/ccsrc/debug/rdr/running_data_recorder.cc b/mindspore/ccsrc/debug/rdr/running_data_recorder.cc index 7b0ddb2f16..ca223de519 100644 --- a/mindspore/ccsrc/debug/rdr/running_data_recorder.cc +++ b/mindspore/ccsrc/debug/rdr/running_data_recorder.cc @@ -23,9 +23,9 @@ #include "debug/rdr/mem_address_recorder.h" #include "mindspore/core/ir/func_graph.h" #include "mindspore/core/ir/anf.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #ifdef ENABLE_D -#include "runtime/device/ascend/tasksink/task_generator.h" +#include "plugin/device/ascend/hal/device/tasksink/task_generator.h" #include "debug/rdr/task_debug_info_recorder.h" #endif // ENABLE_D namespace mindspore { diff --git a/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.cc b/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.cc index ba9fe4011a..f254c74746 100644 --- a/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.cc +++ b/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.cc @@ -18,7 +18,7 @@ #include #include "mindspore/core/ir/anf.h" #include "mindspore/core/utils/log_adapter.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.h b/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.h index 8d08a800c7..c039b70fb0 100644 --- a/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.h +++ b/mindspore/ccsrc/debug/rdr/stream_exec_order_recorder.h @@ -20,7 +20,7 @@ #include #include #include "nlohmann/json.hpp" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "debug/rdr/base_recorder.h" using json = nlohmann::json; diff --git a/mindspore/ccsrc/debug/rdr/task_debug_info_recorder.cc b/mindspore/ccsrc/debug/rdr/task_debug_info_recorder.cc index da3ec6ca11..bd76f90840 100644 --- a/mindspore/ccsrc/debug/rdr/task_debug_info_recorder.cc +++ b/mindspore/ccsrc/debug/rdr/task_debug_info_recorder.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "debug/rdr/task_debug_info_recorder.h" -#include "runtime/device/ascend/tasksink/task_generator.h" +#include "plugin/device/ascend/hal/device/tasksink/task_generator.h" namespace mindspore { void TaskDebugInfoRecorder::Export() { diff --git a/mindspore/ccsrc/fl/server/common.h b/mindspore/ccsrc/fl/server/common.h index 3a1abaca95..bfd9e8c306 100644 --- a/mindspore/ccsrc/fl/server/common.h +++ b/mindspore/ccsrc/fl/server/common.h @@ -28,7 +28,7 @@ #include "ir/anf.h" #include "utils/utils.h" #include "ir/dtype/type_id.h" -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" #include "schema/fl_job_generated.h" #include "schema/cipher_generated.h" #include "ps/ps_context.h" diff --git a/mindspore/ccsrc/fl/server/kernel/aggregation_kernel.h b/mindspore/ccsrc/fl/server/kernel/aggregation_kernel.h index a08dc56b4e..b6b1177ee6 100644 --- a/mindspore/ccsrc/fl/server/kernel/aggregation_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/aggregation_kernel.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" #include "fl/server/common.h" #include "fl/server/memory_register.h" #include "fl/server/kernel/params_info.h" diff --git a/mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.h b/mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.h index ad7dc6341c..77fe3d11b0 100644 --- a/mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h" +#include "plugin/device/cpu/kernel/apply_momentum_cpu_kernel.h" #include "fl/server/kernel/optimizer_kernel.h" #include "fl/server/kernel/optimizer_kernel_factory.h" diff --git a/mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.h b/mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.h index 98f0d85f9c..d62219cf1f 100644 --- a/mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/dense_grad_accum_kernel.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" #include "fl/server/kernel/aggregation_kernel.h" #include "fl/server/kernel/aggregation_kernel_factory.h" diff --git a/mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.h b/mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.h index 6106c5dd4d..68f5a8f58a 100644 --- a/mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/fed_avg_kernel.h @@ -22,7 +22,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" #include "fl/server/common.h" #include "fl/server/collective_ops_impl.h" #include "fl/server/distributed_count_service.h" diff --git a/mindspore/ccsrc/fl/server/kernel/optimizer_kernel.h b/mindspore/ccsrc/fl/server/kernel/optimizer_kernel.h index e0647eb6a6..c9c55709ba 100644 --- a/mindspore/ccsrc/fl/server/kernel/optimizer_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/optimizer_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" #include "fl/server/common.h" #include "fl/server/memory_register.h" #include "fl/server/kernel/params_info.h" diff --git a/mindspore/ccsrc/fl/server/kernel/round/round_kernel.h b/mindspore/ccsrc/fl/server/kernel/round/round_kernel.h index 1a8dd47506..2e6be04acf 100644 --- a/mindspore/ccsrc/fl/server/kernel/round/round_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/round/round_kernel.h @@ -27,8 +27,8 @@ #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" #include "fl/server/common.h" #include "fl/server/local_meta_store.h" #include "fl/server/distributed_count_service.h" diff --git a/mindspore/ccsrc/fl/server/kernel/sgd_kernel.h b/mindspore/ccsrc/fl/server/kernel/sgd_kernel.h index 7299cec2c8..57336ca997 100644 --- a/mindspore/ccsrc/fl/server/kernel/sgd_kernel.h +++ b/mindspore/ccsrc/fl/server/kernel/sgd_kernel.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/sgd_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sgd_cpu_kernel.h" #include "fl/server/kernel/optimizer_kernel.h" #include "fl/server/kernel/optimizer_kernel_factory.h" diff --git a/mindspore/ccsrc/frontend/parallel/cache_embedding/cache_embedding.cc b/mindspore/ccsrc/frontend/parallel/cache_embedding/cache_embedding.cc index 284fc88725..d9c302c835 100644 --- a/mindspore/ccsrc/frontend/parallel/cache_embedding/cache_embedding.cc +++ b/mindspore/ccsrc/frontend/parallel/cache_embedding/cache_embedding.cc @@ -25,7 +25,7 @@ #include #include "utils/hash_map.h" #include "utils/hash_set.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "frontend/optimizer/optimizer.h" #include "ir/func_graph.h" #include "utils/cache_embedding_hashmap_struct.h" diff --git a/mindspore/ccsrc/frontend/parallel/group_manager.cc b/mindspore/ccsrc/frontend/parallel/group_manager.cc index 625753b3d7..71c98406e3 100644 --- a/mindspore/ccsrc/frontend/parallel/group_manager.cc +++ b/mindspore/ccsrc/frontend/parallel/group_manager.cc @@ -19,7 +19,7 @@ #include #include #if !defined(NO_DLIB) || defined(ENABLE_GPU) -#include "backend/session/executor_manager.h" +#include "backend/common/session/executor_manager.h" #else #include "frontend/parallel/parallel_stub/executor_manager_stub.h" #endif diff --git a/mindspore/ccsrc/kernel/CMakeLists.txt b/mindspore/ccsrc/kernel/CMakeLists.txt new file mode 100644 index 0000000000..813b50b972 --- /dev/null +++ b/mindspore/ccsrc/kernel/CMakeLists.txt @@ -0,0 +1,24 @@ +file(GLOB_RECURSE KERNEL_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "kernel_build_info.cc" + "kernel.cc" + "common_utils.cc" + "kash/*.cc" + "oplib/*.cc" + "environ_manager.cc" +) + +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-abstract-non-virtual-dtor -Wno-overloaded-virtual") +endif() + +if(ENABLE_AKG AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux") + file(GLOB_RECURSE AKG_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "akg/akg_kernel_build.cc" + "akg/akg_kernel_json_generator.cc" + "akg/akg_kernel_json_decoder.cc" + ) + list(APPEND KERNEL_SRC_LIST "${AKG_SRC_LIST}") +endif() + +set_property(SOURCE ${KERNEL_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_KERNEL) +add_library(_mindspore_kernel_obj OBJECT ${KERNEL_SRC_LIST}) diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc b/mindspore/ccsrc/kernel/akg/akg_kernel_build.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc rename to mindspore/ccsrc/kernel/akg/akg_kernel_build.cc index d3cecd38c7..b32637e337 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc +++ b/mindspore/ccsrc/kernel/akg/akg_kernel_build.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/akg/akg_kernel_build.h" +#include "kernel/akg/akg_kernel_build.h" #include #include @@ -35,9 +35,9 @@ #include "ir/dtype.h" #include "ir/func_graph.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" +#include "kernel/akg/akg_kernel_json_generator.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h b/mindspore/ccsrc/kernel/akg/akg_kernel_build.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h rename to mindspore/ccsrc/kernel/akg/akg_kernel_build.h index ad9102cc6b..41cd20caf4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.h +++ b/mindspore/ccsrc/kernel/akg/akg_kernel_build.h @@ -23,9 +23,9 @@ #include #include #include "ir/anf.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_build_client.h" -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_build_client.h" +#include "kernel/akg/akg_kernel_json_generator.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_decoder.cc b/mindspore/ccsrc/kernel/akg/akg_kernel_json_decoder.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_decoder.cc rename to mindspore/ccsrc/kernel/akg/akg_kernel_json_decoder.cc index 978f1c801a..acef63e718 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_decoder.cc +++ b/mindspore/ccsrc/kernel/akg/akg_kernel_json_decoder.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/akg/akg_kernel_json_decoder.h" +#include "kernel/akg/akg_kernel_json_decoder.h" #include -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/optimizer/graph_kernel/adapter/fake_abstract_shape.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/akg/akg_kernel_json_generator.h" +#include "kernel/common_utils.h" +#include "common/graph_kernel/adapter/fake_abstract_shape.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "debug/anf_ir_dump.h" #include "frontend/operator/ops.h" #include "ir/anf.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_decoder.h b/mindspore/ccsrc/kernel/akg/akg_kernel_json_decoder.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_decoder.h rename to mindspore/ccsrc/kernel/akg/akg_kernel_json_decoder.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_generator.cc b/mindspore/ccsrc/kernel/akg/akg_kernel_json_generator.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_generator.cc rename to mindspore/ccsrc/kernel/akg/akg_kernel_json_generator.cc index f298ebbda2..523320dd5b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_generator.cc +++ b/mindspore/ccsrc/kernel/akg/akg_kernel_json_generator.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/akg/akg_kernel_json_generator.h" -#include "backend/optimizer/graph_kernel/core/graph_builder.h" +#include "kernel/akg/akg_kernel_json_generator.h" +#include "common/graph_kernel/core/graph_builder.h" #ifdef ENABLE_GPU #include @@ -26,7 +26,7 @@ #include "ir/func_graph.h" #include "utils/anf_utils.h" #include "utils/ms_context.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "kernel/oplib/oplib.h" namespace mindspore::graphkernel { using kernel::OpAttr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_generator.h b/mindspore/ccsrc/kernel/akg/akg_kernel_json_generator.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_generator.h rename to mindspore/ccsrc/kernel/akg/akg_kernel_json_generator.h index 971cff2329..2ede440a35 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_json_generator.h +++ b/mindspore/ccsrc/kernel/akg/akg_kernel_json_generator.h @@ -23,8 +23,8 @@ #include #include #include "nlohmann/json.hpp" -#include "backend/kernel_compiler/oplib/opinfo.h" -#include "backend/optimizer/graph_kernel/core/graph_kernel_callback.h" +#include "kernel/oplib/opinfo.h" +#include "common/graph_kernel/core/graph_kernel_callback.h" #include "utils/convert_utils.h" namespace mindspore::graphkernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.cc b/mindspore/ccsrc/kernel/akg/akg_kernel_metadata.cc similarity index 88% rename from mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.cc rename to mindspore/ccsrc/kernel/akg/akg_kernel_metadata.cc index 22243fcf9d..e0c074409a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.cc +++ b/mindspore/ccsrc/kernel/akg/akg_kernel_metadata.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/akg/akg_kernel_metadata.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/oplib/oplib.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/akg/akg_kernel_metadata.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/oplib/oplib.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.h b/mindspore/ccsrc/kernel/akg/akg_kernel_metadata.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.h rename to mindspore/ccsrc/kernel/akg/akg_kernel_metadata.h index b8b7b3885d..aef4d9a112 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.h +++ b/mindspore/ccsrc/kernel/akg/akg_kernel_metadata.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.cc b/mindspore/ccsrc/kernel/ascend_kernel_mod.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.cc rename to mindspore/ccsrc/kernel/ascend_kernel_mod.cc index 29d98ecba2..055e4433f2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.cc +++ b/mindspore/ccsrc/kernel/ascend_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/ascend_kernel_mod.h" +#include "kernel/ascend_kernel_mod.h" #include "runtime/rt.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.h b/mindspore/ccsrc/kernel/ascend_kernel_mod.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.h rename to mindspore/ccsrc/kernel/ascend_kernel_mod.h index aeb365d274..bcd38146f9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.h +++ b/mindspore/ccsrc/kernel/ascend_kernel_mod.h @@ -19,8 +19,8 @@ #include #include -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "backend/kernel_compiler/kernel.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "kernel/kernel.h" #include "runtime/device/executor/dynamic_kernel.h" #ifndef ENABLE_SECURITY #include "debug/data_dump/dump_json_parser.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc b/mindspore/ccsrc/kernel/common_utils.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/common_utils.cc rename to mindspore/ccsrc/kernel/common_utils.cc index fe71f46c34..d2b57a5f04 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc +++ b/mindspore/ccsrc/kernel/common_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" #include #include #include @@ -24,7 +24,7 @@ #include #include #include "nlohmann/json.hpp" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/file_utils.h" #include "utils/ms_utils.h" #include "ir/manager.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/common_utils.h b/mindspore/ccsrc/kernel/common_utils.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/common_utils.h rename to mindspore/ccsrc/kernel/common_utils.h index 2b5547ff2c..2182779b9a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/common_utils.h +++ b/mindspore/ccsrc/kernel/common_utils.h @@ -28,9 +28,9 @@ #include #include #include "utils/utils.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/oplib/opinfo.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel.h" +#include "kernel/oplib/opinfo.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/environ.h b/mindspore/ccsrc/kernel/environ.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/environ.h rename to mindspore/ccsrc/kernel/environ.h index ca9cb4dda4..9a1fb7728c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/environ.h +++ b/mindspore/ccsrc/kernel/environ.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #include "ir/dtype/type_id.h" #include "utils/ms_context.h" #include "runtime/hardware/device_context_manager.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/environ_manager.cc b/mindspore/ccsrc/kernel/environ_manager.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/environ_manager.cc rename to mindspore/ccsrc/kernel/environ_manager.cc index 4b30b9dc5b..61aa73e44e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/environ_manager.cc +++ b/mindspore/ccsrc/kernel/environ_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/environ_manager.h" +#include "kernel/environ_manager.h" #include "utils/ms_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/environ_manager.h b/mindspore/ccsrc/kernel/environ_manager.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/environ_manager.h rename to mindspore/ccsrc/kernel/environ_manager.h index 57c94e6bb5..7ade4b3b03 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/environ_manager.h +++ b/mindspore/ccsrc/kernel/environ_manager.h @@ -22,7 +22,7 @@ #include #include #include -#include "backend/kernel_compiler/environ.h" +#include "kernel/environ.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/kash/kernel_pack.cc b/mindspore/ccsrc/kernel/kash/kernel_pack.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/kash/kernel_pack.cc rename to mindspore/ccsrc/kernel/kash/kernel_pack.cc index 63a211fb87..aa8047b4a8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/kash/kernel_pack.cc +++ b/mindspore/ccsrc/kernel/kash/kernel_pack.cc @@ -22,7 +22,7 @@ #include "utils/log_adapter.h" #include "utils/convert_utils.h" #include "utils/system/sha256.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { namespace { diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel.cc b/mindspore/ccsrc/kernel/kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/kernel.cc rename to mindspore/ccsrc/kernel/kernel.cc index 182292da1b..e329e611b8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/kernel.cc +++ b/mindspore/ccsrc/kernel/kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #include #include @@ -22,8 +22,8 @@ #include "utils/ms_context.h" #include "utils/anf_utils.h" #include "utils/ms_device_shape_transfer.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel.h b/mindspore/ccsrc/kernel/kernel.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/kernel.h rename to mindspore/ccsrc/kernel/kernel.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.cc b/mindspore/ccsrc/kernel/kernel_build_info.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.cc rename to mindspore/ccsrc/kernel/kernel_build_info.cc index 1f8f7b1d35..7389acda25 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.cc +++ b/mindspore/ccsrc/kernel/kernel_build_info.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" #include #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.h b/mindspore/ccsrc/kernel/kernel_build_info.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.h rename to mindspore/ccsrc/kernel/kernel_build_info.h index 32ddd14344..ee4332704e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/kernel_build_info.h +++ b/mindspore/ccsrc/kernel/kernel_build_info.h @@ -23,7 +23,7 @@ #include #include "ir/dtype.h" #include "ir/kernel_info_dev.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.h b/mindspore/ccsrc/kernel/kernel_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.h rename to mindspore/ccsrc/kernel/kernel_fusion.h index a6e9a8eac3..8cb99cab96 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.h +++ b/mindspore/ccsrc/kernel/kernel_fusion.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { /* diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc b/mindspore/ccsrc/kernel/kernel_query.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc rename to mindspore/ccsrc/kernel/kernel_query.cc index 1d36b625d5..3caa0a4195 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc +++ b/mindspore/ccsrc/kernel/kernel_query.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/kernel_compiler/kernel_query.h" +#include "kernel/kernel_query.h" #include -#include "backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h" -#include "backend/kernel_compiler/host/host_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 "plugin/device/ascend/kernel/aicpu/aicpu_kernel_metadata.h" +#include "plugin/device/ascend/kernel/host/host_kernel_metadata.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel_metadata.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.h" +#include "kernel/akg/akg_kernel_metadata.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_context.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel_query.h b/mindspore/ccsrc/kernel/kernel_query.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/kernel_query.h rename to mindspore/ccsrc/kernel/kernel_query.h index 9b4b49ac06..459c717ade 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/kernel_query.h +++ b/mindspore/ccsrc/kernel/kernel_query.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/oplib/opinfo.h b/mindspore/ccsrc/kernel/oplib/opinfo.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/oplib/opinfo.h rename to mindspore/ccsrc/kernel/oplib/opinfo.h index 93dce861cc..e8bf873e6e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/oplib/opinfo.h +++ b/mindspore/ccsrc/kernel/oplib/opinfo.h @@ -21,7 +21,7 @@ #include #include #include "ir/dtype.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc b/mindspore/ccsrc/kernel/oplib/oplib.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc rename to mindspore/ccsrc/kernel/oplib/oplib.cc index f875077ad4..2435c247a4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc +++ b/mindspore/ccsrc/kernel/oplib/oplib.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/oplib/oplib.h" +#include "kernel/oplib/oplib.h" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h b/mindspore/ccsrc/kernel/oplib/oplib.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h rename to mindspore/ccsrc/kernel/oplib/oplib.h index 3584b9fac9..4237acc648 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h +++ b/mindspore/ccsrc/kernel/oplib/oplib.h @@ -22,7 +22,7 @@ #include #include #include "utils/ms_utils.h" -#include "backend/kernel_compiler/oplib/opinfo.h" +#include "kernel/oplib/opinfo.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/task_stream.h b/mindspore/ccsrc/kernel/task_stream.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/task_stream.h rename to mindspore/ccsrc/kernel/task_stream.h diff --git a/mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt b/mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt index 1e9bc92be7..f90d8cc313 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt +++ b/mindspore/ccsrc/minddata/dataset/engine/cache/CMakeLists.txt @@ -76,6 +76,7 @@ if(ENABLE_CACHE) _c_dataengine _c_mindrecord mindspore + proto_input mindspore_core mindspore::protobuf ${CUDNN_LIBRARY_PATH} diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.h b/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.h index d91b63630f..a04222b41b 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.h +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/device_queue_op.h @@ -40,7 +40,7 @@ #ifdef ENABLE_GPUQUE #include "minddata/dataset/engine/gpu_item_connector.h" #include "minddata/dataset/util/circular_pool.h" -#include "runtime/device/gpu/gpu_buffer_mgr.h" +#include "plugin/device/gpu/hal/device/gpu_buffer_mgr.h" #include "ps/ps_cache/ps_data/ps_data_prefetch.h" using mindspore::device::BlockQueueStatus_T; using mindspore::device::GpuBufferMgr; diff --git a/mindspore/ccsrc/minddata/dataset/engine/gpu_item_connector.h b/mindspore/ccsrc/minddata/dataset/engine/gpu_item_connector.h index 99ed5c9cf9..4263a2625b 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/gpu_item_connector.h +++ b/mindspore/ccsrc/minddata/dataset/engine/gpu_item_connector.h @@ -24,7 +24,7 @@ #include "minddata/dataset/engine/connector.h" #include "minddata/dataset/util/status.h" #include "minddata/dataset/include/dataset/constants.h" -#include "runtime/device/gpu/blocking_queue.h" +#include "plugin/device/gpu/hal/device/blocking_queue.h" using mindspore::device::DataItemGpu; diff --git a/mindspore/ccsrc/pipeline/jit/action.cc b/mindspore/ccsrc/pipeline/jit/action.cc index f046ec21d4..e3cbcbc1ca 100644 --- a/mindspore/ccsrc/pipeline/jit/action.cc +++ b/mindspore/ccsrc/pipeline/jit/action.cc @@ -48,7 +48,7 @@ #include "utils/ms_context.h" #include "utils/func_graph_analyzer.h" #include "utils/ms_utils.h" -#include "vm/transform.h" +#include "backend/graph_compiler/transform.h" #include "load_mindir/infer_mindir.h" #if ((defined ENABLE_CPU) && (!defined _WIN32)) #include "ps/parameter_server.h" diff --git a/mindspore/ccsrc/pipeline/jit/action.h b/mindspore/ccsrc/pipeline/jit/action.h index 9cf212dcd9..21e633a90b 100644 --- a/mindspore/ccsrc/pipeline/jit/action.h +++ b/mindspore/ccsrc/pipeline/jit/action.h @@ -22,7 +22,7 @@ #include #include #include "pipeline/jit/resource.h" -#include "vm/segment_runner.h" +#include "backend/graph_compiler/segment_runner.h" namespace mindspore { extern const char kMsConvert[]; diff --git a/mindspore/ccsrc/pipeline/jit/init.cc b/mindspore/ccsrc/pipeline/jit/init.cc index 6ff482acc8..589e09a872 100644 --- a/mindspore/ccsrc/pipeline/jit/init.cc +++ b/mindspore/ccsrc/pipeline/jit/init.cc @@ -15,7 +15,7 @@ */ #include -#include "backend/kernel_compiler/oplib/oplib.h" +#include "kernel/oplib/oplib.h" #include "pipeline/jit/pipeline.h" #include "frontend/operator/composite/composite.h" #include "pipeline/pynative/pynative_execute.h" @@ -32,9 +32,9 @@ #include "frontend/parallel/costmodel_context.h" #include "frontend/optimizer/ad/dfunctor.h" #ifdef ENABLE_GPU_COLLECTIVE -#include "runtime/device/gpu/distribution/collective_init.h" +#include "plugin/device/gpu/hal/device/distribution/collective_init.h" #else -#include "runtime/device/gpu/distribution/collective_fake_init.h" +#include "plugin/device/gpu/hal/device/distribution/collective_fake_init.h" #endif #if ((defined ENABLE_CPU) && (!defined _WIN32)) #include "ps/util.h" diff --git a/mindspore/ccsrc/pipeline/jit/pipeline.cc b/mindspore/ccsrc/pipeline/jit/pipeline.cc index 05b43b2449..ff44c8351c 100644 --- a/mindspore/ccsrc/pipeline/jit/pipeline.cc +++ b/mindspore/ccsrc/pipeline/jit/pipeline.cc @@ -55,8 +55,8 @@ #include "debug/draw.h" #include "debug/common.h" #include "load_mindir/load_model.h" -#include "vm/segment_runner.h" -#include "backend/session/executor_manager.h" +#include "backend/graph_compiler/segment_runner.h" +#include "backend/common/session/executor_manager.h" #include "runtime/hardware/device_context_manager.h" #include "runtime/device/kernel_runtime_manager.h" @@ -82,8 +82,8 @@ #include "transform/graph_ir/convert.h" #include "transform/graph_ir/df_graph_manager.h" #include "transform/graph_ir/op_adapter_map.h" -#include "runtime/device/ascend/profiling/profiling_manager.h" -#include "runtime/device/ascend/distribute/ascend_collective.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" +#include "plugin/device/ascend/hal/device/distribute/ascend_collective.h" #endif #ifdef ENABLE_DUMP_IR diff --git a/mindspore/ccsrc/pipeline/jit/pipeline.h b/mindspore/ccsrc/pipeline/jit/pipeline.h index dcdcaa64d5..905538b0a2 100644 --- a/mindspore/ccsrc/pipeline/jit/pipeline.h +++ b/mindspore/ccsrc/pipeline/jit/pipeline.h @@ -31,8 +31,8 @@ #include "ir/anf.h" #include "ir/tensor.h" #include "pipeline/jit/action.h" -#include "vm/segment_runner.h" -#include "vm/transform.h" +#include "backend/graph_compiler/segment_runner.h" +#include "backend/graph_compiler/transform.h" #include "pipeline/jit/base.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc index 2a4eaa327f..f7067a7c16 100644 --- a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc @@ -55,11 +55,11 @@ #include "pipeline/jit/pipeline.h" #include "pipeline/jit/resource.h" #include "pipeline/pynative/base.h" -#include "backend/session/session_factory.h" -#include "backend/optimizer/common/const_input_to_attr_registry.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/session_factory.h" +#include "backend/common/optimizer/const_input_to_attr_registry.h" +#include "backend/common/optimizer/helper.h" #include "runtime/hardware/device_context_manager.h" -#include "vm/transform.h" +#include "backend/graph_compiler/transform.h" using mindspore::tensor::TensorPy; diff --git a/mindspore/ccsrc/plugin/device/ascend/hal/device/CMakeLists.txt b/mindspore/ccsrc/plugin/device/ascend/hal/device/CMakeLists.txt new file mode 100644 index 0000000000..a59b912997 --- /dev/null +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/CMakeLists.txt @@ -0,0 +1,53 @@ +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +file(GLOB_RECURSE DEVICE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc" + ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/runtime/device/kernel_adjust.cc) +list(REMOVE_ITEM DEVICE_SRC_LIST "distribute/mpi_collective_group.cc" + "distribute/collective_group_wrapper.cc" "distribute/mpi_pycc.cc") + +if(ENABLE_TDTQUE) + file(GLOB_RECURSE TDT_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_handle.cc) +endif() + +if(ENABLE_MPI AND ENABLE_D) + set_property(SOURCE "distribute/mpi_pycc.cc" + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + pybind11_add_module(_ascend_mpi "distribute/mpi_pycc.cc") + target_link_libraries(_ascend_mpi PRIVATE mindspore::pybind11_module mindspore::ompi) +endif() + +list(REMOVE_ITEM DEVICE_SRC_LIST "profiling/profiling_callback_register.cc") + +if(ENABLE_SECURITY) + list(REMOVE_ITEM DEVICE_SRC_LIST "profiling/profiling_callback_register.cc") + list(REMOVE_ITEM DEVICE_SRC_LIST "profiling/profiling_manager.cc") + list(REMOVE_ITEM DEVICE_SRC_LIST "profiling/profiling_utils.cc") +endif() + +set_property(SOURCE ${DEVICE_SRC_LIST}} + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) +if(ENABLE_D) + add_library(_mindspore_plugin_device_ascend_hal_device_obj OBJECT ${DEVICE_SRC_LIST}) + + file(GLOB_RECURSE GE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "ge_runtime/*.cc") + set_property(SOURCE ${GE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_GE) + target_include_directories(_mindspore_plugin_device_ascend_hal_device_obj PRIVATE ${CMAKE_BINARY_DIR}/proto/ge) + add_dependencies(_mindspore_plugin_device_ascend_hal_device_obj graph) + if(ENABLE_MPI) + set(ASCEND_PATH /usr/local/Ascend) + set(ASCEND_TOOLKIT_RUNTIME_PATH ${ASCEND_PATH}/ascend-toolkit/latest/fwkacllib/lib64) + set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64) + find_library(HCCL hccl ${ASCEND_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH}) + file(GLOB_RECURSE ASCEND_COLLECTIVE_LIST "distribute/mpi_collective_group.cc" + "distribute/collective_group_wrapper.cc") + set_property(SOURCE ${ASCEND_COLLECTIVE_LIST} + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + add_library(ascend_collective SHARED ${ASCEND_COLLECTIVE_LIST}) + target_link_libraries(ascend_collective PRIVATE ${HCCL} mindspore::ompi) + target_link_libraries(_ascend_mpi PRIVATE ascend_collective) + endif() +endif() diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_bucket.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_bucket.cc similarity index 93% rename from mindspore/ccsrc/runtime/device/ascend/ascend_bucket.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_bucket.cc index a26e087daf..8ae7c891da 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_bucket.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_bucket.cc @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "runtime/device/ascend/ascend_bucket.h" +#include "plugin/device/ascend/hal/device/ascend_bucket.h" #include "runtime/mem.h" #include "external/hccl/hccl.h" -#include "runtime/device/ascend/ascend_memory_pool.h" -#include "backend/kernel_compiler/hccl/hcom_util.h" +#include "plugin/device/ascend/hal/device/ascend_memory_pool.h" +#include "plugin/device/ascend/kernel/hccl/hcom_util.h" #include "runtime/device/memory_manager.h" #include "runtime/device/kernel_runtime_manager.h" -#include "runtime/device/ascend/ascend_event.h" -#include "runtime/device/ascend/ascend_launch_mul.h" -#include "runtime/device/ascend/ascend_launch_atomic_clean.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/hal/device/ascend_event.h" +#include "plugin/device/ascend/hal/device/ascend_launch_mul.h" +#include "plugin/device/ascend/hal/device/ascend_launch_atomic_clean.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" #include "utils/profile.h" namespace mindspore::device::ascend { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_bucket.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_bucket.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ascend_bucket.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_bucket.h diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_device_address.cc similarity index 99% rename from mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_device_address.cc index a0c50b5860..500db45842 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_device_address.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/ascend/ascend_device_address.h" +#include "plugin/device/ascend/hal/device/ascend_device_address.h" #include #include #include @@ -26,9 +26,9 @@ #include "runtime/device/kernel_runtime.h" #include "runtime/device/memory_manager.h" #include "runtime/device/convert_tensor_utils.h" -#include "runtime/device/ascend/ascend_launch_transdata.h" +#include "plugin/device/ascend/hal/device/ascend_launch_transdata.h" #include "runtime/hardware/device_context_manager.h" -#include "runtime/hardware/ascend/ascend_device_context.h" +#include "plugin/device/ascend/hal/hardware/ascend_device_context.h" #include "ir/dtype/type.h" #include "ir/tensor.h" #include "abstract/utils.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_device_address.h similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ascend_device_address.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_device_address.h index a02df9a5fe..9aa28abc16 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_device_address.h @@ -21,9 +21,9 @@ #include #include #include "runtime/device/device_address.h" -#include "runtime/device/ascend/ascend_memory_pool.h" +#include "plugin/device/ascend/hal/device/ascend_memory_pool.h" #include "ir/dtype.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #include "utils/shape_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_event.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_event.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ascend_event.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_event.cc index 30ecebbc61..47cdfb1043 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_event.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_event.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/ascend_event.h" +#include "plugin/device/ascend/hal/device/ascend_event.h" #include "runtime/event.h" #include "runtime/stream.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_event.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_event.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ascend_event.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_event.h diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_kernel_runtime.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_kernel_runtime.cc index 81a93d7286..938bfd5144 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_kernel_runtime.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/ascend/ascend_kernel_runtime.h" +#include "plugin/device/ascend/hal/device/ascend_kernel_runtime.h" #include #include #include @@ -21,27 +21,27 @@ #include #include #include "utils/signal_util.h" -#include "runtime/device/ascend/ascend_device_address.h" -#include "runtime/device/ascend/distribute/ascend_collective.h" +#include "plugin/device/ascend/hal/device/ascend_device_address.h" +#include "plugin/device/ascend/hal/device/distribute/ascend_collective.h" #include "utils/ms_context.h" #include "utils/context/context_extends.h" #include "utils/mpi/mpi_config.h" #include "utils/ms_device_shape_transfer.h" #include "runtime/rt.h" #include "acl/acl_rt.h" -#include "runtime/device/ascend/ascend_stream_manager.h" -#include "runtime/device/ascend/ascend_stream_assign.h" -#include "runtime/device/ascend/ge_runtime/model_runner.h" -#include "runtime/device/ascend/tasksink/task_generator.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_build_client.h" -#include "backend/kernel_compiler/aicpu/aicpu_kernel_load.h" +#include "plugin/device/ascend/hal/device/ascend_stream_manager.h" +#include "plugin/device/ascend/hal/device/ascend_stream_assign.h" +#include "plugin/device/ascend/hal/device/ge_runtime/model_runner.h" +#include "plugin/device/ascend/hal/device/tasksink/task_generator.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_build_client.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.h" #ifndef ENABLE_SECURITY -#include "runtime/device/ascend/profiling/profiling_manager.h" -#include "runtime/device/ascend/profiling/profiling_utils.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_utils.h" #endif -#include "runtime/device/ascend/ascend_memory_manager.h" -#include "runtime/device/ascend/ascend_event.h" +#include "plugin/device/ascend/hal/device/ascend_memory_manager.h" +#include "plugin/device/ascend/hal/device/ascend_event.h" #ifndef ENABLE_SECURITY #include "debug/data_dump/dump_json_parser.h" #include "debug/data_dump/e2e_dump.h" @@ -55,12 +55,12 @@ #include "utils/comm_manager.h" #include "utils/runtime_error_codes.h" #ifdef MEM_REUSE_DEBUG -#include "backend/optimizer/mem_reuse/mem_reuse_checker.h" +#include "common/mem_reuse/mem_reuse_checker.h" #include "debug/env_config_parser.h" #endif -#include "runtime/device/ascend/executor/hccl_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/hccl_dynamic_kernel.h" #include "utils/config_manager.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" #ifdef ENABLE_TDTQUE #include "minddata/dataset/engine/tdt/tdt_handle.h" using mindspore::dataset::TdtHandle; @@ -69,7 +69,7 @@ using mindspore::dataset::TdtHandle; #include "debug/rdr/running_data_recorder.h" #endif -#include "backend/session/pynative_task_manager.h" +#include "backend/common/session/pynative_task_manager.h" #include "profiler/device/profiling.h" #ifndef ENABLE_SECURITY diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_kernel_runtime.h similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_kernel_runtime.h index b7c614bc03..22d9c53441 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_kernel_runtime.h @@ -25,11 +25,11 @@ #include #include "runtime/device/kernel_runtime.h" #include "runtime/context.h" -#include "runtime/device/ascend/ge_runtime/davinci_model.h" +#include "plugin/device/ascend/hal/device/ge_runtime/davinci_model.h" #include "runtime/device/kernel_runtime_manager.h" -#include "backend/session/session_basic.h" +#include "backend/common/session/session_basic.h" #ifndef ENABLE_SECURITY -#include "runtime/device/ascend/dump/data_dumper.h" +#include "plugin/device/ascend/hal/device/dump/data_dumper.h" #endif using std::unordered_map; diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_label_assign.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_label_assign.cc index 7502c79a08..e344edc0d0 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_label_assign.cc @@ -17,8 +17,8 @@ #include #include #include -#include "runtime/device/ascend/ascend_label_assign.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ascend_label_assign.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_label_assign.h similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_label_assign.h index 43cadb8639..ac1ab4733f 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_label_assign.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_label_assign.h @@ -19,7 +19,7 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "utils/contract.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_atomic_clean.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_atomic_clean.cc similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/ascend_launch_atomic_clean.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_atomic_clean.cc index 16d80cc60a..cc96b47710 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_atomic_clean.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_atomic_clean.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "runtime/device/ascend/ascend_launch_atomic_clean.h" +#include "plugin/device/ascend/hal/device/ascend_launch_atomic_clean.h" #include "abstract/utils.h" -#include "backend/session/single_kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/single_kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "debug/anf_ir_dump.h" namespace mindspore::device::ascend { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_atomic_clean.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_atomic_clean.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/ascend_launch_atomic_clean.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_atomic_clean.h index 8e5e60aa4d..8a5f5ca99b 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_atomic_clean.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_atomic_clean.h @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/ascend/ascend_launch_kernel.h" +#include "plugin/device/ascend/hal/device/ascend_launch_kernel.h" namespace mindspore::device::ascend { class AscendLaunchAtomicClean : public AscendLaunchKernel { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_kernel.cc similarity index 88% rename from mindspore/ccsrc/runtime/device/ascend/ascend_launch_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_kernel.cc index 31691d49dc..3286fc313e 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "runtime/device/ascend/ascend_launch_kernel.h" +#include "plugin/device/ascend/hal/device/ascend_launch_kernel.h" #include "runtime/device/memory_manager.h" -#include "runtime/device/ascend/ascend_memory_pool.h" -#include "runtime/device/ascend/kernel_build_ascend.h" -#include "runtime/device/ascend/kernel_select_ascend.h" +#include "plugin/device/ascend/hal/device/ascend_memory_pool.h" +#include "plugin/device/ascend/hal/device/kernel_build_ascend.h" +#include "plugin/device/ascend/hal/device/kernel_select_ascend.h" namespace mindspore::device::ascend { void AscendLaunchKernel::FreeDeviceMem(void *addr) { AscendMemoryPool::GetInstance().FreeTensorMem(addr); } diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_kernel.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_kernel.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ascend_launch_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_kernel.h diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_mul.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_mul.cc similarity index 94% rename from mindspore/ccsrc/runtime/device/ascend/ascend_launch_mul.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_mul.cc index 8de86fe552..5371e6ffdb 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_mul.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_mul.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "runtime/device/ascend/ascend_launch_mul.h" +#include "plugin/device/ascend/hal/device/ascend_launch_mul.h" #include "abstract/utils.h" #include "runtime/mem.h" #include "acl/acl_rt.h" -#include "backend/session/single_kernel_graph.h" +#include "backend/common/session/single_kernel_graph.h" #include "frontend/parallel/context.h" namespace mindspore::device::ascend { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_mul.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_mul.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/ascend_launch_mul.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_mul.h index 5bc0c31701..a036a56aa4 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_mul.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_mul.h @@ -20,7 +20,7 @@ #include #include #include "runtime/device/launch_mul.h" -#include "runtime/device/ascend/ascend_launch_kernel.h" +#include "plugin/device/ascend/hal/device/ascend_launch_kernel.h" namespace mindspore::device::ascend { class AscendLaunchMul : public AscendLaunchKernel, public LaunchMul { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_transdata.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_transdata.cc similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/ascend_launch_transdata.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_transdata.cc index c9d82ad39c..d482318156 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_transdata.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_transdata.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "runtime/device/ascend/ascend_launch_transdata.h" +#include "plugin/device/ascend/hal/device/ascend_launch_transdata.h" #include #include "abstract/utils.h" -#include "backend/session/single_kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/single_kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore::device::ascend { void AscendLaunchTransData::FreeDeviceMem(void *addr) { AscendLaunchKernel::FreeDeviceMem(addr); } diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_transdata.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_transdata.h similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ascend_launch_transdata.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_transdata.h index d6d4f142d0..f85a7a14dc 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_launch_transdata.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_transdata.h @@ -20,7 +20,7 @@ #include #include #include -#include "runtime/device/ascend/ascend_launch_kernel.h" +#include "plugin/device/ascend/hal/device/ascend_launch_kernel.h" namespace mindspore::device::ascend { class AscendLaunchTransData : public AscendLaunchKernel { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_adapter.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_adapter.cc similarity index 99% rename from mindspore/ccsrc/runtime/device/ascend/ascend_memory_adapter.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_adapter.cc index 8c3384f2b1..54fd5211a8 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_adapter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_adapter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/ascend_memory_adapter.h" +#include "plugin/device/ascend/hal/device/ascend_memory_adapter.h" #include #include "runtime/mem.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_adapter.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_adapter.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ascend_memory_adapter.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_adapter.h diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_manager.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_manager.cc index e6b008cf6b..34fd70c08f 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_manager.cc @@ -14,13 +14,13 @@ * limitations under the License. */ #include -#include "runtime/device/ascend/ascend_memory_manager.h" -#include "runtime/device/ascend/ascend_memory_adapter.h" +#include "plugin/device/ascend/hal/device/ascend_memory_manager.h" +#include "plugin/device/ascend/hal/device/ascend_memory_adapter.h" #include "utils/ms_context.h" #include "runtime/mem.h" #include "acl/acl_rt.h" #ifndef ENABLE_SECURITY -#include "runtime/device/ascend/profiling/profiling_manager.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" #include "profiler/device/ascend/memory_profiling.h" using mindspore::device::ascend::ProfilingManager; diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_manager.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_manager.h diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_pool.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_pool.cc index ba700699ae..d3d04d58ed 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_pool.cc @@ -15,8 +15,8 @@ */ #include -#include "runtime/device/ascend/ascend_memory_pool.h" -#include "runtime/device/ascend/ascend_memory_adapter.h" +#include "plugin/device/ascend/hal/device/ascend_memory_pool.h" +#include "plugin/device/ascend/hal/device/ascend_memory_adapter.h" #include "runtime/mem.h" #include "utils/log_adapter.h" #include "utils/convert_utils_base.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_pool.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_pool.h index 2c9a1a59bd..d01853c489 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_pool.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_pool.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_ASCEND_MEMORY_POOL_H_ #include -#include "backend/optimizer/mem_reuse/mem_dynamic_allocator.h" +#include "common/mem_reuse/mem_dynamic_allocator.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.cc similarity index 99% rename from mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.cc index 465bf13a74..e8e7bbce42 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/ascend_stream_assign.h" +#include "plugin/device/ascend/hal/device/ascend_stream_assign.h" #include #include @@ -24,11 +24,11 @@ #include "utils/ms_utils.h" #include "frontend/parallel/context.h" #include "frontend/parallel/device_manager.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_adjust.h" -#include "runtime/device/ascend/ascend_stream_manager.h" -#include "backend/optimizer/common/helper.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "plugin/device/ascend/hal/device/ascend_stream_manager.h" +#include "backend/common/optimizer/helper.h" +#include "kernel/oplib/oplib.h" #include "utils/utils.h" #ifdef ENABLE_DUMP_IR diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.h similarity index 99% rename from mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.h index 0850cea1a5..6c4e4da1d0 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_assign.h @@ -30,7 +30,7 @@ #include "runtime/base.h" #include "runtime/rt_model.h" #include "runtime/stream.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "utils/contract.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_stream_manager.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_manager.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ascend_stream_manager.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_stream_manager.h diff --git a/mindspore/ccsrc/runtime/device/ascend/distribute/ascend_collective.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/ascend_collective.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/distribute/ascend_collective.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/ascend_collective.cc index ed7b3a9321..dda61d7ba7 100644 --- a/mindspore/ccsrc/runtime/device/ascend/distribute/ascend_collective.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/ascend_collective.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/distribute/ascend_collective.h" +#include "plugin/device/ascend/hal/device/distribute/ascend_collective.h" #include "utils/log_adapter.h" static constexpr const char *kAscendCollectiveFileName = "libascend_collective.so"; diff --git a/mindspore/ccsrc/runtime/device/ascend/distribute/ascend_collective.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/ascend_collective.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/distribute/ascend_collective.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/ascend_collective.h diff --git a/mindspore/ccsrc/runtime/device/ascend/distribute/collective_group_wrapper.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/collective_group_wrapper.cc similarity index 92% rename from mindspore/ccsrc/runtime/device/ascend/distribute/collective_group_wrapper.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/collective_group_wrapper.cc index d4ffed3f32..e0d279b376 100644 --- a/mindspore/ccsrc/runtime/device/ascend/distribute/collective_group_wrapper.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/collective_group_wrapper.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/distribute/collective_group_wrapper.h" +#include "plugin/device/ascend/hal/device/distribute/collective_group_wrapper.h" extern "C" { void InitMPI() { (void)MPICollective::instance().Init(); } diff --git a/mindspore/ccsrc/runtime/device/ascend/distribute/collective_group_wrapper.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/collective_group_wrapper.h similarity index 93% rename from mindspore/ccsrc/runtime/device/ascend/distribute/collective_group_wrapper.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/collective_group_wrapper.h index 419794d2ed..90d6b826c6 100644 --- a/mindspore/ccsrc/runtime/device/ascend/distribute/collective_group_wrapper.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/collective_group_wrapper.h @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/ascend/distribute/mpi_collective_group.h" +#include "plugin/device/ascend/hal/device/distribute/mpi_collective_group.h" #ifndef EXPORT_WRAPPER #define EXPORT_WRAPPER __attribute__((visibility("default"))) #endif diff --git a/mindspore/ccsrc/runtime/device/ascend/distribute/mpi_collective_group.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_collective_group.cc similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/distribute/mpi_collective_group.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_collective_group.cc index 60ad7051d0..d032b2ebf8 100644 --- a/mindspore/ccsrc/runtime/device/ascend/distribute/mpi_collective_group.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_collective_group.cc @@ -16,7 +16,7 @@ #include "hccl/hccl.h" #include "runtime/rt.h" -#include "runtime/device/ascend/distribute/mpi_collective_group.h" +#include "plugin/device/ascend/hal/device/distribute/mpi_collective_group.h" namespace mindspore { namespace device { namespace ascend { diff --git a/mindspore/ccsrc/runtime/device/ascend/distribute/mpi_collective_group.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_collective_group.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/distribute/mpi_collective_group.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_collective_group.h diff --git a/mindspore/ccsrc/runtime/device/ascend/distribute/mpi_pycc.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_pycc.cc similarity index 93% rename from mindspore/ccsrc/runtime/device/ascend/distribute/mpi_pycc.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_pycc.cc index 4cdb7acbf3..84ac2b5553 100644 --- a/mindspore/ccsrc/runtime/device/ascend/distribute/mpi_pycc.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_pycc.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/distribute/mpi_pycc.h" +#include "plugin/device/ascend/hal/device/distribute/mpi_pycc.h" #include #include #include diff --git a/mindspore/ccsrc/runtime/device/ascend/distribute/mpi_pycc.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_pycc.h similarity index 92% rename from mindspore/ccsrc/runtime/device/ascend/distribute/mpi_pycc.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_pycc.h index e63e075d19..d990b9f636 100644 --- a/mindspore/ccsrc/runtime/device/ascend/distribute/mpi_pycc.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/distribute/mpi_pycc.h @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/ascend/distribute/collective_group_wrapper.h" +#include "plugin/device/ascend/hal/device/distribute/collective_group_wrapper.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/dump/data_dumper.cc similarity index 99% rename from mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/dump/data_dumper.cc index edc826f9be..ca82ff97ad 100644 --- a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/dump/data_dumper.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/ascend/dump/data_dumper.h" +#include "plugin/device/ascend/hal/device/dump/data_dumper.h" #include #include @@ -21,14 +21,14 @@ #include #include #include "utility" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/convert_utils_base.h" #include "runtime/dev.h" #include "runtime/mem.h" #include "acl/acl_rt.h" #include "runtime/kernel.h" #include "runtime/rt_model.h" -#include "runtime/device/ascend/ge_types_convert.h" +#include "plugin/device/ascend/hal/device/ge_types_convert.h" #include "proto/op_mapping_info.pb.h" #include "utils/comm_manager.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/dump/data_dumper.h similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/dump/data_dumper.h index 0829c6946a..a6fdba51f5 100644 --- a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/dump/data_dumper.h @@ -23,7 +23,7 @@ #include #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace aicpu { namespace dump { diff --git a/mindspore/ccsrc/runtime/device/ascend/dump/proto/ge_dtype.proto b/mindspore/ccsrc/plugin/device/ascend/hal/device/dump/proto/ge_dtype.proto similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/dump/proto/ge_dtype.proto rename to mindspore/ccsrc/plugin/device/ascend/hal/device/dump/proto/ge_dtype.proto diff --git a/mindspore/ccsrc/runtime/device/ascend/dump/proto/op_mapping_info.proto b/mindspore/ccsrc/plugin/device/ascend/hal/device/dump/proto/op_mapping_info.proto similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/dump/proto/op_mapping_info.proto rename to mindspore/ccsrc/plugin/device/ascend/hal/device/dump/proto/op_mapping_info.proto diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/ai_core_dynamic_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_core_dynamic_kernel.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/executor/ai_core_dynamic_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_core_dynamic_kernel.cc index 0dc45bc026..2d1d0ebfd6 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/ai_core_dynamic_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_core_dynamic_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/executor/ai_core_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/ai_core_dynamic_kernel.h" #include #include "framework/common/debug/log.h" @@ -26,9 +26,9 @@ #include "runtime/kernel.h" #include "runtime/mem.h" #include "pipeline/jit/static_analysis/static_analysis.h" -#include "runtime/device/ascend/executor/tiling/op_tiling_adapter.h" +#include "plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.h" #include "utils/ms_device_shape_transfer.h" -#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" #include "acl/acl_rt.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/ai_core_dynamic_kernel.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_core_dynamic_kernel.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/executor/ai_core_dynamic_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_core_dynamic_kernel.h diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/ai_cpu_dynamic_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_cpu_dynamic_kernel.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/executor/ai_cpu_dynamic_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_cpu_dynamic_kernel.cc index f0884e693b..4fecc8bb41 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/ai_cpu_dynamic_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_cpu_dynamic_kernel.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "runtime/device/ascend/executor/ai_cpu_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/ai_cpu_dynamic_kernel.h" #include #include #include "runtime/mem.h" #include "acl/acl_rt.h" #include "runtime/kernel.h" #include "utils/utils.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/aicpu/aicpu_util.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/ai_cpu_dynamic_kernel.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_cpu_dynamic_kernel.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/executor/ai_cpu_dynamic_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_cpu_dynamic_kernel.h index 3028cb3e8e..c100f86630 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/ai_cpu_dynamic_kernel.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/ai_cpu_dynamic_kernel.h @@ -21,7 +21,7 @@ #include #include "runtime/device/executor/dynamic_kernel.h" #include "ir/anf.h" -#include "runtime/device/ascend/executor/aicpu_ext_info_handle.h" +#include "plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/aicpu_ext_info_handle.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/executor/aicpu_ext_info_handle.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.cc index 4d5979b818..a90aa04f41 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/aicpu_ext_info_handle.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "runtime/device/ascend/executor/aicpu_ext_info_handle.h" +#include "plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.h" #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/aicpu/aicpu_util.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/aicpu_ext_info_handle.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.h similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/executor/aicpu_ext_info_handle.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.h index 2dd631f3f0..e71a6e129b 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/aicpu_ext_info_handle.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/kernel_compiler/aicpu/aicpu_util.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" #include "utils/contract.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/hccl_dynamic_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/hccl_dynamic_kernel.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/executor/hccl_dynamic_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/hccl_dynamic_kernel.cc index 2f15ec78a3..f563eda790 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/hccl_dynamic_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/hccl_dynamic_kernel.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "runtime/device/ascend/executor/hccl_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/hccl_dynamic_kernel.h" #include #include "hccl/hcom.h" #include "common/opskernel/ge_task_info.h" #include "utils/log_adapter.h" #include "runtime/device/kernel_runtime.h" -#include "backend/kernel_compiler/hccl/hcom_util.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/kernel/hccl/hcom_util.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" namespace { // Find so in RPATH or LD_LIBRARY_PATH (/usr/local/Ascend/fwkacllib/lib64/) diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/hccl_dynamic_kernel.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/hccl_dynamic_kernel.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/executor/hccl_dynamic_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/hccl_dynamic_kernel.h diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/host_dynamic_kernel.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/host_dynamic_kernel.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/executor/host_dynamic_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/host_dynamic_kernel.h diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/rts/memcpy_rts_dynamic_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/memcpy_rts_dynamic_kernel.cc similarity index 92% rename from mindspore/ccsrc/runtime/device/ascend/executor/rts/memcpy_rts_dynamic_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/memcpy_rts_dynamic_kernel.cc index 1778a15811..e9f9ecca53 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/rts/memcpy_rts_dynamic_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/memcpy_rts_dynamic_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/executor/rts/memcpy_rts_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/rts/memcpy_rts_dynamic_kernel.h" #include "runtime/mem.h" #include "acl/acl_rt.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/rts/memcpy_rts_dynamic_kernel.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/memcpy_rts_dynamic_kernel.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/executor/rts/memcpy_rts_dynamic_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/memcpy_rts_dynamic_kernel.h diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/rts/profiling_rts_dynamic_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/profiling_rts_dynamic_kernel.cc similarity index 91% rename from mindspore/ccsrc/runtime/device/ascend/executor/rts/profiling_rts_dynamic_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/profiling_rts_dynamic_kernel.cc index 230430cece..5e5183d96a 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/rts/profiling_rts_dynamic_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/profiling_rts_dynamic_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/executor/rts/profiling_rts_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/rts/profiling_rts_dynamic_kernel.h" #include "runtime/base.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/rts/profiling_rts_dynamic_kernel.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/profiling_rts_dynamic_kernel.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/executor/rts/profiling_rts_dynamic_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/rts/profiling_rts_dynamic_kernel.h diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/tiling/op_tiling_adapter.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/executor/tiling/op_tiling_adapter.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.cc index bb99baab10..6fa4a5a367 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/tiling/op_tiling_adapter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.cc @@ -15,11 +15,11 @@ */ #include -#include "runtime/device/ascend/executor/tiling/op_tiling_adapter.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_build.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "runtime/device/ascend/ge_types_convert.h" +#include "plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_build.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ge_types_convert.h" #include "utils/utils.h" #include "external/graph/tensor.h" #include "external/register/op_tiling_registry.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/executor/tiling/op_tiling_adapter.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.h similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/executor/tiling/op_tiling_adapter.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.h index c828730b80..aa303557fe 100644 --- a/mindspore/ccsrc/runtime/device/ascend/executor/tiling/op_tiling_adapter.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.h @@ -22,7 +22,7 @@ #include #include #include -#include "backend/kernel_compiler/oplib/opinfo.h" +#include "kernel/oplib/opinfo.h" #include "register/op_tiling.h" #include "external/graph/operator.h" #include "graph/utils/op_desc_utils.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/davinci_model.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/davinci_model.h similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/davinci_model.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/davinci_model.h index 8808ce38be..3819a1547d 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/davinci_model.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/davinci_model.h @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/ascend/ge_runtime/task_info.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" namespace mindspore::ge::model_runner { class DavinciModel { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/model_context.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/model_context.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/model_context.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/model_context.h diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/model_runner.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/model_runner.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/model_runner.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/model_runner.cc index 39c4821194..41bf638665 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/model_runner.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/model_runner.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/model_runner.h" -#include "runtime/device/ascend/ge_runtime/runtime_model.h" -#include "runtime/device/ascend/ge_runtime/davinci_model.h" +#include "plugin/device/ascend/hal/device/ge_runtime/model_runner.h" +#include "plugin/device/ascend/hal/device/ge_runtime/runtime_model.h" +#include "plugin/device/ascend/hal/device/ge_runtime/davinci_model.h" #include "mindspore/core/utils/log_adapter.h" namespace mindspore::ge::model_runner { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/model_runner.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/model_runner.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/model_runner.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/model_runner.h index 6de83a5da0..cdb2e04ac5 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/model_runner.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/model_runner.h @@ -22,7 +22,7 @@ #include #include #include -#include "runtime/device/ascend/ge_runtime/davinci_model.h" +#include "plugin/device/ascend/hal/device/ge_runtime/davinci_model.h" namespace mindspore::ge::model_runner { class RuntimeModel; diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/runtime_model.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/runtime_model.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/runtime_model.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/runtime_model.cc index af1e43cb42..5fd9a14449 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/runtime_model.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/runtime_model.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/runtime_model.h" +#include "plugin/device/ascend/hal/device/ge_runtime/runtime_model.h" #include #include "runtime/kernel.h" #include "runtime/rt_model.h" #include "graphengine/inc/external/runtime/rt_error_codes.h" -#include "runtime/device/ascend/ge_runtime/model_context.h" -#include "runtime/device/ascend/ge_runtime/task/task.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/model_context.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" #include "mindspore/core/utils/log_adapter.h" #ifdef ENABLE_DUMP_IR #include "debug/rdr/running_data_recorder.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/runtime_model.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/runtime_model.h similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/runtime_model.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/runtime_model.h index af8c1ecfea..c1bcc74a53 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/runtime_model.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/runtime_model.h @@ -23,7 +23,7 @@ #include #include "runtime/base.h" #include "runtime/rt_model.h" -#include "runtime/device/ascend/ge_runtime/davinci_model.h" +#include "plugin/device/ascend/hal/device/ge_runtime/davinci_model.h" namespace mindspore::ge::model_runner { using RuntimeInfo = std::tuple; diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/aicpu_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/aicpu_task.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/aicpu_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/aicpu_task.cc index 9724dc79a4..b74dba2fa1 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/aicpu_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/aicpu_task.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/aicpu_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/aicpu_task.h" #include #include "runtime/mem.h" #include "acl/acl_rt.h" #include "runtime/kernel.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" #include "aicpu/common/aicpu_task_struct.h" #include "mindspore/core/utils/convert_utils_base.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/aicpu_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/aicpu_task.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/aicpu_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/aicpu_task.h index 4c7cded24b..8fb6358ccf 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/aicpu_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/aicpu_task.h @@ -20,7 +20,7 @@ #include #include #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class AicpuTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_record_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_record_task.cc similarity index 93% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_record_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_record_task.cc index 6dc238e9b7..f8f8bc5911 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_record_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_record_task.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/event_record_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/event_record_task.h" #include "runtime/kernel.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" namespace mindspore::ge::model_runner { EventRecordTask::EventRecordTask(const ModelContext &model_context, diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_record_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_record_task.h similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_record_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_record_task.h index 71084eb8d3..bf07474d37 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_record_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_record_task.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_GE_RUNTIME_EVENT_RECORD_TASK_H_ #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class EventRecordTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_wait_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_wait_task.cc similarity index 93% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_wait_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_wait_task.cc index 920f601d88..bfd8f92a02 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_wait_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_wait_task.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/event_wait_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/event_wait_task.h" #include "runtime/kernel.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" namespace mindspore::ge::model_runner { EventWaitTask::EventWaitTask(const ModelContext &model_context, const std::shared_ptr &task_info) diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_wait_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_wait_task.h similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_wait_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_wait_task.h index 2809a10578..3b02a0cea2 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/event_wait_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/event_wait_task.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_GE_RUNTIME_EVENT_WAIT_TASK_H_ #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class EventWaitTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/hccl_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/hccl_task.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/hccl_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/hccl_task.cc index 1f46da9bb7..576e4bf48f 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/hccl_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/hccl_task.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/hccl_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/hccl_task.h" #include -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" #include "common/opskernel/ops_kernel_info_store.h" #include "common/opskernel/ge_task_info.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/hccl_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/hccl_task.h similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/hccl_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/hccl_task.h index 406750320d..d38be22a31 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/hccl_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/hccl_task.h @@ -22,7 +22,7 @@ #include #include #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class HcclTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_goto_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_goto_task.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_goto_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_goto_task.cc index ff9ee745d7..95e09d7a38 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_goto_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_goto_task.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/label_goto_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_goto_task.h" #include "runtime/mem.h" #include "acl/acl_rt.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" namespace mindspore::ge::model_runner { LabelGotoTask::LabelGotoTask(const ModelContext &model_context, const std::shared_ptr &task_info) diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_goto_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_goto_task.h similarity index 91% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_goto_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_goto_task.h index 6048617c4d..d0328afdca 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_goto_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_goto_task.h @@ -21,8 +21,8 @@ #include #include #include -#include "runtime/device/ascend/ge_runtime/task/task.h" -#include "runtime/device/ascend/ge_runtime/task/label_manager.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_manager.h" namespace mindspore::ge::model_runner { class LabelGotoTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_manager.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_manager.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_manager.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_manager.cc index b1dd9b667a..9e34ea60a4 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_manager.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/label_manager.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_manager.h" #include #include #include "runtime/mem.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_manager.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_manager.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_manager.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_manager.h diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_set_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_set_task.cc similarity index 93% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_set_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_set_task.cc index 31942ae434..15a18d4a63 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_set_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_set_task.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/label_set_task.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_set_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" namespace mindspore::ge::model_runner { LabelSetTask::LabelSetTask(const ModelContext &model_context, const std::shared_ptr &task_info) diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_set_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_set_task.h similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_set_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_set_task.h index 54a5d1027c..85d341ca29 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_set_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_set_task.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_GE_RUNTIME_TASK_LABEL_SET_TASK_H_ #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class LabelSetTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_switch_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_switch_task.cc similarity index 94% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_switch_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_switch_task.cc index f0059c2247..69d1062d9b 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_switch_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_switch_task.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/label_switch_task.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_switch_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" namespace mindspore::ge::model_runner { LabelSwitchTask::LabelSwitchTask(const ModelContext &model_context, diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_switch_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_switch_task.h similarity index 91% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_switch_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_switch_task.h index ea4e155145..7fb9f63541 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/label_switch_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/label_switch_task.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_GE_RUNTIME_TASK_LABEL_SWITCH_TASK_H_ #include -#include "runtime/device/ascend/ge_runtime/task/task.h" -#include "runtime/device/ascend/ge_runtime/task/label_manager.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_manager.h" namespace mindspore::ge::model_runner { class LabelSwitchTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/memcpy_async_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/memcpy_async_task.cc similarity index 93% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/memcpy_async_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/memcpy_async_task.cc index da374bfa39..3ce96eeffb 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/memcpy_async_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/memcpy_async_task.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/memcpy_async_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/memcpy_async_task.h" #include "runtime/mem.h" #include "acl/acl_rt.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" namespace mindspore::ge::model_runner { MemcpyAsyncTask::MemcpyAsyncTask(const ModelContext &model_context, diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/memcpy_async_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/memcpy_async_task.h similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/memcpy_async_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/memcpy_async_task.h index 8e9e9ff989..ce88118d45 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/memcpy_async_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/memcpy_async_task.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_GE_RUNTIME_TASK_MEMCPY_ASYNC_TASK_H_ #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class MemcpyAsyncTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/profiler_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/profiler_task.cc similarity index 94% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/profiler_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/profiler_task.cc index 23c936a546..29e926e725 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/profiler_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/profiler_task.cc @@ -14,8 +14,9 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/profiler_task.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/profiler_task.h" +#include +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" namespace mindspore::ge::model_runner { ProfilerTask::ProfilerTask(const ModelContext &model_context, const std::shared_ptr &task_info) diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/profiler_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/profiler_task.h similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/profiler_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/profiler_task.h index f0be7da02d..c8bc53e348 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/profiler_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/profiler_task.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_GE_RUNTIME_TASK_PROFILER_TASK_H_ #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class ProfilerTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_active_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_active_task.cc similarity index 93% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_active_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_active_task.cc index 3a90d4431f..9bbb8b6ce8 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_active_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_active_task.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/stream_active_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/stream_active_task.h" #include "runtime/kernel.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" namespace mindspore::ge::model_runner { StreamActiveTask::StreamActiveTask(const ModelContext &model_context, diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_active_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_active_task.h similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_active_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_active_task.h index 359b09cf44..2240dcfa5d 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_active_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_active_task.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_GE_RUNTIME_TASK_STREAM_ACTIVE_TASK_H_ #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class StreamActiveTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_switch_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_switch_task.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_switch_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_switch_task.cc index bccc3a8cd5..fd5efaf78e 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_switch_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_switch_task.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/stream_switch_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/stream_switch_task.h" #include "runtime/kernel.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" #include "mindspore/core/utils/convert_utils_base.h" namespace mindspore::ge::model_runner { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_switch_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_switch_task.h similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_switch_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_switch_task.h index 686bf6bb1e..a48298bba5 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/stream_switch_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/stream_switch_task.h @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class StreamSwitchTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/task.h similarity index 92% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/task.h index 862e22e133..219701e677 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/task.h @@ -21,8 +21,8 @@ #include #include #include -#include "runtime/device/ascend/ge_runtime/model_context.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" +#include "plugin/device/ascend/hal/device/ge_runtime/model_context.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" namespace mindspore::ge::model_runner { class Task { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/task_factory.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h similarity index 97% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/task_factory.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h index aab4c41114..9d7d4c95e9 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/task_factory.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h @@ -21,7 +21,7 @@ #include #include #include -#include "runtime/device/ascend/ge_runtime/task_info.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" #include "mindspore/core/utils/log_adapter.h" namespace mindspore::ge::model_runner { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/tbe_task.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/tbe_task.cc similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/tbe_task.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/tbe_task.cc index 65d2fb23c5..6fbeb62c4e 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/tbe_task.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/tbe_task.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_runtime/task/tbe_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/tbe_task.h" #include #include "runtime/mem.h" #include "acl/acl_rt.h" #include "runtime/kernel.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" namespace mindspore::ge::model_runner { TbeTask::TbeTask(const ModelContext &model_context, const std::shared_ptr &task_info) diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/tbe_task.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/tbe_task.h similarity index 95% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/tbe_task.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/tbe_task.h index 5c75223feb..de26526021 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task/tbe_task.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task/tbe_task.h @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/ascend/ge_runtime/task/task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task.h" namespace mindspore::ge::model_runner { class TbeTask : public TaskRepeater { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_runtime/task_info.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task_info.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ge_runtime/task_info.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/task_info.h diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_types_convert.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_types_convert.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/ge_types_convert.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_types_convert.cc index 120869fdbc..671921a480 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ge_types_convert.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_types_convert.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/ge_types_convert.h" +#include "plugin/device/ascend/hal/device/ge_types_convert.h" #include "graph/utils/type_utils.h" namespace { diff --git a/mindspore/ccsrc/runtime/device/ascend/ge_types_convert.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/ge_types_convert.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/ge_types_convert.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/ge_types_convert.h diff --git a/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_build_ascend.cc similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_build_ascend.cc index 0419de67aa..bef30ddf1b 100644 --- a/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_build_ascend.cc @@ -14,21 +14,21 @@ * limitations under the License. */ -#include "runtime/device/ascend/kernel_build_ascend.h" +#include "plugin/device/ascend/hal/device/kernel_build_ascend.h" #include #include #include #include #include #include -#include "runtime/device/ascend/kernel_select_ascend.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_compile.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/host/host_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 "plugin/device/ascend/hal/device/kernel_select_ascend.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h" +#include "plugin/device/ascend/kernel/akg/akg_ascend_kernel_build.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_build.h" +#include "plugin/device/ascend/kernel/host/host_kernel_build.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel_build.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_build.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_build_ascend.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_build_ascend.h index a30e1fdfc2..a518402e09 100644 --- a/mindspore/ccsrc/runtime/device/ascend/kernel_build_ascend.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_build_ascend.h @@ -19,7 +19,7 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.cc index ee03a1cda8..567052ed3a 100644 --- a/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/kernel_select_ascend.h" +#include "plugin/device/ascend/hal/device/kernel_select_ascend.h" #include #include @@ -24,13 +24,13 @@ #include #include #include -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/kernel_compiler/kernel_query.h" -#include "backend/kernel_compiler/oplib/oplib.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" -#include "backend/kernel_compiler/aicpu/aicpu_attr_to_input_registry.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/kernel_build_info.h" +#include "kernel/kernel_query.h" +#include "kernel/oplib/oplib.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_attr_to_input_registry.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_device_shape_transfer.h" #include "debug/anf_ir_dump.h" #include "frontend/operator/ops.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.h index b4fd09a98a..3d73c33774 100644 --- a/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_KERNEL_SELECT_ASCEND_ANFALGO_H_ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_KERNEL_SELECT_ASCEND_ANFALGO_H_ #include "ir/anf.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace device { namespace ascend { diff --git a/mindspore/ccsrc/runtime/device/ascend/kernel_select_graph_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_graph_kernel.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/kernel_select_graph_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_graph_kernel.cc index a6c7d817a1..4e4f47566c 100644 --- a/mindspore/ccsrc/runtime/device/ascend/kernel_select_graph_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_graph_kernel.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "runtime/device/ascend/kernel_select_ascend.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/kernel_select_ascend.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "ir/func_graph.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/kernel_query.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/common_utils.h" +#include "kernel/kernel_query.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/lic_manager.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/lic_manager.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/lic_manager.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/lic_manager.cc index 8a7c76da18..cae20332a0 100644 --- a/mindspore/ccsrc/runtime/device/ascend/lic_manager.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/lic_manager.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/ascend/lic_manager.h" +#include "plugin/device/ascend/hal/device/lic_manager.h" #include #include "utils/ms_context.h" #include "runtime/dev.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/lic_manager.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/lic_manager.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/lic_manager.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/lic_manager.h diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_manager.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_manager.cc index 560aeed105..93ece3513f 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/profiling/profiling_manager.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" #include #include #include "common/util/error_manager/error_manager.h" @@ -26,7 +26,7 @@ #include "utils/convert_utils.h" #include "runtime/base.h" #include -#include "runtime/device/ascend/profiling/profiling_utils.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_utils.h" using mindspore::device::ascend::ProfilingUtils; diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_manager.h similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_manager.h diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_reporter.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_reporter.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/profiling/profiling_reporter.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_reporter.cc index fb08fd70c2..7beb50f24b 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_reporter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_reporter.cc @@ -15,9 +15,9 @@ */ #include #include -#include "runtime/device/ascend/profiling/profiling_reporter.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/ascend_kernel_mod.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_reporter.h" +#include "kernel/kernel.h" +#include "kernel/ascend_kernel_mod.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_reporter.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_reporter.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/profiling/profiling_reporter.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_reporter.h index 3f54a3eafa..28db42d1af 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_reporter.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_reporter.h @@ -23,8 +23,8 @@ #include "securec/include/securec.h" #include "utils/log_adapter.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "runtime/device/ascend/profiling/profiling_manager.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" #include "toolchain/prof_common.h" #include "toolchain/prof_reporter.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_utils.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_utils.cc index 6d52616262..a7db0a9e12 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_utils.cc @@ -15,10 +15,10 @@ */ #include -#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 "plugin/device/ascend/hal/device/profiling/profiling_utils.h" +#include "kernel/kernel.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_utils.h" #include "utils/utils.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_utils.h similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_utils.h index 73fa747f93..e6f0238b21 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/profiling_utils.h @@ -22,9 +22,9 @@ #include #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "utils/contract.h" -#include "runtime/device/ascend/profiling/profiling_reporter.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_reporter.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/readme.md b/mindspore/ccsrc/plugin/device/ascend/hal/device/readme.md similarity index 100% rename from mindspore/ccsrc/runtime/device/ascend/readme.md rename to mindspore/ccsrc/plugin/device/ascend/hal/device/readme.md diff --git a/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc b/mindspore/ccsrc/plugin/device/ascend/hal/device/tasksink/task_generator.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/device/tasksink/task_generator.cc index 60d89d9d74..290ce70a28 100644 --- a/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/tasksink/task_generator.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "runtime/device/ascend/tasksink/task_generator.h" +#include "plugin/device/ascend/hal/device/tasksink/task_generator.h" #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/task_stream.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/task_stream.h" #include "utils/utils.h" #include "utils/ms_utils.h" #ifndef ENABLE_SECURITY -#include "runtime/device/ascend/profiling/profiling_utils.h" -#include "runtime/device/ascend/profiling/profiling_manager.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_utils.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" #endif #ifdef ENABLE_DUMP_IR #include "debug/rdr/running_data_recorder.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.h b/mindspore/ccsrc/plugin/device/ascend/hal/device/tasksink/task_generator.h similarity index 96% rename from mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.h rename to mindspore/ccsrc/plugin/device/ascend/hal/device/tasksink/task_generator.h index f84c91a649..6e852c7947 100644 --- a/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/device/tasksink/task_generator.h @@ -25,8 +25,8 @@ #include #include "runtime/device/kernel_runtime.h" #include "ir/anf.h" -#include "backend/kernel_compiler/ascend_kernel_mod.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" +#include "kernel/ascend_kernel_mod.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/plugin/device/ascend/hal/hardware/CMakeLists.txt b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/CMakeLists.txt new file mode 100644 index 0000000000..c3833e7bed --- /dev/null +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/CMakeLists.txt @@ -0,0 +1,11 @@ +file(GLOB_RECURSE HARDWARE_ASCEND_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-abstract-non-virtual-dtor") +endif() + +set_property(SOURCE ${HARDWARE_ASCEND_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) +if(ENABLE_D) + add_library(_mindspore_plugin_device_ascend_hal_hardware_obj OBJECT ${HARDWARE_ASCEND_SRC_LIST}) +endif() diff --git a/mindspore/ccsrc/runtime/hardware/ascend/ascend_device_context.cc b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_device_context.cc similarity index 97% rename from mindspore/ccsrc/runtime/hardware/ascend/ascend_device_context.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_device_context.cc index 75298c4a92..f05ff709a4 100644 --- a/mindspore/ccsrc/runtime/hardware/ascend/ascend_device_context.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_device_context.cc @@ -14,27 +14,27 @@ * limitations under the License. */ -#include "runtime/hardware/ascend/ascend_device_context.h" +#include "plugin/device/ascend/hal/hardware/ascend_device_context.h" #include #include #include #include "acl/acl_rt.h" #include "runtime/dev.h" -#include "backend/optimizer/ascend/ascend_backend_optimization.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h" +#include "plugin/device/ascend/optimizer/ascend_backend_optimization.h" +#include "common/graph_kernel/adapter/graph_kernel_optimization.h" #include "utils/context/graph_kernel_flags.h" #include "utils/utils.h" -#include "runtime/device/ascend/kernel_select_ascend.h" +#include "plugin/device/ascend/hal/device/kernel_select_ascend.h" #include "runtime/device/kernel_adjust.h" -#include "runtime/device/ascend/ascend_stream_assign.h" -#include "runtime/device/ascend/kernel_build_ascend.h" -#include "runtime/hardware/ascend/ascend_graph_optimization.h" -#include "backend/kernel_compiler/ascend_kernel_mod.h" -#include "backend/kernel_compiler/aicpu/aicpu_kernel_load.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_compile.h" -#include "runtime/device/ascend/ascend_bucket.h" +#include "plugin/device/ascend/hal/device/ascend_stream_assign.h" +#include "plugin/device/ascend/hal/device/kernel_build_ascend.h" +#include "plugin/device/ascend/hal/hardware/ascend_graph_optimization.h" +#include "kernel/ascend_kernel_mod.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h" +#include "plugin/device/ascend/hal/device/ascend_bucket.h" #include "common/util/error_manager/error_manager.h" -#include "runtime/device/ascend/ascend_memory_adapter.h" +#include "plugin/device/ascend/hal/device/ascend_memory_adapter.h" #ifndef ENABLE_SECURITY #include "debug/data_dump/dump_json_parser.h" @@ -59,7 +59,7 @@ #ifndef ENABLE_SECURITY #include "profiler/device/ascend/memory_profiling.h" -#include "runtime/device/ascend/profiling/profiling_manager.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" #include "utils/anf_utils.h" using Adx::AdxRegDumpProcessCallBack; diff --git a/mindspore/ccsrc/runtime/hardware/ascend/ascend_device_context.h b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_device_context.h similarity index 98% rename from mindspore/ccsrc/runtime/hardware/ascend/ascend_device_context.h rename to mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_device_context.h index 077e5fbe01..7dfe91bd4f 100644 --- a/mindspore/ccsrc/runtime/hardware/ascend/ascend_device_context.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_device_context.h @@ -25,8 +25,8 @@ #include "runtime/hardware/device_context.h" #include "runtime/hardware/device_context_manager.h" #include "runtime/device/memory_manager.h" -#include "runtime/device/ascend/ascend_kernel_runtime.h" -#include "runtime/device/ascend/ascend_device_address.h" +#include "plugin/device/ascend/hal/device/ascend_kernel_runtime.h" +#include "plugin/device/ascend/hal/device/ascend_device_address.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/ascend/ascend_graph_optimization.cc b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_graph_optimization.cc similarity index 96% rename from mindspore/ccsrc/runtime/hardware/ascend/ascend_graph_optimization.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_graph_optimization.cc index ee83f35986..229d5093a9 100644 --- a/mindspore/ccsrc/runtime/hardware/ascend/ascend_graph_optimization.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_graph_optimization.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "runtime/hardware/ascend/ascend_graph_optimization.h" +#include "plugin/device/ascend/hal/hardware/ascend_graph_optimization.h" #include #include -#include "backend/optimizer/common/common_backend_optimization.h" -#include "backend/optimizer/ascend/ascend_backend_optimization.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h" -#include "backend/session/ascend_auto_monad.h" +#include "backend/common/optimizer/common_backend_optimization.h" +#include "plugin/device/ascend/optimizer/ascend_backend_optimization.h" +#include "common/graph_kernel/adapter/graph_kernel_optimization.h" +#include "backend/common/session/ascend_auto_monad.h" #include "utils/context/graph_kernel_flags.h" -#include "runtime/device/ascend/kernel_select_ascend.h" +#include "plugin/device/ascend/hal/device/kernel_select_ascend.h" #include "runtime/device/kernel_adjust.h" #ifndef ENABLE_SECURITY diff --git a/mindspore/ccsrc/runtime/hardware/ascend/ascend_graph_optimization.h b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_graph_optimization.h similarity index 98% rename from mindspore/ccsrc/runtime/hardware/ascend/ascend_graph_optimization.h rename to mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_graph_optimization.h index a1e4ded852..d281e40bcc 100644 --- a/mindspore/ccsrc/runtime/hardware/ascend/ascend_graph_optimization.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_graph_optimization.h @@ -19,7 +19,7 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/CMakeLists.txt b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/CMakeLists.txt new file mode 100644 index 0000000000..8f0867bfdb --- /dev/null +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/CMakeLists.txt @@ -0,0 +1,10 @@ +file(GLOB HCCL_ADAPTER_SRC_LIST ./*.cc) +set_property(SOURCE ${HCCL_ADAPTER_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_HCCL_ADPT) +if(ENABLE_D) + add_library(_mindspore_plugin_device_ascend_hal_hccl_adapter_obj OBJECT ${HCCL_ADAPTER_SRC_LIST}) + target_include_directories(_mindspore_plugin_device_ascend_hal_hccl_adapter_obj + PRIVATE ${CMAKE_BINARY_DIR}/proto/ge) + add_dependencies(_mindspore_plugin_device_ascend_hal_hccl_adapter_obj graph) + add_subdirectory(plugin) +endif() \ No newline at end of file diff --git a/mindspore/ccsrc/runtime/hccl_adapter/all_to_all_v_calc_param.cc b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.cc similarity index 97% rename from mindspore/ccsrc/runtime/hccl_adapter/all_to_all_v_calc_param.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.cc index 8bb7aebfab..b9d9fea8e0 100644 --- a/mindspore/ccsrc/runtime/hccl_adapter/all_to_all_v_calc_param.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/hccl_adapter/all_to_all_v_calc_param.h" +#include "plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "transform/graph_ir/util.h" #include "runtime/device/memory_manager.h" diff --git a/mindspore/ccsrc/runtime/hccl_adapter/all_to_all_v_calc_param.h b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.h similarity index 100% rename from mindspore/ccsrc/runtime/hccl_adapter/all_to_all_v_calc_param.h rename to mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.h diff --git a/mindspore/ccsrc/runtime/hccl_adapter/converter.cc b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/converter.cc similarity index 97% rename from mindspore/ccsrc/runtime/hccl_adapter/converter.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/converter.cc index 4b2c069f98..20cafac3c9 100644 --- a/mindspore/ccsrc/runtime/hccl_adapter/converter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/converter.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/hccl_adapter/converter.h" +#include "plugin/device/ascend/hal/hccl_adapter/converter.h" #include #include #include @@ -22,11 +22,11 @@ #include "graph/compute_graph.h" #include "graph/debug/ge_attr_define.h" #undef google -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/log_adapter.h" #include "mindspore/core/base/core_ops.h" #include "transform/graph_ir/util.h" -#include "runtime/hccl_adapter/all_to_all_v_calc_param.h" +#include "plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.h" static constexpr char kGeOpNameHcclSend[] = "HcomSend"; static constexpr char kGeOpNameHcclReceive[] = "HcomReceive"; diff --git a/mindspore/ccsrc/runtime/hccl_adapter/converter.h b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/converter.h similarity index 95% rename from mindspore/ccsrc/runtime/hccl_adapter/converter.h rename to mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/converter.h index 6b6bda3a47..74a5938149 100644 --- a/mindspore/ccsrc/runtime/hccl_adapter/converter.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/converter.h @@ -26,7 +26,7 @@ #include "common/opskernel/ops_kernel_info_types.h" #include "proto/task.pb.h" #undef google -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" #include "mindspore/core/ir/anf.h" namespace mindspore::hccl { diff --git a/mindspore/ccsrc/runtime/hccl_adapter/hccl_adapter.cc b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/hccl_adapter.cc similarity index 99% rename from mindspore/ccsrc/runtime/hccl_adapter/hccl_adapter.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/hccl_adapter.cc index 5253631de3..0029dcea27 100644 --- a/mindspore/ccsrc/runtime/hccl_adapter/hccl_adapter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/hccl_adapter.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" #include #include #include @@ -27,7 +27,7 @@ #include "utils/log_adapter.h" #include "utils/ms_utils.h" #include "utils/ms_context.h" -#include "runtime/hccl_adapter/converter.h" +#include "plugin/device/ascend/hal/hccl_adapter/converter.h" static constexpr const char *kHcclPluginFileName = "libhccl_plugin.so"; static constexpr const char *kHcclDeployModeEnv = "DEPLOY_MODE"; diff --git a/mindspore/ccsrc/runtime/hccl_adapter/hccl_adapter.h b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h similarity index 97% rename from mindspore/ccsrc/runtime/hccl_adapter/hccl_adapter.h rename to mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h index 85451c281c..2d5d82d339 100644 --- a/mindspore/ccsrc/runtime/hccl_adapter/hccl_adapter.h +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h @@ -23,8 +23,8 @@ #include #include "mindspore/core/ir/anf.h" #include "hccl/hccl_types.h" -#include "runtime/hccl_adapter/plugin/hccl_plugin.h" -#include "runtime/device/ascend/distribute/ascend_collective.h" +#include "plugin/device/ascend/hal/hccl_adapter/plugin/hccl_plugin.h" +#include "plugin/device/ascend/hal/device/distribute/ascend_collective.h" using HcclCollectiveGroup = mindspore::device::ascend::collective::HcclCollectiveGroup; namespace ge { diff --git a/mindspore/ccsrc/runtime/hccl_adapter/plugin/CMakeLists.txt b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/plugin/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/runtime/hccl_adapter/plugin/CMakeLists.txt rename to mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/plugin/CMakeLists.txt diff --git a/mindspore/ccsrc/runtime/hccl_adapter/plugin/hccl_plugin.cc b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/plugin/hccl_plugin.cc similarity index 96% rename from mindspore/ccsrc/runtime/hccl_adapter/plugin/hccl_plugin.cc rename to mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/plugin/hccl_plugin.cc index 15e69bb0ea..8a48f31e94 100644 --- a/mindspore/ccsrc/runtime/hccl_adapter/plugin/hccl_plugin.cc +++ b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/plugin/hccl_plugin.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/hccl_adapter/plugin/hccl_plugin.h" +#include "plugin/device/ascend/hal/hccl_adapter/plugin/hccl_plugin.h" #define google ascend_private #include "register/ops_kernel_builder_registry.h" #include "common/opskernel/ops_kernel_info_store.h" diff --git a/mindspore/ccsrc/runtime/hccl_adapter/plugin/hccl_plugin.h b/mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/plugin/hccl_plugin.h similarity index 100% rename from mindspore/ccsrc/runtime/hccl_adapter/plugin/hccl_plugin.h rename to mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/plugin/hccl_plugin.h diff --git a/mindspore/ccsrc/plugin/device/ascend/kernel/CMakeLists.txt b/mindspore/ccsrc/plugin/device/ascend/kernel/CMakeLists.txt new file mode 100644 index 0000000000..e55541a942 --- /dev/null +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/CMakeLists.txt @@ -0,0 +1,35 @@ +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-abstract-non-virtual-dtor -Wno-overloaded-virtual") +endif() + +file(GLOB_RECURSE D_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/kernel/kernel_query.cc + ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/kernel/ascend_kernel_mod.cc + "tbe/*.cc" + "host/*.cc" + "aicpu/*.cc" + "rts/*.cc" + "hccl/*.cc" + ) + file(GLOB_RECURSE AICPU_OPS_SRC RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "aicpu/aicpu_ops/*.cc" + ) + list(REMOVE_ITEM D_SRC_LIST ${AICPU_OPS_SRC}) + add_compile_definitions(ENABLE_D) + + if(ENABLE_SECURITY) + list(REMOVE_ITEM D_SRC_LIST "rts/profiling_kernel_mod.cc") + endif() + + if(ENABLE_AKG AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND ENABLE_D) + file(GLOB_RECURSE AKG_D_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "akg/*.cc" + ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/kernel/akg/akg_kernel_metadata.cc + ) +endif() + +set_property(SOURCE ${D_SRC_LIST} ${AKG_D_SRC_LIST} + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_KERNEL) +if(ENABLE_D) + add_library(_mindspore_plugin_device_ascend_kernel_obj OBJECT ${D_SRC_LIST} ${AKG_D_SRC_LIST}) +endif() diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_attr_to_input_registry.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_attr_to_input_registry.cc similarity index 87% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_attr_to_input_registry.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_attr_to_input_registry.cc index 903ccbf2dc..2e1f0e7c99 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_attr_to_input_registry.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_attr_to_input_registry.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/aicpu/aicpu_attr_to_input_registry.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_attr_to_input_registry.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_attr_to_input_registry.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_attr_to_input_registry.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_attr_to_input_registry.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_attr_to_input_registry.h index 925b933e21..9a75f96dc6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_attr_to_input_registry.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_attr_to_input_registry.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_build.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_build.cc index 78f1c2ff37..ab74965021 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_build.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/aicpu/aicpu_kernel_build.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_build.h" #include #include #include @@ -24,17 +24,17 @@ #include #include "utils/utils.h" #include "runtime/device/kernel_runtime.h" -#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.h" #include "proto/tensor.pb.h" #include "proto/tensor_shape.pb.h" #include "proto/attr.pb.h" #include "proto/node_def.pb.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/aicpu/aicpu_util.h" -#include "backend/kernel_compiler/aicpu/aicpu_kernel_load.h" -#include "backend/session/kernel_graph.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/common_utils.h" +#include "kernel/oplib/oplib.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_build.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_build.h index a1b5b4b84e..4086a9223e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_build.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_AICPU_AICPU_KERNEL_BUILD_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_AICPU_AICPU_KERNEL_BUILD_H_ #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_load.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_load.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.cc index 44b8c99cfa..6bca6e57bc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_load.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/aicpu/aicpu_kernel_load.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.h" #include #include #include @@ -25,7 +25,7 @@ #include "runtime/context.h" #include "utils/utils.h" #include "utils/file_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_load.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_load.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.h index 3fa973c38c..1dfe68078d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_load.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.h @@ -24,8 +24,8 @@ #include "runtime/base.h" #include "base/base.h" #include "ir/anf.h" -#include "backend/kernel_compiler/aicpu/aicpu_util.h" -#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_metadata.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_metadata.cc index 399978325c..e48911bd54 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_metadata.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_metadata.h" #include #include -#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" +#include "kernel/oplib/oplib.h" +#include "kernel/common_utils.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_metadata.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_metadata.h index 1d9ead2f57..adf031f9b1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_metadata.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.cc index e9024b7342..9ce15a3ef7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.h" #include #include @@ -24,11 +24,11 @@ #include "runtime/mem.h" #include "runtime/rt.h" #include "utils/convert_utils.h" -#include "backend/kernel_compiler/aicpu/aicpu_util.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" #include "utils/ms_context.h" -#include "runtime/device/ascend/executor/ai_cpu_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/ai_cpu_dynamic_kernel.h" #include "runtime/device/kernel_runtime.h" -#include "runtime/device/ascend/executor/host_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/host_dynamic_kernel.h" using AicpuTaskInfoPtr = std::shared_ptr; using AicpuDynamicKernel = mindspore::device::ascend::AiCpuDynamicKernel; diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.h index 78435f9184..cad7ce2e2a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.h @@ -18,8 +18,8 @@ #include #include #include -#include "backend/kernel_compiler/ascend_kernel_mod.h" -#include "backend/kernel_compiler/aicpu/aicpu_util.h" +#include "kernel/ascend_kernel_mod.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" namespace mindspore { namespace kernel { class AicpuOpKernelMod : public AscendKernelMod { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/CMakeLists.txt b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/CMakeLists.txt rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/CMakeLists.txt diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_op_proto/aicpu_tensor.proto b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_op_proto/aicpu_tensor.proto similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_op_proto/aicpu_tensor.proto rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_op_proto/aicpu_tensor.proto diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_async_event.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_async_event.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_async_event.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_async_event.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_async_event.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_async_event.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_async_event.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_async_event.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_context.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_context.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_context.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_context.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_context.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_context.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_context.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_context.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_pulse.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_pulse.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_pulse.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_pulse.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_pulse.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_pulse.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_pulse.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_pulse.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/cmake/dependency_securec_arm.cmake b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/cmake/dependency_securec_arm.cmake similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/cmake/dependency_securec_arm.cmake rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/cmake/dependency_securec_arm.cmake diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/cmake/protobuf_arm.cmake b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/cmake/protobuf_arm.cmake similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/cmake/protobuf_arm.cmake rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/cmake/protobuf_arm.cmake diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/distinct_uniform_int_distribution.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/distinct_uniform_int_distribution.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/distinct_uniform_int_distribution.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/distinct_uniform_int_distribution.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_base.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_base.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_base.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_base.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_base.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_base.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_errcode.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_errcode.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_errcode.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_errcode.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_log.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_log.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_log.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_log.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_log.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_log.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_log.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_log.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_util.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_util.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_util.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_util.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/tensor.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/tensor.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/tensor.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/tensor.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/aicpu_environ.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/aicpu_environ.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/aicpu_environ.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/aicpu_environ.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/aicpu_environ_manager.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/aicpu_environ_manager.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/aicpu_environ_manager.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/aicpu_environ_manager.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/aicpu_environ_manager.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/aicpu_environ_manager.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/aicpu_environ_manager.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/aicpu_environ_manager.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_create.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_create.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_create.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_create.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_create.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_create.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_create.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_create.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_destroy_all.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_destroy_all.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_destroy_all.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_destroy_all.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_destroy_all.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_destroy_all.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_destroy_all.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_destroy_all.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_get.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_get.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_get.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_get.cc index 748d621d8a..f5acbaa3d8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_get.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_get.cc @@ -20,8 +20,8 @@ #include #include #include -#include "mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.h" -#include "mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/tensor.h" +#include "mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.h" +#include "mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/tensor.h" #include "environ/aicpu_environ_manager.h" namespace aicpu { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_get.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_get.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_get.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_get.h index 1d49065883..da0ad16b4b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_get.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_get.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_AICPU_AICPU_OPS_ENVIRON_ENVIRON_GET_H_ #include -#include "mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/kernel_base.h" +#include "mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/kernel_base.h" namespace aicpu { class EnvironGetKernel : public KernelBase { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_set.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_set.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_set.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_set.cc index e26bdcf343..8e4b4b652a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_set.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_set.cc @@ -17,8 +17,8 @@ #include "environ/environ_set.h" #include #include -#include "mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.h" -#include "mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/common/tensor.h" +#include "mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/aicpu_sharder/aicpu_sharder.h" +#include "mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/common/tensor.h" #include "environ/aicpu_environ_manager.h" namespace aicpu { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_set.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_set.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/environ/environ_set.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/environ/environ_set.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/random_choice_with_mask_kernels.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/random_choice_with_mask_kernels.cc similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/random_choice_with_mask_kernels.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/random_choice_with_mask_kernels.cc diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/random_choice_with_mask_kernels.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/random_choice_with_mask_kernels.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_ops/random_choice_with_mask_kernels.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_ops/random_choice_with_mask_kernels.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_util.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_util.cc index 4f52e119f1..5dfa45f00b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_util.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/aicpu/aicpu_util.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" #include "proto/types.pb.h" #include "runtime/mem.h" #include "utils/convert_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_util.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_util.h index ae63b3bdf9..d4e32921cb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_util.h @@ -23,7 +23,7 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { constexpr auto kLibAicpuKernelSoName = "libaicpu_kernels.so"; diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/dynamic_aicpu_kernel_mod.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/dynamic_aicpu_kernel_mod.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/dynamic_aicpu_kernel_mod.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/dynamic_aicpu_kernel_mod.cc index f215c5f734..900d06a60e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/dynamic_aicpu_kernel_mod.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/dynamic_aicpu_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/aicpu/dynamic_aicpu_kernel_mod.h" +#include "plugin/device/ascend/kernel/aicpu/dynamic_aicpu_kernel_mod.h" #include #include @@ -23,12 +23,12 @@ #include "runtime/mem.h" #include "acl/acl_rt.h" #include "utils/convert_utils.h" -#include "backend/kernel_compiler/aicpu/aicpu_util.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" #include "utils/ms_context.h" #include "runtime/device/kernel_runtime.h" #include "runtime/kernel.h" #include "utils/utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/dynamic_aicpu_kernel_mod.h b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/dynamic_aicpu_kernel_mod.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/dynamic_aicpu_kernel_mod.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/dynamic_aicpu_kernel_mod.h index 8c941a5da6..dc9d81aa1d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/dynamic_aicpu_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/dynamic_aicpu_kernel_mod.h @@ -18,9 +18,9 @@ #include #include #include -#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h" -#include "backend/kernel_compiler/aicpu/aicpu_util.h" -#include "runtime/device/ascend/executor/aicpu_ext_info_handle.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_util.h" +#include "plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.h" namespace mindspore { namespace kernel { class DynamicAicpuOpKernelMod : public AicpuOpKernelMod { diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/attr.proto b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/attr.proto similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/attr.proto rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/attr.proto diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/node_def.proto b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/node_def.proto similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/node_def.proto rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/node_def.proto diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/tensor.proto b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/tensor.proto similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/tensor.proto rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/tensor.proto diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/tensor_shape.proto b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/tensor_shape.proto similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/tensor_shape.proto rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/tensor_shape.proto diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/types.proto b/mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/types.proto similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/types.proto rename to mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/types.proto diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_build.cc similarity index 86% rename from mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_build.cc index 52338a035a..321bf8958c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_build.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h" +#include "plugin/device/ascend/kernel/akg/akg_ascend_kernel_build.h" #include #include "ir/dtype.h" #include "ir/func_graph.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/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" +#include "plugin/device/ascend/kernel/akg/akg_ascend_kernel_mod.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h b/mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_build.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_build.h index 196c0311d8..25bb41032b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_build.h @@ -22,7 +22,7 @@ #include #include #include "ir/anf.h" -#include "backend/kernel_compiler/akg/akg_kernel_build.h" +#include "kernel/akg/akg_kernel_build.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_mod.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_mod.cc index be038b9989..f88946f001 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h" +#include "plugin/device/ascend/kernel/akg/akg_ascend_kernel_mod.h" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h b/mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_mod.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_mod.h index 9c90e78b2a..77d1ec13fe 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/akg/akg_ascend_kernel_mod.h @@ -19,8 +19,8 @@ #include #include #include -#include "backend/kernel_compiler/ascend_kernel_mod.h" -#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "kernel/ascend_kernel_mod.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel.cc index 73d109b03f..e12e3f4477 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "utils/ms_context.h" #include "runtime/device/kernel_runtime.h" -#include "runtime/device/ascend/executor/hccl_dynamic_kernel.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/hal/device/executor/hccl_dynamic_kernel.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" using HcclTaskInfoPtr = std::shared_ptr; using mindspore::ge::model_runner::HcclTaskInfo; diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel.h index 6d772c39db..ee05bbe2b3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel.h @@ -23,8 +23,8 @@ #include #include #include -#include "backend/kernel_compiler/ascend_kernel_mod.h" -#include "backend/kernel_compiler/hccl/hcom_util.h" +#include "kernel/ascend_kernel_mod.h" +#include "plugin/device/ascend/kernel/hccl/hcom_util.h" #include "hccl/hcom.h" #include "hccl/hccl_types.h" #include "utils/ms_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_build.cc similarity index 87% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_build.cc index 5339dde6e7..26578211f2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_build.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hccl_kernel_build.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel_build.h" #include #include -#include "backend/kernel_compiler/hccl/hccl_kernel.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_build.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_build.h index 8d8436af86..c3951baa02 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_build.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_build.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_metadata.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_metadata.cc index 612baef56c..dbe8da9587 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_metadata.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hccl_kernel_metadata.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel_metadata.h" #include #include #include #include "utils/ms_device_shape_transfer.h" #include "utils/utils.h" -#include "backend/kernel_compiler/hccl/hcom_util.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/hccl/hcom_util.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/parallel/context.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_metadata.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_metadata.h index 1ff5ecf769..c3c74fd2f4 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel_metadata.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hccl_kernel_metadata.h @@ -18,7 +18,7 @@ #include #include #include -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_broadcast.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_broadcast.cc index b3ff897076..4ec24491eb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_broadcast.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hcom_all_broadcast.h" +#include "plugin/device/ascend/kernel/hccl/hcom_all_broadcast.h" #include "utils/ms_context.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_broadcast.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_broadcast.h index d6489642d6..bb8fa5c39e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_broadcast.h @@ -20,7 +20,7 @@ #include #include #include "hccl/hcom.h" -#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_gather.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_gather.cc index 3f6058140f..72e998ba07 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_gather.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hcom_all_gather.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/kernel/hccl/hcom_all_gather.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_gather.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_gather.h index c729de94e6..0592c89f14 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_gather.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce.cc index 0a3798b78b..ab1ef47066 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hcom_all_reduce.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/kernel/hccl/hcom_all_reduce.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce.h index 99ea18f700..425d6c85f8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce_scatter.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce_scatter.cc index a6d73065fd..b9e62e88dd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce_scatter.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hcom_all_reduce_scatter.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/kernel/hccl/hcom_all_reduce_scatter.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce_scatter.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce_scatter.h index fcddfa34e8..0165d26517 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_reduce_scatter.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_to_all.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_to_all.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_to_all.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_to_all.cc index ecce751a06..1ea867b5e3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_to_all.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_to_all.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hcom_all_to_all.h" -#include "runtime/hccl_adapter/hccl_adapter.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/hccl/hcom_all_to_all.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore::kernel { HcomAllToAllKernel::HcomAllToAllKernel() {} diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_to_all.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_to_all.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_to_all.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_to_all.h index 1e80aed42c..ac6d661568 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_to_all.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_all_to_all.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel.h" namespace mindspore::kernel { class HcomAllToAllKernel : public HcclKernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_receive.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_receive.cc similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_receive.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_receive.cc index 392342244a..679900bb03 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_receive.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_receive.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hcom_receive.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/kernel/hccl/hcom_receive.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_receive.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_receive.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_receive.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_receive.h index e514e60e7c..62d53ac2de 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_receive.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_receive.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_send.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_send.cc similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_send.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_send.cc index 5b8b582e8b..a07efa63b2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_send.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_send.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hcom_send.h" -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/kernel/hccl/hcom_send.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_send.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_send.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_send.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_send.h index f10aa7f763..ed13ba110a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_send.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_send.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/hccl/hccl_kernel.h" +#include "plugin/device/ascend/kernel/hccl/hccl_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_util.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_util.cc index c99699665d..7c90bf55e4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_util.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/hccl/hcom_util.h" +#include "plugin/device/ascend/kernel/hccl/hcom_util.h" #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_context.h" #include "utils/utils.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.h b/mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_util.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_util.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/hccl/hcom_util.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_broadcast_gradient_args_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_broadcast_gradient_args_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/host/dynamic_broadcast_gradient_args_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_broadcast_gradient_args_kernel.cc index 5cec79df3f..86f9883287 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_broadcast_gradient_args_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_broadcast_gradient_args_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/host/dynamic_broadcast_gradient_args_kernel.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "runtime/device/ascend/ascend_kernel_runtime.h" +#include "plugin/device/ascend/kernel/host/dynamic_broadcast_gradient_args_kernel.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ascend_kernel_runtime.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_broadcast_gradient_args_kernel.h b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_broadcast_gradient_args_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/host/dynamic_broadcast_gradient_args_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_broadcast_gradient_args_kernel.h index aa6b5eaad2..8f1f3b81d2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_broadcast_gradient_args_kernel.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_broadcast_gradient_args_kernel.h @@ -18,8 +18,8 @@ #include #include #include -#include "runtime/device/ascend/executor/host_dynamic_kernel.h" -#include "backend/kernel_compiler/host/host_kernel_mod.h" +#include "plugin/device/ascend/hal/device/executor/host_dynamic_kernel.h" +#include "plugin/device/ascend/kernel/host/host_kernel_mod.h" using HostDynamicKernel = mindspore::device::ascend::HostDynamicKernel; namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_reshape_kernel.h b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_reshape_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/host/dynamic_reshape_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_reshape_kernel.h index 53fcfa2b6c..398c1b2b3b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_reshape_kernel.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_reshape_kernel.h @@ -18,8 +18,8 @@ #include #include #include -#include "runtime/device/ascend/executor/host_dynamic_kernel.h" -#include "backend/kernel_compiler/host/host_kernel_mod.h" +#include "plugin/device/ascend/hal/device/executor/host_dynamic_kernel.h" +#include "plugin/device/ascend/kernel/host/host_kernel_mod.h" using HostDynamicKernel = mindspore::device::ascend::HostDynamicKernel; namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_shape_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_shape_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/host/dynamic_shape_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_shape_kernel.cc index 9ee10276b2..b0eb06143e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_shape_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_shape_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/host/dynamic_shape_kernel.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/host/dynamic_shape_kernel.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" -#include "runtime/device/ascend/ascend_kernel_runtime.h" +#include "plugin/device/ascend/hal/device/ascend_kernel_runtime.h" #include "runtime/mem.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_shape_kernel.h b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_shape_kernel.h similarity index 89% rename from mindspore/ccsrc/backend/kernel_compiler/host/dynamic_shape_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_shape_kernel.h index 53941f9a9c..8dcb0a0da5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/dynamic_shape_kernel.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/dynamic_shape_kernel.h @@ -18,9 +18,9 @@ #include #include #include -#include "runtime/device/ascend/executor/host_dynamic_kernel.h" -#include "backend/kernel_compiler/host/host_kernel_mod.h" -#include "backend/kernel_compiler/kernel.h" +#include "plugin/device/ascend/hal/device/executor/host_dynamic_kernel.h" +#include "plugin/device/ascend/kernel/host/host_kernel_mod.h" +#include "kernel/kernel.h" using HostDynamicKernel = mindspore::device::ascend::HostDynamicKernel; namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_build.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_build.cc similarity index 80% rename from mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_build.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_build.cc index 7cd9e43ddd..a4ec9a2c82 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_build.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_build.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/host/host_kernel_build.h" +#include "plugin/device/ascend/kernel/host/host_kernel_build.h" #include #include "runtime/device/kernel_runtime.h" -#include "backend/kernel_compiler/host/host_kernel_mod.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/ascend/kernel/host/host_kernel_mod.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_build.h b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_build.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_build.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_build.h index f330905de8..5471d56b39 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_build.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_build.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_HOST_HOST_KERNEL_BUILD_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_HOST_HOST_KERNEL_BUILD_H_ #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_metadata.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_metadata.cc similarity index 88% rename from mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_metadata.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_metadata.cc index 674c02991c..108fc35cfd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_metadata.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_metadata.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/host/host_kernel_metadata.h" +#include "plugin/device/ascend/kernel/host/host_kernel_metadata.h" #include #include -#include "backend/kernel_compiler/oplib/oplib.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/oplib/oplib.h" +#include "kernel/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_metadata.h b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_metadata.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_metadata.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_metadata.h index dc0deab5fc..2e4b3f7e5b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_metadata.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_metadata.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_mod.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_mod.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_mod.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_mod.cc index 9ac7dc2c7f..e601ee93ab 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_mod.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_mod.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/kernel_compiler/host/host_kernel_mod.h" +#include "plugin/device/ascend/kernel/host/host_kernel_mod.h" #include "runtime/mem.h" #include "utils/ms_context.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" #include "runtime/device/kernel_runtime.h" -#include "runtime/device/ascend/executor/host_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/host_dynamic_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_mod.h b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_mod.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_mod.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_mod.h index d0c19fccf8..fb534a71fd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/host_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/host_kernel_mod.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/ascend_kernel_mod.h" +#include "kernel/ascend_kernel_mod.h" namespace mindspore { namespace kernel { class HostKernelMod : public AscendKernelMod { diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/reshape_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/host/reshape_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/host/reshape_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/reshape_kernel.cc index 0cc9b8b056..1b88018278 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/reshape_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/reshape_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/host/reshape_kernel.h" +#include "plugin/device/ascend/kernel/host/reshape_kernel.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "abstract/utils.h" #include "runtime/device/kernel_runtime_manager.h" #include "utils/check_convert_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/host/reshape_kernel.h b/mindspore/ccsrc/plugin/device/ascend/kernel/host/reshape_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/host/reshape_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/host/reshape_kernel.h index f835599f31..596b73fced 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/host/reshape_kernel.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/host/reshape_kernel.h @@ -18,8 +18,8 @@ #include #include #include -#include "runtime/device/ascend/executor/host_dynamic_kernel.h" -#include "backend/kernel_compiler/host/host_kernel_mod.h" +#include "plugin/device/ascend/hal/device/executor/host_dynamic_kernel.h" +#include "plugin/device/ascend/kernel/host/host_kernel_mod.h" using HostDynamicKernel = mindspore::device::ascend::HostDynamicKernel; namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/assign.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/assign.cc index b7044f0728..a24f288871 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/assign.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/assign.h" +#include "plugin/device/ascend/kernel/rts/assign.h" #include #include "runtime/mem.h" #include "acl/acl_rt.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/assign.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/assign.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/rts/assign.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/assign.h index b60969c220..ecba454237 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/assign.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/assign.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_RTS_ASSIGN_H #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_goto.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_goto.cc index 2720bd0442..f316f2202d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_goto.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/label_goto.h" +#include "plugin/device/ascend/kernel/rts/label_goto.h" #include "runtime/stream.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" using mindspore::ge::model_runner::LabelGotoTaskInfo; using LabelGotoTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_goto.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_goto.h index a073555241..df023f96f2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_goto.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_set.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_set.cc index 5576a8124b..2827069461 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_set.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/label_set.h" +#include "plugin/device/ascend/kernel/rts/label_set.h" #include "runtime/stream.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" using mindspore::ge::model_runner::LabelSetTaskInfo; using LabelSetTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_set.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/rts/label_set.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_set.h index 721bc39cff..2f69b85842 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_set.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_switch.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_switch.cc index a682ea90b6..e8233c6397 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_switch.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/label_switch.h" +#include "plugin/device/ascend/kernel/rts/label_switch.h" #include #include "runtime/stream.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" using mindspore::ge::model_runner::LabelSwitchTaskInfo; using LabelSwitchTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_switch.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_switch.h index b573782f0c..b09e8fbba8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/label_switch.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/memcpy_async.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/memcpy_async.cc index 1f69c320d8..9d5f70dd45 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/memcpy_async.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/memcpy_async.h" +#include "plugin/device/ascend/kernel/rts/memcpy_async.h" #include #include #include "abstract/utils.h" #include "runtime/mem.h" #include "acl/acl_rt.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_device_shape_transfer.h" #include "utils/ms_context.h" #include "runtime/device/kernel_runtime.h" -#include "runtime/device/ascend/executor/rts/memcpy_rts_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/rts/memcpy_rts_dynamic_kernel.h" using mindspore::ge::model_runner::MemcpyAsyncTaskInfo; using MemcpyAsyncTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/memcpy_async.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/memcpy_async.h index 30a8b6be44..b7639e5123 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/memcpy_async.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/profiling_kernel_mod.cc similarity index 88% rename from mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/profiling_kernel_mod.cc index 54cbc4f15f..f00e679ad2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/profiling_kernel_mod.cc @@ -14,11 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/profiling_kernel_mod.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "runtime/device/ascend/profiling/profiling_utils.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "runtime/device/ascend/executor/rts/profiling_rts_dynamic_kernel.h" +#include "plugin/device/ascend/kernel/rts/profiling_kernel_mod.h" +#include +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/executor/rts/profiling_rts_dynamic_kernel.h" using ProfilerTraceTaskInfo = mindspore::ge::model_runner::ProfilerTraceTaskInfo; using mindspore::device::ascend::ProfilingRtsDynamicKernel; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/profiling_kernel_mod.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/profiling_kernel_mod.h index c69c6eaed8..b9c1d3f9a9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/profiling_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/profiling_kernel_mod.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_RTS_PROFILING_KERNEL_MOD_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_RTS_PROFILING_KERNEL_MOD_H_ #include -#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" namespace mindspore { namespace kernel { class ProfilingKernelMod : public RtKernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/recv.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/recv.cc index 8265a5933e..31105fb3dc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/recv.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/recv.h" +#include "plugin/device/ascend/kernel/rts/recv.h" #include "runtime/stream.h" #include "utils/ms_context.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/recv.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/recv.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/rts/recv.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/recv.h index 1ffe6ad83f..38f74105e4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/recv.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/recv.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel.cc index 39723252b8..5b725b0900 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel.h index 2a0c611501..3f00f7ac03 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/kernel_compiler/ascend_kernel_mod.h" -#include "backend/kernel_compiler/task_stream.h" +#include "kernel/ascend_kernel_mod.h" +#include "kernel/task_stream.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_build.cc similarity index 87% rename from mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_build.cc index bf181c487e..1ca43c398b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_build.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/rt_kernel_build.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_build.h" #include #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_build.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_build.h index 66c11b0a34..e52b12115b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_build.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_build.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { KernelModPtr RtOpBuild(const AnfNodePtr &anf_node); diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_info.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_info.cc index 91a5f1d107..4612beb8fb 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_info.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" #include #include #include "utils/convert_utils.h" #include "utils/utils.h" #include "utils/ms_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_info.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_info.h index 28489bbdc0..db9fdf6e3e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_info.h @@ -26,8 +26,8 @@ #include #include "ir/dtype.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel_build_info.h" +#include "kernel/kernel.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/send.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/rts/send.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/send.cc index 421c8b0c39..336d4400e2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/send.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/send.h" +#include "plugin/device/ascend/kernel/rts/send.h" #include "runtime/event.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" using mindspore::ge::model_runner::EventRecordTaskInfo; using EventRecordTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/send.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/send.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/rts/send.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/send.h index ff110cc6d3..0998c3dc9b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/send.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/send.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_RTS_SEND_H #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_active.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_active.cc index 872f2bd50a..9d67a163b3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_active.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/stream_active.h" +#include "plugin/device/ascend/kernel/rts/stream_active.h" #include "runtime/stream.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" using mindspore::ge::model_runner::StreamActiveTaskInfo; using StreamActiveTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_active.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_active.h index 7164b7d9fc..b4f42b3837 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_active.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_RTS_STREAM_ACTIVE_H #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_switch.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_switch.cc index 47a872e8ff..accaf4bcf8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_switch.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/stream_switch.h" +#include "plugin/device/ascend/kernel/rts/stream_switch.h" #include #include #include "runtime/stream.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" using mindspore::ge::model_runner::StreamSwitchTaskInfo; using StreamSwitchTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_switch.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_switch.h index 78e9f80e4d..6483a125d8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/stream_switch.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/tensor_copy_slices.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/tensor_copy_slices.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/rts/tensor_copy_slices.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/tensor_copy_slices.cc index 48888dc398..72381d5048 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/tensor_copy_slices.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/tensor_copy_slices.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/kernel_compiler/rts/tensor_copy_slices.h" +#include "plugin/device/ascend/kernel/rts/tensor_copy_slices.h" #include #include #include #include #include "abstract/utils.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" #include "runtime/mem.h" #include "acl/acl_rt.h" #include "runtime/device/kernel_runtime.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/tensor_copy_slices.h b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/tensor_copy_slices.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/rts/tensor_copy_slices.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/rts/tensor_copy_slices.h index 96fd3f06ba..2a6da3b0bb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/tensor_copy_slices.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/rts/tensor_copy_slices.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/rts/rt_kernel.h" -#include "backend/kernel_compiler/rts/rt_kernel_info.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel.h" +#include "plugin/device/ascend/kernel/rts/rt_kernel_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/dynamic_tbe_kernel_mod.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/dynamic_tbe_kernel_mod.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/dynamic_tbe_kernel_mod.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/dynamic_tbe_kernel_mod.cc index 9f02b7b9c1..507b2205aa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/dynamic_tbe_kernel_mod.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/dynamic_tbe_kernel_mod.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/dynamic_tbe_kernel_mod.h" +#include "plugin/device/ascend/kernel/tbe/dynamic_tbe_kernel_mod.h" #include #include #include "acl/acl_rt.h" #include "utils/ms_context.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_runtime.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "framework/common/debug/log.h" #include "utils/log_adapter.h" #include "utils/convert_utils_base.h" @@ -30,7 +30,7 @@ #include "runtime/kernel.h" #include "runtime/mem.h" #include "pipeline/jit/static_analysis/static_analysis.h" -#include "runtime/device/ascend/executor/tiling/op_tiling_adapter.h" +#include "plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.h" #include "utils/ms_device_shape_transfer.h" #include "utils/utils.h" #include "register/op_tiling.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/dynamic_tbe_kernel_mod.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/dynamic_tbe_kernel_mod.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/dynamic_tbe_kernel_mod.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/dynamic_tbe_kernel_mod.h index 9a0090c542..b46d0f0864 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/dynamic_tbe_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/dynamic_tbe_kernel_mod.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" -#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_mod.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" #include "runtime/device/device_address.h" #include "ir/tensor.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_adapter.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_adapter.cc index 7d1243c392..9b45e347fb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_adapter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_adapter.h" +#include "plugin/device/ascend/kernel/tbe/tbe_adapter.h" #include #include @@ -24,11 +24,11 @@ #include #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/oplib/opinfo.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/oplib/opinfo.h" #include "frontend/parallel/ops_info/ops_utils.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.h" #include "utils/json_operation_utils.h" #include "utils/ms_context.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_adapter.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_adapter.h index b769e7612a..c20156dd31 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_adapter.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_adapter.h @@ -24,9 +24,9 @@ #include #include "nlohmann/json.hpp" #include "base/base.h" -#include "backend/kernel_compiler/oplib/opinfo.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/oplib/opinfo.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.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/backend/kernel_compiler/tbe/tbe_convert_utils.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_convert_utils.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_convert_utils.cc index 30f966b463..13aed53406 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_convert_utils.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_convert_utils.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_convert_utils.h index b9a137f288..e7a5e66ab3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_convert_utils.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_TBE_COMMON_UTILS_H_ #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #include "base/base.h" #include "ir/dtype/type.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.cc index 772d8d3cfc..18a49f2bae 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" #include #include #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h index 1f2e9479d5..8d5adc84a6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h @@ -23,7 +23,7 @@ #include #include "utils/ms_device_shape_transfer.h" #include "mindspore/core/ir/anf.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "kernel/oplib/oplib.h" namespace mindspore { namespace kernel { namespace tbe { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/fusion_tbe_json_creator.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/fusion_tbe_json_creator.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/fusion_tbe_json_creator.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/fusion_tbe_json_creator.cc index 859b2340dc..7ca8ac734f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/fusion_tbe_json_creator.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/fusion_tbe_json_creator.cc @@ -14,19 +14,19 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_json/fusion_tbe_json_creator.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/fusion_tbe_json_creator.h" #include #include #include #include "base/core_ops.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/tbe/tbe_adapter.h" -#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" -#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/tbe/tbe_adapter.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" #include "runtime/dev.h" #include "utils/json_operation_utils.h" -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.h" namespace mindspore::kernel { using mindspore::kernel::tbe::TbeAdapter; diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/fusion_tbe_json_creator.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/fusion_tbe_json_creator.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/fusion_tbe_json_creator.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/fusion_tbe_json_creator.h index 225da441f3..bd060de3ad 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/fusion_tbe_json_creator.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/fusion_tbe_json_creator.h @@ -17,7 +17,7 @@ #define MINDSPORE_FUSION_TBE_JSON_CREATOR_H #include #include -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.h" namespace mindspore::kernel { using ANodeFusionDataTypeMap = std::map; diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.cc index 1857158e38..ad002e6e7f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.cc @@ -14,19 +14,19 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.h" #include #include #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_convert_utils.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" -#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/tbe/tbe_adapter.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" #include "runtime/dev.h" #include "utils/ms_utils.h" #include "utils/json_operation_utils.h" -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.h" namespace mindspore::kernel { using mindspore::kernel::tbe::TbeAdapter; diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.h index aea3df6bd4..ff90c16aaa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_SINGLE_TBE_JSON_CREATOR_H #define MINDSPORE_SINGLE_TBE_JSON_CREATOR_H #include -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.h" namespace mindspore::kernel { class SingleTbeJsonCreator : public TbeJsonCreator { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.cc index b45e2cc7a0..d2faf1765b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.cc @@ -14,22 +14,22 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.h" #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/tbe/tbe_adapter.h" -#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_adapter.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" #include "utils/ms_context.h" #include "runtime/dev.h" #include "utils/ms_utils.h" #include "utils/json_operation_utils.h" #include "utils/convert_utils.h" -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.h" namespace mindspore::kernel { namespace { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.h index 2472751e79..959e7de156 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.h @@ -24,10 +24,10 @@ #include #include #include "ir/dtype.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/kernel_compiler/oplib/oplib.h" -#include "backend/kernel_compiler/tbe/tbe_adapter.h" +#include "kernel/kernel.h" +#include "kernel/kernel_fusion.h" +#include "kernel/oplib/oplib.h" +#include "plugin/device/ascend/kernel/tbe/tbe_adapter.h" namespace mindspore::kernel { enum ATTR_DTYPE { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.cc index 458c9251f9..1a6dd8c792 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.h" #include "base/core_ops.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" #include "runtime/dev.h" #include "utils/json_operation_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.h index 10662135ed..ff61d95eb6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.h @@ -23,9 +23,9 @@ #include #include #include "base/core_ops.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" #include "runtime/dev.h" #include "utils/ms_utils.h" namespace mindspore::kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_build.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_build.cc index bb2e23858f..a01d1dd0bf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_build.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_kernel_build.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_build.h" #include #include #include "base/core_ops.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" #include "utils/ms_context.h" #include "runtime/dev.h" #include "utils/convert_utils_base.h" #include "utils/ms_utils.h" -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_utils.h" namespace mindspore { namespace kernel { void GetRealInputSize(const nlohmann::json &input_json, std::vector *input_size_list, size_t *size_i) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_build.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_build.h index bbbb0b8f4a..6027d12989 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_build.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_build.h @@ -25,9 +25,9 @@ #include #include #include "ir/dtype.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/oplib/oplib.h" -#include "backend/kernel_compiler/tbe/tbe_adapter.h" +#include "kernel/kernel.h" +#include "kernel/oplib/oplib.h" +#include "plugin/device/ascend/kernel/tbe/tbe_adapter.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_compile.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_compile.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_compile.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_compile.cc index e22bba78db..a65c9d6aac 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_compile.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_compile.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_kernel_compile.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h" #include #include #include @@ -24,15 +24,15 @@ #include #include #include -#include "backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.h" -#include "backend/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.h" -#include "backend/kernel_compiler/tbe/tbe_json/fusion_tbe_json_creator.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/tbe/tbe_utils.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" -#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_build_client.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/fusion_tbe_json_creator.h" +#include "kernel/common_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_mod.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_build_client.h" #include "common/util/error_manager/error_manager.h" #include "debug/anf_ir_dump.h" #include "frontend/operator/ops.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_compile.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_compile.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h index 28b348dabc..5f3bd4edfb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_compile.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h @@ -24,10 +24,10 @@ #include #include #include "ir/anf.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_build.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "kernel/kernel_fusion.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_build.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_mod.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_mod.cc index 5136848ac2..46d8346079 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_mod.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_mod.h" #include #include "runtime/rt.h" #include "utils/ms_context.h" -#include "runtime/device/ascend/ge_runtime/task_info.h" -#include "runtime/device/ascend/executor/ai_core_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task_info.h" +#include "plugin/device/ascend/hal/device/executor/ai_core_dynamic_kernel.h" #include "runtime/device/kernel_runtime.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_mod.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_mod.h index f150f245f1..7a5d735b48 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_mod.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/ascend_kernel_mod.h" -#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "kernel/ascend_kernel_mod.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.cc index 0dba99c58c..b5088d1058 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h" #include #include #include "base/base.h" #include "utils/ms_device_shape_transfer.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h index e3ba23d040..1c096d801f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_TBE_KERNEL_SELECT_COMMON_UTILS_H_ #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc index 1ffd341e72..e2b9c95feb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h" #include "utils/utils.h" #include "utils/trace_base.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h index 6dae9e1a93..aa99888e6f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h @@ -21,7 +21,7 @@ #include #include #include "ir/anf.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc index 57841bcb1c..d19f333161 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h" #include #include #include "utils/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" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h index c16e5c67f2..185689d63f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h @@ -20,7 +20,7 @@ #include #include #include "ir/anf.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h" namespace mindspore { namespace kernel { class TbeKernelReduceSelecter { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.cc index 8a052e6c27..853549c686 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.cc @@ -14,25 +14,25 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.h" #include #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/oplib/oplib.h" -#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_build.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_compile.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_select/common_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/tbe_property_checker.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_build_client.h" +#include "kernel/common_utils.h" +#include "kernel/oplib/oplib.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_build.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_broadcast_selecter.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_reduce_selecter.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_property_checker.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_build_client.h" #include "nlohmann/json.hpp" #include "utils/convert_utils_base.h" #include "utils/json_operation_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.h index 9b12360d67..620882ce54 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.h @@ -20,9 +20,9 @@ #include #include #include -#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" +#include "kernel/oplib/opinfo.h" +#include "kernel/kernel_build_info.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_property_checker.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_property_checker.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_property_checker.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_property_checker.cc index 60ef76b9bb..e83add597b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_property_checker.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_property_checker.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_property_checker.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_property_checker.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/parallel/ops_info/ops_utils.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_property_checker.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_property_checker.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_property_checker.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_property_checker.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_utils.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_utils.cc index 7b19bdcfb4..eb2bb3e4e8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_utils.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" #include #include @@ -31,15 +31,15 @@ #include "utils/ms_context.h" #include "ir/dtype/type.h" #include "runtime/dev.h" -#include "runtime/device/ascend/lic_manager.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/tbe/tbe_convert_utils.h" -#include "mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/tbe_json_creator.h" -#include "mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.h" +#include "plugin/device/ascend/hal/device/lic_manager.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/tbe/tbe_convert_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/tbe_json_creator.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.h" #include "securec/include/securec.h" #include "utils/json_operation_utils.h" #include "mindspore/ccsrc/debug/common.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.h b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_utils.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.h rename to mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_utils.h index 7430b2ca11..2c494f69ce 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.h +++ b/mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_utils.h @@ -26,9 +26,9 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "ir/anf.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/plugin/device/ascend/optimizer/CMakeLists.txt b/mindspore/ccsrc/plugin/device/ascend/optimizer/CMakeLists.txt new file mode 100644 index 0000000000..ce16efa0ff --- /dev/null +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/CMakeLists.txt @@ -0,0 +1,21 @@ +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +if(ENABLE_D OR ENABLE_ACL) + file(GLOB_RECURSE _PREACTIVATE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "*.cc" + ) +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -Wno-user-defined-warnings -Wno-inconsistent-missing-override \ + -Wno-overloaded-virtual -Wno-unused-const-variable -Wno-pessimizing-move") +endif() + +set_property(SOURCE ${_PREACTIVATE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT) +if(ENABLE_D OR ENABLE_ACL) + add_library(_mindspore_plugin_device_ascend_optimizer_obj OBJECT ${_PREACTIVATE_SRC_LIST}) +endif() diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_backend_optimization.cc similarity index 72% rename from mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_backend_optimization.cc index b529a595d7..4f177582be 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_backend_optimization.cc @@ -13,152 +13,152 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ascend_backend_optimization.h" +#include "plugin/device/ascend/optimizer/ascend_backend_optimization.h" #include #include #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fission/dynamic_rnn_grad_fission_v2.h" -#include "backend/optimizer/ascend/ir_fission/dynamic_gru_v2_grad_fission.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_fission/tensor_scatter_update_fission.h" -#include "backend/optimizer/ascend/ir_fission/reduce_min_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/ascend/ir_fission/unsorted_segment_sum_fission.h" -#include "backend/optimizer/ascend/ir_fission/gather_v2_ds_fission.h" -#include "backend/optimizer/ascend/ir_fission/bce_with_logits_loss_fission.h" -#include "backend/optimizer/ascend/ir_fission/broadcastto_fission.h" -#include "backend/optimizer/ascend/ir_fission/reduce_sum_fission.h" -#include "backend/optimizer/ascend/ir_fission/cdist_fission.h" -#include "backend/optimizer/ascend/ir_fission/seed_adapter.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/prelu_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_fission/lin_space_fission.h" -#include "backend/optimizer/ascend/ir_fission/space_to_depth_split.h" -#include "backend/optimizer/ascend/ir_fission/diag_fission.h" -#include "backend/optimizer/ascend/ir_fission/diag_part_fission.h" -#include "backend/optimizer/ascend/ir_fission/max_pool3d_grad_grad_fission.h" -#include "backend/optimizer/ascend/ir_fusion/avgpool_3d_fusion.h" -#include "backend/optimizer/ascend/ir_fusion/avgpool_3d_grad_fusion.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/conv2d_backprop_input_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/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h" -#include "backend/optimizer/ascend/ir_fusion/transposed_update_fusion.h" -#include "backend/optimizer/ascend/ir_fusion/softmax_dropout_do_mask_v3_fusion.h" -#include "backend/optimizer/ascend/format_type/insert_trans_op.h" -#include "backend/optimizer/ascend/format_type/trans_op_format_refine.h" -#include "backend/optimizer/ascend/format_type/dynamic_rnn_grad_reformat.h" -#include "backend/optimizer/ascend/format_type/insert_transpose_for_basiclstm_op.h" -#include "backend/optimizer/ascend/format_type/insert_transpose_for_dyanmic_gru_v2.h" -#include "backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h" -#include "backend/optimizer/ascend/format_type/change_axis_of_reduce_kernel.h" -#include "backend/optimizer/ascend/format_type/convert_cast_format.h" -#include "backend/optimizer/ascend/format_type/set_fracz_group_attr.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/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/matmul_confusiontranspose_fusion_pass.h" -#include "backend/optimizer/ascend/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h" -#include "backend/optimizer/ascend/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h" -#include "backend/optimizer/ascend/buffer_fusion/batchmatmul_dropoutdomaskv3_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_and_split_unsupported_transdata.h" -#include "backend/optimizer/ascend/enhancer/insert_tensor_move_for_hccl_op.h" -#include "backend/optimizer/ascend/enhancer/insert_tensor_move_for_cascade.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_tensor_move_elimination.h" -#include "backend/optimizer/ascend/ir_fission/addn_fission.h" -#include "backend/optimizer/ascend/enhancer/insert_tensor_move_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/ir_fission/splitv_fission.h" -#include "backend/optimizer/ascend/ir_fusion/add_input_to_output.h" -#include "backend/optimizer/ascend/format_type/remove_internal_output.h" -#include "backend/optimizer/ascend/ir_fission/concat_fission.h" -#include "backend/optimizer/ascend/ir_fission/pack_fission.h" -#include "backend/optimizer/ascend/enhancer/concat_outputs_for_all_gather.h" -#include "backend/optimizer/ascend/enhancer/insert_depend_for_all_gather.h" -#include "backend/optimizer/ascend/enhancer/split_inputs_for_reduce_scatter.h" -#include "backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_rnn.h" -#include "backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_gru.h" -#include "backend/optimizer/ascend/enhancer/add_attr_for_3d_graph.h" -#include "backend/optimizer/ascend/enhancer/split_n_optimizer.h" -#include "backend/optimizer/ascend/mindir/space_batch_nd_attr_update.h" -#include "backend/optimizer/ascend/mindir/env_op_attr_update.h" -#include "backend/optimizer/ascend/mindir/dropout_unify_mindir.h" -#include "backend/optimizer/ascend/mindir/maxpool_to_maxpool_with_argmax.h" -#include "backend/optimizer/ascend/mindir/maxpool_with_argmax_unify_mindir.h" -#include "backend/optimizer/ascend/mindir/conv2d_unify_mindir.h" -#include "backend/optimizer/ascend/mindir/optimizer_unify_output.h" -#include "backend/optimizer/ascend/mindir/fake_learned_scale_quant_grad_unify_mindir.h" -#include "backend/optimizer/ascend/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h" -#include "backend/optimizer/ascend/mindir/slice_grad_unify_mindir.h" -#include "backend/optimizer/ascend/mindir/update_input_names_strided_slice_grad.h" -#include "backend/optimizer/ascend/mindir/avg_pool_grad_unify_mindir.h" -#include "backend/optimizer/ascend/mindir/bn_grad_unify_mindir.h" -#include "backend/optimizer/ascend/mindir/all_to_all_unify_mindir.h" -#include "backend/optimizer/ascend/mindir/neighbor_exchange_v2_unify_mindir.h" -#include "backend/optimizer/ascend/dynamic_shape/convert_dynamic_op.h" -#include "backend/optimizer/ascend/dynamic_shape/convert_general_op.h" -#include "backend/optimizer/ascend/dynamic_shape/convert_inherited_dynamic_op.h" -#include "backend/optimizer/ascend/dynamic_shape/link_custom_op.h" -#include "backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_compile.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ir_fission/dynamic_rnn_grad_fission_v2.h" +#include "plugin/device/ascend/optimizer/ir_fission/dynamic_gru_v2_grad_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/bn_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/bn_grad_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/batch_norm_bert_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/single_batch_norm_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/tensor_scatter_update_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/reduce_min_fission.h" +#include "plugin/device/ascend/optimizer/ir_fusion/fused_batch_norm_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fission/layer_norm_grad_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/unsorted_segment_sum_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/gather_v2_ds_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/bce_with_logits_loss_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/broadcastto_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/reduce_sum_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/cdist_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/seed_adapter.h" +#include "backend/common/pass/communication_op_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/square_sum_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_rule_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/prelu_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/clip_by_value_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/confusion_softmax_grad_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_next_right_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_v2.h" +#include "plugin/device/ascend/optimizer/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/reshape_transpose_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/transpose_reshape_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_with_decay_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/parameter_and_transop_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/refresh_parameter_format.h" +#include "plugin/device/ascend/optimizer/ir_fusion/transpose_transdata_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fission/transdata_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/topk_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/lin_space_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/space_to_depth_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/diag_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/diag_part_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/max_pool3d_grad_grad_fission.h" +#include "plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_grad_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/momentum_lossscale_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/mul_add_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/mul_addn_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/matmul_biasadd_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/conv2d_backprop_input_biasadd_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/remove_reshape_pair.h" +#include "plugin/device/ascend/optimizer/ir_fusion/derelu_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/batchnorm_to_bninfer.h" +#include "plugin/device/ascend/optimizer/ir_fusion/batchnormgrad_to_bninfergrad.h" +#include "plugin/device/ascend/optimizer/ir_fusion/confusion_mul_grad_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/softmax_grad_ext_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/transposed_update_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/softmax_dropout_do_mask_v3_fusion.h" +#include "plugin/device/ascend/optimizer/format_type/insert_trans_op.h" +#include "plugin/device/ascend/optimizer/format_type/trans_op_format_refine.h" +#include "plugin/device/ascend/optimizer/format_type/dynamic_rnn_grad_reformat.h" +#include "plugin/device/ascend/optimizer/format_type/insert_transpose_for_basiclstm_op.h" +#include "plugin/device/ascend/optimizer/format_type/insert_transpose_for_dyanmic_gru_v2.h" +#include "plugin/device/ascend/optimizer/format_type/rectify_do_mask_kernel_info.h" +#include "plugin/device/ascend/optimizer/format_type/change_axis_of_reduce_kernel.h" +#include "plugin/device/ascend/optimizer/format_type/convert_cast_format.h" +#include "plugin/device/ascend/optimizer/format_type/set_fracz_group_attr.h" +#include "backend/common/pass/getitem_tuple.h" +#include "backend/common/pass/optimize_dependence.h" +#include "backend/common/pass/erase_visit_attr.h" +#include "plugin/device/ascend/optimizer/format_type/insert_cast.h" +#include "plugin/device/ascend/optimizer/format_type/convert_unsupported_transnode_to_aicpu.h" +#include "backend/common/pass/eliminate_redundant_op.h" +#include "backend/common/pass/common_subexpression_elimination.h" +#include "plugin/device/ascend/optimizer/format_type/merge_cast_to_op.h" +#include "plugin/device/ascend/optimizer/format_type/check_consistency.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/multi_output_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv_single_in_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv_double_in_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/matmul_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/matmul_confusiontranspose_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv_bnreduce_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/reduce_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/segment_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/format_type/deal_ref_and_split_unsupported_transdata.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_hccl_op.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_cascade.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_pad_for_nms_with_mask.h" +#include "plugin/device/ascend/optimizer/format_type/insert_transdata_for_runop.h" +#include "plugin/device/ascend/optimizer/enhancer/getnext_tensor_move_elimination.h" +#include "plugin/device/ascend/optimizer/ir_fission/addn_fission.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_getnext.h" +#include "plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_infer_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/split_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/splitv_fission.h" +#include "plugin/device/ascend/optimizer/ir_fusion/add_input_to_output.h" +#include "plugin/device/ascend/optimizer/format_type/remove_internal_output.h" +#include "plugin/device/ascend/optimizer/ir_fission/concat_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/pack_fission.h" +#include "plugin/device/ascend/optimizer/enhancer/concat_outputs_for_all_gather.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_depend_for_all_gather.h" +#include "plugin/device/ascend/optimizer/enhancer/split_inputs_for_reduce_scatter.h" +#include "plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_rnn.h" +#include "plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_gru.h" +#include "plugin/device/ascend/optimizer/enhancer/add_attr_for_3d_graph.h" +#include "plugin/device/ascend/optimizer/enhancer/split_n_optimizer.h" +#include "plugin/device/ascend/optimizer/mindir/space_batch_nd_attr_update.h" +#include "plugin/device/ascend/optimizer/mindir/env_op_attr_update.h" +#include "plugin/device/ascend/optimizer/mindir/dropout_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/maxpool_to_maxpool_with_argmax.h" +#include "plugin/device/ascend/optimizer/mindir/maxpool_with_argmax_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/conv2d_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/optimizer_unify_output.h" +#include "plugin/device/ascend/optimizer/mindir/fake_learned_scale_quant_grad_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/slice_grad_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/update_input_names_strided_slice_grad.h" +#include "plugin/device/ascend/optimizer/mindir/avg_pool_grad_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/bn_grad_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/all_to_all_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/neighbor_exchange_v2_unify_mindir.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/convert_dynamic_op.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/convert_general_op.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/convert_inherited_dynamic_op.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/link_custom_op.h" +#include "backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h" #include "utils/ms_context.h" #include "utils/config_manager.h" #include "utils/context/graph_kernel_flags.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_backend_optimization.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_backend_optimization.h index b16d4774ff..d1a2e634ed 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_backend_optimization.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_ASCEND_BACKEND_OPTIMIZATION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_ASCEND_BACKEND_OPTIMIZATION_H_ #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { void RunOpAscendDataLayout(const std::shared_ptr &kernel_graph); diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_helper.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_helper.cc index 48a01bb46d..c248ccbd86 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_helper.cc @@ -14,19 +14,19 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ascend_helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" #include #include "utils/ms_device_shape_transfer.h" #include "utils/ms_utils.h" #include "utils/check_convert_utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "utils/utils.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/oplib/oplib.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/oplib/oplib.h" +#include "kernel/common_utils.h" #include "base/core_ops.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" #include "utils/ms_context.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_helper.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_helper.h index 5589058045..504c745f61 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_helper.h @@ -20,12 +20,12 @@ #include #include #include -#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" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h" +#include "plugin/device/ascend/hal/device/kernel_select_ascend.h" +#include "kernel/kernel_query.h" +#include "kernel/oplib/oplib.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_select/tbe_kernel_select.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ascend_pass_control.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_pass_control.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ascend_pass_control.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_pass_control.cc index f0033c740d..09bd532486 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ascend_pass_control.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_pass_control.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" #include "mindspore/core/utils/ms_utils.h" namespace mindspore::opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ascend_pass_control.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_pass_control.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ascend_pass_control.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_pass_control.h index 9229830381..3c007e25f6 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ascend_pass_control.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ascend_pass_control.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "runtime/device/ascend/lic_manager.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/hal/device/lic_manager.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.cc similarity index 89% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.cc index 4eaead51b6..ebb78eba4d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.h" +#include "kernel/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.h index f554de2c0e..cbd294cc86 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_dropoutdomaskv3_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_BATCHMATMUL_DROPOUTDOMASKV3_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.cc similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.cc index cd339684c9..fca0f5b541 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h index 8711f387b8..5c3442537f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/batchmatmul_fusedmuladd_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_BATCHMATMUL_FUSEDMULADD_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc index a7c6a2aad2..35b5ba6b1f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" #include "utils/hash_set.h" -#include "backend/kernel_compiler/kernel_fusion.h" +#include "kernel/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/fusion_id_allocator.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h index 3922458e4c..c3acbfc0be 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_BNUPDATE_ELTWISE_ELTWISE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_fusion_pass.cc similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_fusion_pass.cc index 95c3dfb509..741be809c8 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_fusion_pass.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_fusion_pass.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/fusion_id_allocator.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_fusion_pass.h index 66db002fcb..7d57a6a3e5 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_BNUPDATE_ELTWISE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc index d6187edffa..1e3e4a598e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h index 3e06416ff1..fdf958e6e7 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_CONV2DBACKPROP_ELTWISE_ELTWISE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc index 660f98af86..0adfea789a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h index a98042093d..bd8069bada 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_CONV2DBACKPROP_ELTWISE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_bnreduce_fusion_pass.cc similarity index 88% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_bnreduce_fusion_pass.cc index 71170a16df..c7eb808d52 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_bnreduce_fusion_pass.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv_bnreduce_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/fusion_id_allocator.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_bnreduce_fusion_pass.h similarity index 86% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_bnreduce_fusion_pass.h index f72f23fdbe..9b54ca89a7 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_bnreduce_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_CONV_BNREDUCE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_double_in_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_double_in_fusion_pass.cc index 21bdccbd27..ef2782ed6c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_double_in_fusion_pass.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv_double_in_fusion_pass.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_double_in_fusion_pass.h similarity index 86% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_double_in_fusion_pass.h index 52a2f79f4d..e06ad2cba8 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_double_in_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_CONV_DOUBLE_IN_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_single_in_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_single_in_fusion_pass.cc index 40a557e86a..a9c5e86614 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_single_in_fusion_pass.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv_single_in_fusion_pass.h" #include "utils/hash_set.h" -#include "backend/kernel_compiler/kernel_fusion.h" +#include "kernel/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_single_in_fusion_pass.h similarity index 86% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_single_in_fusion_pass.h index 24c1b2c45a..b562f8d72c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/conv_single_in_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_CONV_SINGLE_IN_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc index 6ff1427084..4b40eec319 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h similarity index 86% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h index 306abe30fc..4631efbb5e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_DEPTHWISECONV_ELTWISE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/eltwise_fusion_pass.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/eltwise_fusion_pass.cc index 2754d66d4b..4d8abc0bd2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/eltwise_fusion_pass.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/eltwise_fusion_pass.h" #include -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/eltwise_fusion_pass.h similarity index 86% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/eltwise_fusion_pass.h index 905c8dd1cb..9ed70d0cca 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/eltwise_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_ELTWISE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.cc index 6180ff1860..434e88be4d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/fusion_id_allocator.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h index 0fcbca485d..a09a5d1fcd 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h @@ -21,12 +21,12 @@ #include "utils/hash_map.h" #include "utils/hash_set.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc index d4691b3d54..5eea9a9579 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_confusiontranspose_fusion_pass.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/matmul_confusiontranspose_fusion_pass.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_confusiontranspose_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_confusiontranspose_fusion_pass.h index 42ca7d2feb..5909f75e02 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_confusiontranspose_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_confusiontranspose_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_MATMUL_CONFUSIONTRANSPOSE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.cc index ff2b4d318a..5e13e78974 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h" +#include "kernel/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h index 4e0297a5a4..cdb9daacf9 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_dropoutdomaskv3_add_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_MATMUL_DROPOUTDOMASKV3_ADD_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_eltwise_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_eltwise_fusion_pass.cc index 26b4741e22..b37624424e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_eltwise_fusion_pass.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/matmul_eltwise_fusion_pass.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_eltwise_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_eltwise_fusion_pass.h index 11109df6a8..de5afcf29d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/matmul_eltwise_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_MATMUL_ELTWISE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/multi_output_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/multi_output_fusion_pass.cc index 86ad401a04..b3cfbcdfa5 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/multi_output_fusion_pass.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/multi_output_fusion_pass.h" #include -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/multi_output_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/multi_output_fusion_pass.h index 318fa97e55..d6028190b0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/multi_output_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_PASS_MULTI_OUTPUT_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/reduce_eltwise_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/reduce_eltwise_fusion_pass.cc index f27269ade2..d81f778bc4 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/reduce_eltwise_fusion_pass.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/reduce_eltwise_fusion_pass.h" #include -#include "backend/kernel_compiler/kernel_fusion.h" +#include "kernel/kernel_fusion.h" #include "debug/anf_ir_dump.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/fusion_id_allocator.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/reduce_eltwise_fusion_pass.h similarity index 86% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/reduce_eltwise_fusion_pass.h index 50085ba799..5d5f008fd6 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/reduce_eltwise_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_REDUCE_ELTWISE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/segment_eltwise_fusion_pass.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/segment_eltwise_fusion_pass.cc index 17c0f2d3da..5bc9e9c45b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/segment_eltwise_fusion_pass.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/segment_eltwise_fusion_pass.h" #include -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/segment_eltwise_fusion_pass.h similarity index 86% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/segment_eltwise_fusion_pass.h index 6e5a1410c3..eb02aa9a73 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/segment_eltwise_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_SEGMENT_ELTWISE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc index 9276e594ac..669c6e9f94 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h" -#include "backend/kernel_compiler/kernel_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h" +#include "kernel/kernel_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/fusion_id_allocator.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h index 7a64626e24..70b2623600 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.h @@ -17,13 +17,13 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_BUFFER_FUSION_STRIDEDREAD_CONV_STRIDEDWRITE_FUSION_PASS_H_ #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.cc index 0b0a95728f..8eb8ab0d2f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.cc @@ -13,18 +13,20 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.h" #include #include #include #include #include +#include +#include #include "utils/hash_map.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_compile.h" -#include "backend/kernel_compiler/tbe/tbe_utils.h" +#include "kernel/common_utils.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h" +#include "plugin/device/ascend/kernel/tbe/tbe_utils.h" #include "debug/anf_ir_dump.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.h index c9fba56c83..21df591277 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.h @@ -20,13 +20,13 @@ #include #include "utils/hash_map.h" #include "utils/hash_set.h" -#include "backend/optimizer/ascend/buffer_fusion/fusion_base_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/fusion_base_pass.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/fusion_id_allocator.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/fusion_id_allocator.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.cc index c68ab87d7d..335c274a8b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "utils/anf_utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.h index 0d0731d18c..6dbf6ec085 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.h @@ -20,7 +20,7 @@ #include #include "ir/anf.h" #include "utils/ms_utils.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt::dynamic_shape { bool IsGeneralOp(const BaseRef &n); diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_dynamic_op.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_dynamic_op.cc similarity index 83% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_dynamic_op.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_dynamic_op.cc index d38f16138f..33113c5c47 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_dynamic_op.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_dynamic_op.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/dynamic_shape/convert_dynamic_op.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/convert_dynamic_op.h" #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.h" namespace mindspore { namespace opt::dynamic_shape { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_dynamic_op.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_dynamic_op.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_dynamic_op.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_dynamic_op.h index da0c03dd23..e89ca5d524 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_dynamic_op.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_dynamic_op.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_DYNAMIC_SHAPE_CONVERT_DYNAMIC_OP_H #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt::dynamic_shape { class ConvertDynamicOp : public PatternProcessPass { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_general_op.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_general_op.cc similarity index 83% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_general_op.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_general_op.cc index c61cd06f00..7039084761 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_general_op.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_general_op.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/dynamic_shape/convert_general_op.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/convert_general_op.h" #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.h" namespace mindspore { namespace opt::dynamic_shape { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_general_op.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_general_op.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_general_op.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_general_op.h index 2dd6a97088..392ed2be66 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_general_op.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_general_op.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_DYNAMIC_SHAPE_CONVERT_GENERAL_OP_H #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt::dynamic_shape { class ConvertGeneralOp : public PatternProcessPass { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_inherited_dynamic_op.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_inherited_dynamic_op.cc similarity index 84% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_inherited_dynamic_op.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_inherited_dynamic_op.cc index 3ac8367b3c..fd68061c14 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_inherited_dynamic_op.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_inherited_dynamic_op.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/dynamic_shape/convert_inherited_dynamic_op.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/convert_inherited_dynamic_op.h" #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.h" namespace mindspore { namespace opt::dynamic_shape { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_inherited_dynamic_op.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_inherited_dynamic_op.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_inherited_dynamic_op.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_inherited_dynamic_op.h index 7e0c7fdce6..5085d3ed78 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/convert_inherited_dynamic_op.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/convert_inherited_dynamic_op.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_DYNAMIC_SHAPE_CONVERT_INHERITED_DYNAMIC_OP_H #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt::dynamic_shape { class ConvertInheritedDynamicOp : public PatternProcessPass { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/link_custom_op.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/link_custom_op.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/link_custom_op.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/link_custom_op.cc index a6f863e90e..a95fad9ce7 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/link_custom_op.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/link_custom_op.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/dynamic_shape/link_custom_op.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/link_custom_op.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.h" namespace mindspore { namespace opt::dynamic_shape { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/link_custom_op.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/link_custom_op.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/link_custom_op.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/link_custom_op.h index 2eb9ae5d18..a87ef81916 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/dynamic_shape/link_custom_op.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/dynamic_shape/link_custom_op.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_DYNAMIC_SHAPE_LINK_CUSTOM_OP_H #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt::dynamic_shape { class LinkCustomOp : public Pass { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_attr_for_3d_graph.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_attr_for_3d_graph.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_attr_for_3d_graph.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_attr_for_3d_graph.cc index 9193748969..7d2198629f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_attr_for_3d_graph.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_attr_for_3d_graph.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/add_attr_for_3d_graph.h" +#include "plugin/device/ascend/optimizer/enhancer/add_attr_for_3d_graph.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_attr_for_3d_graph.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_attr_for_3d_graph.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_attr_for_3d_graph.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_attr_for_3d_graph.h index 2f847da7f3..7e0d4e47e0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_attr_for_3d_graph.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_attr_for_3d_graph.h @@ -21,8 +21,8 @@ #include #include #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_gru.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_gru.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_gru.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_gru.cc index 7052b56d1f..dfad263651 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_gru.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_gru.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_gru.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_gru.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "abstract/abstract_value.h" #include "base/core_ops.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_gru.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_gru.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_gru.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_gru.h index b0d28853ba..ab659cd167 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_gru.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_gru.h @@ -19,8 +19,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_rnn.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_rnn.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_rnn.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_rnn.cc index f656aec3ab..a3a715a50d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_rnn.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_rnn.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_rnn.h" +#include "plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_rnn.h" #include #include -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "abstract/abstract_value.h" #include "base/core_ops.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_rnn.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_rnn.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_rnn.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_rnn.h index 8fbb35d96f..a0ac119d3d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/add_placeholder_for_dynamic_rnn.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/add_placeholder_for_dynamic_rnn.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/concat_outputs_for_all_gather.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/concat_outputs_for_all_gather.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/concat_outputs_for_all_gather.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/concat_outputs_for_all_gather.cc index dff24b2b66..c1144de5f9 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/concat_outputs_for_all_gather.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/concat_outputs_for_all_gather.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/concat_outputs_for_all_gather.h" +#include "plugin/device/ascend/optimizer/enhancer/concat_outputs_for_all_gather.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore::opt { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/concat_outputs_for_all_gather.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/concat_outputs_for_all_gather.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/concat_outputs_for_all_gather.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/concat_outputs_for_all_gather.h index c3f97a2bf9..f3dcdb3dd3 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/concat_outputs_for_all_gather.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/concat_outputs_for_all_gather.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_tensor_move_elimination.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/getnext_tensor_move_elimination.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_tensor_move_elimination.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/getnext_tensor_move_elimination.cc index 9a49d4c784..8a4bf2c79c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_tensor_move_elimination.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/getnext_tensor_move_elimination.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/getnext_tensor_move_elimination.h" +#include "plugin/device/ascend/optimizer/enhancer/getnext_tensor_move_elimination.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" namespace mindspore::opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_tensor_move_elimination.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/getnext_tensor_move_elimination.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_tensor_move_elimination.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/getnext_tensor_move_elimination.h index aa9de09c34..cabf7868a4 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_tensor_move_elimination.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/getnext_tensor_move_elimination.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_ENHANCER_GETNEXT_TENSORMOVE_ELIMINATION_H #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_ENHANCER_GETNEXT_TENSORMOVE_ELIMINATION_H -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_depend_for_all_gather.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_depend_for_all_gather.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_depend_for_all_gather.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_depend_for_all_gather.cc index b7fcd2698b..5271de3254 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_depend_for_all_gather.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_depend_for_all_gather.cc @@ -15,9 +15,9 @@ */ #include -#include "backend/optimizer/ascend/enhancer/insert_depend_for_all_gather.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_depend_for_all_gather.h" #include "utils/utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_depend_for_all_gather.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_depend_for_all_gather.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_depend_for_all_gather.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_depend_for_all_gather.h index 6f12e9f437..e55b338e6e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_depend_for_all_gather.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_depend_for_all_gather.h @@ -21,12 +21,12 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_pad_for_nms_with_mask.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_pad_for_nms_with_mask.cc index 90d68ac227..e0bf2f699b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_pad_for_nms_with_mask.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_pad_for_nms_with_mask.h" #include -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "base/core_ops.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_pad_for_nms_with_mask.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_pad_for_nms_with_mask.h index e4ef9707df..4626271ea2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_pad_for_nms_with_mask.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_pad_for_nms_with_mask.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_ENHANCER_INSERT_PAD_FOR_NMS_WITH_MASK_H #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_cascade.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_cascade.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_cascade.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_cascade.cc index b3f92682c5..f1acbcc6c0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_cascade.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_cascade.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/insert_tensor_move_for_cascade.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_cascade.h" #include #include "utils/utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_cascade.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_cascade.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_cascade.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_cascade.h index 139a9f3a3f..e4b2770d3a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_cascade.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_cascade.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ENHANCER_INSERT_TENSORMOVE_ASYNC_FOR_CASCADE_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_getnext.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_getnext.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_getnext.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_getnext.cc index 3a1ae180a0..b93f68a06e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_getnext.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_getnext.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/insert_tensor_move_for_getnext.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_getnext.h" #include #include -#include "backend/optimizer/ascend/ascend_helper.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_getnext.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_getnext.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_getnext.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_getnext.h index 8ed4eb54de..14243b4adc 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_getnext.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_getnext.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_ENHANCER_INSERT_TENSOR_MOVE_FOR_GETNEXT_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_ENHANCER_INSERT_TENSOR_MOVE_FOR_GETNEXT_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_hccl_op.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_hccl_op.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_hccl_op.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_hccl_op.cc index 39be03822a..2bc82fad4a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_hccl_op.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_hccl_op.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/insert_tensor_move_for_hccl_op.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_hccl_op.h" #include #include #include #include "utils/utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" #include "utils/trace_base.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_hccl_op.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_hccl_op.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_hccl_op.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_hccl_op.h index 7e9c8afb5b..d5c0ca5162 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/insert_tensor_move_for_hccl_op.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_hccl_op.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_ENHANCER_INSERT_TENSOR_MOVE_FOR_HCCL_OP_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_inputs_for_reduce_scatter.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_inputs_for_reduce_scatter.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_inputs_for_reduce_scatter.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_inputs_for_reduce_scatter.cc index 7423a83295..aaecb00746 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_inputs_for_reduce_scatter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_inputs_for_reduce_scatter.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/split_inputs_for_reduce_scatter.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/enhancer/split_inputs_for_reduce_scatter.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_inputs_for_reduce_scatter.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_inputs_for_reduce_scatter.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_inputs_for_reduce_scatter.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_inputs_for_reduce_scatter.h index 667b023226..860634e664 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_inputs_for_reduce_scatter.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_inputs_for_reduce_scatter.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_n_optimizer.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_n_optimizer.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_n_optimizer.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_n_optimizer.cc index 5652e23f7d..0aa91ed87b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_n_optimizer.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_n_optimizer.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/enhancer/split_n_optimizer.h" +#include "plugin/device/ascend/optimizer/enhancer/split_n_optimizer.h" #include #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "base/core_ops.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_n_optimizer.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_n_optimizer.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_n_optimizer.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_n_optimizer.h index 3cae042365..24f20613ca 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/enhancer/split_n_optimizer.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/enhancer/split_n_optimizer.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_ENHANCER_SPLIT_N_OPTIMIZER_H #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/change_axis_of_reduce_kernel.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/change_axis_of_reduce_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/change_axis_of_reduce_kernel.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/change_axis_of_reduce_kernel.cc index dd814fa00f..ee573e88c6 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/change_axis_of_reduce_kernel.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/change_axis_of_reduce_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/change_axis_of_reduce_kernel.h" +#include "plugin/device/ascend/optimizer/format_type/change_axis_of_reduce_kernel.h" #include #include @@ -22,8 +22,8 @@ #include "utils/utils.h" #include "utils/trace_base.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/change_axis_of_reduce_kernel.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/change_axis_of_reduce_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/change_axis_of_reduce_kernel.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/change_axis_of_reduce_kernel.h index 7cd7743d17..7b2e2a269d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/change_axis_of_reduce_kernel.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/change_axis_of_reduce_kernel.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_CHANGE_AXIS_OF_REDUCE_KENRNEL_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_CHANGE_AXIS_OF_REDUCE_KENRNEL_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/check_consistency.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/check_consistency.cc index 5685fe7e8f..868f609274 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/check_consistency.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/check_consistency.h" +#include "plugin/device/ascend/optimizer/format_type/check_consistency.h" #include #include @@ -21,8 +21,8 @@ #include "utils/utils.h" #include "utils/ms_device_shape_transfer.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/check_consistency.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/check_consistency.h index ab016757a8..ba31cb6c8a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/check_consistency.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_CHECK_CONSISTENCY_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_CHECK_CONSISTENCY_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_cast_format.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_cast_format.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_cast_format.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_cast_format.cc index a2514ca65b..7d36a87f46 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_cast_format.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_cast_format.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/convert_cast_format.h" +#include "plugin/device/ascend/optimizer/format_type/convert_cast_format.h" #include #include @@ -21,8 +21,8 @@ #include #include "utils/hash_map.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { const BaseRef ConvertCastFormat::DefinePattern() const { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_cast_format.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_cast_format.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_cast_format.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_cast_format.h index 3169fea27a..89df70a870 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_cast_format.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_cast_format.h @@ -22,7 +22,7 @@ #include #include "utils/hash_map.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_unsupported_transnode_to_aicpu.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_unsupported_transnode_to_aicpu.cc index ee1efac14e..8c6aa55ef9 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_unsupported_transnode_to_aicpu.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.h" +#include "plugin/device/ascend/optimizer/format_type/convert_unsupported_transnode_to_aicpu.h" #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_unsupported_transnode_to_aicpu.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_unsupported_transnode_to_aicpu.h index 35e81f987f..dd412d0a8a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/convert_unsupported_transnode_to_aicpu.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/convert_unsupported_transnode_to_aicpu.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CONVERT_UNSUPPORTED_NODE_TO_AICPU_H_ #define MINDSPORE_CONVERT_UNSUPPORTED_NODE_TO_AICPU_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { class ConvertUnSupportNodeToAICPU : public PatternProcessPass { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_and_split_unsupported_transdata.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/deal_ref_and_split_unsupported_transdata.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_and_split_unsupported_transdata.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/deal_ref_and_split_unsupported_transdata.cc index 380d4f5d93..b836fb3fb3 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_and_split_unsupported_transdata.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/deal_ref_and_split_unsupported_transdata.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/deal_ref_and_split_unsupported_transdata.h" +#include "plugin/device/ascend/optimizer/format_type/deal_ref_and_split_unsupported_transdata.h" #include #include #include #include -#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" +#include "kernel/oplib/oplib.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_and_split_unsupported_transdata.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/deal_ref_and_split_unsupported_transdata.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_and_split_unsupported_transdata.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/deal_ref_and_split_unsupported_transdata.h index b30b0042a6..f107dbfb94 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/deal_ref_and_split_unsupported_transdata.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/deal_ref_and_split_unsupported_transdata.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_DEAL_REF_AND_SPLIT_UNSUPPORTED_TRANSADATA_H_ #include #include "ir/anf.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fission/transdata_split.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ir_fission/transdata_split.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/dynamic_rnn_grad_reformat.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/dynamic_rnn_grad_reformat.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/dynamic_rnn_grad_reformat.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/dynamic_rnn_grad_reformat.cc index ec8fce489b..d429c8eaf6 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/dynamic_rnn_grad_reformat.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/dynamic_rnn_grad_reformat.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/dynamic_rnn_grad_reformat.h" +#include "plugin/device/ascend/optimizer/format_type/dynamic_rnn_grad_reformat.h" #include -#include "backend/optimizer/ascend/ascend_helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/dynamic_rnn_grad_reformat.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/dynamic_rnn_grad_reformat.h similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/dynamic_rnn_grad_reformat.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/dynamic_rnn_grad_reformat.h index 30d0b59f7d..3595065eb4 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/dynamic_rnn_grad_reformat.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/dynamic_rnn_grad_reformat.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_DYNAMIC_RNN_GRAD_REFORMAT_H_ #include #include "ir/anf.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_cast.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_cast.cc index 0819c16058..02bf0eb025 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_cast.cc @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/insert_cast.h" +#include "plugin/device/ascend/optimizer/format_type/insert_cast.h" #include #include #include #include -#include "backend/optimizer/ascend/ascend_helper.h" -#include "backend/optimizer/common/helper.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" +#include "backend/common/optimizer/helper.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" #include "utils/utils.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_cast.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_cast.h index c628ee7c08..4dc077eca0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_cast.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_cast.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_INSERT_CAST_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pattern_engine.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pattern_engine.h" #include "ir/anf.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_trans_op.cc similarity index 88% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_trans_op.cc index b123601664..908689f7d2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_trans_op.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/insert_trans_op.h" +#include "plugin/device/ascend/optimizer/format_type/insert_trans_op.h" #include #include #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_trans_op.h similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_trans_op.h index 284988642f..a5a2bf18bc 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_trans_op.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transdata_for_runop.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transdata_for_runop.cc index 63cc0f73ab..b7822a8e21 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transdata_for_runop.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/insert_transdata_for_runop.h" +#include "plugin/device/ascend/optimizer/format_type/insert_transdata_for_runop.h" #include #include "utils/utils.h" -#include "backend/optimizer/ascend/ascend_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transdata_for_runop.h similarity index 88% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transdata_for_runop.h index 7655a558b1..4a807b7589 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transdata_for_runop.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transdata_for_runop.h @@ -21,12 +21,12 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_basiclstm_op.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_basiclstm_op.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_basiclstm_op.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_basiclstm_op.cc index 1387263d85..4821cfc53b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_basiclstm_op.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_basiclstm_op.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/insert_transpose_for_basiclstm_op.h" +#include "plugin/device/ascend/optimizer/format_type/insert_transpose_for_basiclstm_op.h" #include #include #include "utils/utils.h" -#include "backend/optimizer/ascend/ascend_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "kernel/oplib/oplib.h" #include "utils/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_basiclstm_op.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_basiclstm_op.h similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_basiclstm_op.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_basiclstm_op.h index 5245aa1778..3e6a874768 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_basiclstm_op.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_basiclstm_op.h @@ -19,9 +19,9 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_dyanmic_gru_v2.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_dyanmic_gru_v2.h similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_dyanmic_gru_v2.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_dyanmic_gru_v2.h index 3d367f91ae..385081fd85 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_dyanmic_gru_v2.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_dyanmic_gru_v2.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_dynamic_gru_v2.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_dynamic_gru_v2.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_dynamic_gru_v2.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_dynamic_gru_v2.cc index 000a106fb1..2e21cd095b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_transpose_for_dynamic_gru_v2.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/insert_transpose_for_dynamic_gru_v2.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/insert_transpose_for_dyanmic_gru_v2.h" +#include "plugin/device/ascend/optimizer/format_type/insert_transpose_for_dyanmic_gru_v2.h" #include #include #include "utils/utils.h" -#include "backend/optimizer/ascend/ascend_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "kernel/oplib/oplib.h" #include "utils/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/merge_cast_to_op.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/merge_cast_to_op.cc index f8679cc0ad..0ea579e180 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/merge_cast_to_op.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/merge_cast_to_op.h" +#include "plugin/device/ascend/optimizer/format_type/merge_cast_to_op.h" #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "utils/trace_base.h" #include "base/core_ops.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/merge_cast_to_op.h similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/merge_cast_to_op.h index e0c4cd3cff..242c2bf71f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/merge_cast_to_op.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/merge_cast_to_op.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_MERGE_CAST_TO_OP_H #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/rectify_do_mask_kernel_info.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/rectify_do_mask_kernel_info.cc index 4bb340b8d8..1b10f443c4 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/rectify_do_mask_kernel_info.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h" +#include "plugin/device/ascend/optimizer/format_type/rectify_do_mask_kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/kernel_build_info.h" #include "utils/utils.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/rectify_do_mask_kernel_info.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/rectify_do_mask_kernel_info.h index cd676f507f..db8cbab38f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/rectify_do_mask_kernel_info.h @@ -21,8 +21,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { class RectifyDoMaskKernelInfo : public PatternProcessPass { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_internal_output.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/remove_internal_output.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_internal_output.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/remove_internal_output.cc index 601341f403..6c030d1840 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_internal_output.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/remove_internal_output.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/remove_internal_output.h" +#include "plugin/device/ascend/optimizer/format_type/remove_internal_output.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_internal_output.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/remove_internal_output.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_internal_output.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/remove_internal_output.h index 0af2482ea2..185b298135 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/remove_internal_output.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/remove_internal_output.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_REMOVE_INTERNAL_OUTPUT_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/set_fracz_group_attr.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/set_fracz_group_attr.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/set_fracz_group_attr.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/set_fracz_group_attr.cc index b94ff42fb9..dd8a383ce7 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/set_fracz_group_attr.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/set_fracz_group_attr.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/set_fracz_group_attr.h" +#include "plugin/device/ascend/optimizer/format_type/set_fracz_group_attr.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "runtime/device/kernel_info.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/set_fracz_group_attr.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/set_fracz_group_attr.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/set_fracz_group_attr.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/set_fracz_group_attr.h index bdc8d8b235..d16ed17b82 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/set_fracz_group_attr.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/set_fracz_group_attr.h @@ -21,7 +21,7 @@ #include #include #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/trans_op_format_refine.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/trans_op_format_refine.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/trans_op_format_refine.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/trans_op_format_refine.cc index 10c04c7d31..6ae5d6cc60 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/trans_op_format_refine.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/trans_op_format_refine.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/format_type/trans_op_format_refine.h" +#include "plugin/device/ascend/optimizer/format_type/trans_op_format_refine.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/trans_op_format_refine.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/trans_op_format_refine.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/format_type/trans_op_format_refine.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/trans_op_format_refine.h index 97cfb9dd76..7b04619585 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/trans_op_format_refine.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/format_type/trans_op_format_refine.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_TRANS_OP_FORMAT_REFINE_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_FORMAT_TYPE_TRANS_OP_FORMAT_REFINE_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { class TransOpFormatRefine : public PatternProcessPass { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/addn_fission.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/addn_fission.cc index 0bf61c86d4..efc720ceed 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/addn_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/addn_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/addn_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/addn_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/addn_fission.h index 29a4f3878f..c2ee2402f8 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/addn_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/addn_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_ADDN_FISSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_ADDN_FISSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_bert_fission.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_bert_fission.cc index 5816fb98a1..530a42e605 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/batch_norm_bert_fission.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_bert_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_bert_fission.h index 9c49aa6895..7146c102f2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_bert_fission.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_BATCH_NORM_BERT_FISSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_infer_fission.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_infer_fission.cc index f6c06da3d5..c798720242 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_infer_fission.h" #include -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_infer_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_infer_fission.h index 8180bf2cd7..300bd5184f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_infer_fission.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_BATCH_NORM_GRAD_INFER_FISSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_split.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_split.cc index b5e68325d4..85d9d3239e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_split.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/batch_norm_grad_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_split.h" #include #include #include "utils/utils.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_split.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_split.h index d00e62ba79..e979a20fcb 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_split.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_BATCH_NORM_GRAD_SPLIT_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bce_with_logits_loss_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bce_with_logits_loss_fission.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bce_with_logits_loss_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bce_with_logits_loss_fission.cc index 438259b7ce..c4ec5f355d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bce_with_logits_loss_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bce_with_logits_loss_fission.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/bce_with_logits_loss_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/bce_with_logits_loss_fission.h" #include #include #include #include #include "utils/utils.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bce_with_logits_loss_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bce_with_logits_loss_fission.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bce_with_logits_loss_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bce_with_logits_loss_fission.h index 4740810f07..d5496e153e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bce_with_logits_loss_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bce_with_logits_loss_fission.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_BCE_WITH_LOGITS_LOSS_FISSION_FISSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_BCE_WITH_LOGITS_LOSS_FISSION_FISSION_H_ -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_grad_split.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_grad_split.cc index bd73b46ce7..fddd1e5c96 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_grad_split.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/bn_grad_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/bn_grad_split.h" #include #include -#include "backend/optimizer/ascend/ir_fission/bn_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/bn_split.h" #include "utils/utils.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_grad_split.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_grad_split.h index 2a9142014f..307c737c7c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_grad_split.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_split.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_split.cc index a7170965bb..285b23562b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_split.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/bn_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/bn_split.h" #include #include @@ -22,9 +22,9 @@ #include "utils/utils.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_split.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_split.h index 4a5c927227..a169083d9d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/bn_split.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/broadcastto_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/broadcastto_fission.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/broadcastto_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/broadcastto_fission.cc index 5d317d87ea..7872f3febc 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/broadcastto_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/broadcastto_fission.cc @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/broadcastto_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/broadcastto_fission.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/broadcastto_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/broadcastto_fission.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/broadcastto_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/broadcastto_fission.h index ba50f5181e..dd1db3be05 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/broadcastto_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/broadcastto_fission.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/cdist_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/cdist_fission.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/cdist_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/cdist_fission.cc index b570ed1aae..aecdfe2bd1 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/cdist_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/cdist_fission.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/cdist_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/cdist_fission.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/cdist_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/cdist_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/cdist_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/cdist_fission.h index 8bf865efb2..d41b48075e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/cdist_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/cdist_fission.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/concat_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/concat_fission.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/concat_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/concat_fission.cc index f2f48cf488..f80eb967fc 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/concat_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/concat_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/concat_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/concat_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/concat_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/concat_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/concat_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/concat_fission.h index 7403ebff23..120c040f37 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/concat_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/concat_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_CONCAT_FISSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_CONCAT_FISSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_fission.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_fission.cc index db0f0b9430..05fbd826a2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_fission.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/diag_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/diag_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_fission.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_fission.h index 0c0ff04c67..7aed60c36d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_fission.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_part_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_part_fission.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_part_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_part_fission.cc index 537bf7575a..5bf1363df1 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_part_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_part_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/diag_part_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/diag_part_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore::opt { const BaseRef DiagPartFission::DefinePattern() const { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_part_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_part_fission.h similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_part_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_part_fission.h index 8e24864efc..d8b419c16e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/diag_part_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/diag_part_fission.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_DIAG_PART_FISSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_DIAG_PART_FISSION_H_ -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fission/diag_fission.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ir_fission/diag_fission.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_gru_v2_grad_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_gru_v2_grad_fission.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_gru_v2_grad_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_gru_v2_grad_fission.cc index 1ef8cf20a4..b0205429ff 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_gru_v2_grad_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_gru_v2_grad_fission.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/dynamic_gru_v2_grad_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/dynamic_gru_v2_grad_fission.h" #include #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_gru_v2_grad_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_gru_v2_grad_fission.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_gru_v2_grad_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_gru_v2_grad_fission.h index a20d1f4588..f234885b74 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_gru_v2_grad_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_gru_v2_grad_fission.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_rnn_grad_fission_v2.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_rnn_grad_fission_v2.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_rnn_grad_fission_v2.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_rnn_grad_fission_v2.cc index 4aa3c87c01..83ed237eae 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_rnn_grad_fission_v2.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_rnn_grad_fission_v2.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/dynamic_rnn_grad_fission_v2.h" +#include "plugin/device/ascend/optimizer/ir_fission/dynamic_rnn_grad_fission_v2.h" #include #include #include -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" #include "utils/trace_base.h" #include "utils/tensor_construct_utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_rnn_grad_fission_v2.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_rnn_grad_fission_v2.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_rnn_grad_fission_v2.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_rnn_grad_fission_v2.h index 584eafa3ef..d788336b6a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/dynamic_rnn_grad_fission_v2.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/dynamic_rnn_grad_fission_v2.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_DYNAMIC_RNN_GRAD_FISSION_V2_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/gather_v2_ds_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/gather_v2_ds_fission.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/gather_v2_ds_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/gather_v2_ds_fission.cc index 26139b31ce..5d96af5069 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/gather_v2_ds_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/gather_v2_ds_fission.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/gather_v2_ds_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/gather_v2_ds_fission.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/gather_v2_ds_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/gather_v2_ds_fission.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/gather_v2_ds_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/gather_v2_ds_fission.h index 91cf99faa5..b616927fd5 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/gather_v2_ds_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/gather_v2_ds_fission.h @@ -18,9 +18,9 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lars_v2_fission.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lars_v2_fission.cc index d9377e6a9b..35442bdfc0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lars_v2_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/lars_v2_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/lars_v2_fission.h" #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" #include "utils/utils.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lars_v2_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lars_v2_fission.h index 1241ce3d5f..5574da9491 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lars_v2_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lars_v2_fission.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_LARS_V2_FISSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/layer_norm_grad_split.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/layer_norm_grad_split.cc index 799645d5ce..9379cb1310 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/layer_norm_grad_split.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/layer_norm_grad_split.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "ir/primitive.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/layer_norm_grad_split.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/layer_norm_grad_split.h index f7e513cb85..33da9d4b38 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/layer_norm_grad_split.h @@ -18,9 +18,9 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lin_space_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lin_space_fission.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lin_space_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lin_space_fission.cc index a458f5f939..02d1271f14 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lin_space_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lin_space_fission.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/lin_space_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/lin_space_fission.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lin_space_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lin_space_fission.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lin_space_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lin_space_fission.h index 8cd58966fa..4fd13400f3 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/lin_space_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/lin_space_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_LIN_SPACE_FUSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_LIN_SPACE_FUSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/max_pool3d_grad_grad_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/max_pool3d_grad_grad_fission.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/max_pool3d_grad_grad_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/max_pool3d_grad_grad_fission.cc index 86d80b841f..8b0eae8721 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/max_pool3d_grad_grad_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/max_pool3d_grad_grad_fission.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/max_pool3d_grad_grad_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/max_pool3d_grad_grad_fission.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/max_pool3d_grad_grad_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/max_pool3d_grad_grad_fission.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/max_pool3d_grad_grad_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/max_pool3d_grad_grad_fission.h index a31e508dc2..e783432e72 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/max_pool3d_grad_grad_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/max_pool3d_grad_grad_fission.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_MAX_POOL3D_GRAD_GRAD_FISSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_MAX_POOL3D_GRAD_GRAD_FISSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/pack_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/pack_fission.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/pack_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/pack_fission.cc index 2dc4a8a9df..a3557e648c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/pack_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/pack_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/pack_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/pack_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/pack_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/pack_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/pack_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/pack_fission.h index 1108744133..438ffbdb1a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/pack_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/pack_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_PACK_FISSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_PACK_FISSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_min_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_min_fission.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_min_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_min_fission.cc index 1243be3e7f..987eed08af 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_min_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_min_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/reduce_min_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/reduce_min_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_min_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_min_fission.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_min_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_min_fission.h index ce4cad4e7c..0cbc76e796 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_min_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_min_fission.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_REDUCE_MIN_FISSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_REDUCE_MIN_FISSION_H_ -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_sum_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_sum_fission.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_sum_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_sum_fission.cc index b99e5bf414..d076b45548 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_sum_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_sum_fission.cc @@ -14,11 +14,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/reduce_sum_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/reduce_sum_fission.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_sum_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_sum_fission.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_sum_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_sum_fission.h index 991490e2c4..9361b96b4e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/reduce_sum_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/reduce_sum_fission.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/seed_adapter.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/seed_adapter.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/seed_adapter.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/seed_adapter.cc index 1e4b952cbc..65cdb7fe05 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/seed_adapter.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/seed_adapter.cc @@ -13,19 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/seed_adapter.h" +#include "plugin/device/ascend/optimizer/ir_fission/seed_adapter.h" #include #include #include -#include "backend/optimizer/common/helper.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/common/optimizer/helper.h" +#include "kernel/kernel_build_info.h" #include "utils/utils.h" #include "utils/trace_base.h" -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "kernel/oplib/oplib.h" namespace mindspore::opt { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/seed_adapter.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/seed_adapter.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/seed_adapter.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/seed_adapter.h index 6585799209..a0ed6178ab 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/seed_adapter.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/seed_adapter.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_SEED_ADAPTER_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt { class SeedAdapter : public PatternProcessPass { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/single_batch_norm_fission.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/single_batch_norm_fission.cc index 81654dac92..641d2d0d0d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/single_batch_norm_fission.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/single_batch_norm_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/single_batch_norm_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/single_batch_norm_fission.h index 39d432f5be..378155d270 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/single_batch_norm_fission.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_SINGLE_BATCH_NORM_FISSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/space_to_depth_split.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/space_to_depth_split.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/space_to_depth_split.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/space_to_depth_split.cc index 681920a453..67f48e0fd1 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/space_to_depth_split.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/space_to_depth_split.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/space_to_depth_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/space_to_depth_split.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/space_to_depth_split.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/space_to_depth_split.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/space_to_depth_split.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/space_to_depth_split.h index 3310b4cb0b..66c842469a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/space_to_depth_split.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/space_to_depth_split.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_SPACE_TO_DEPTH_SPLIT_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/split_fission.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/split_fission.cc index 57dc397612..782a14ad1d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/split_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/split_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/split_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/split_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/split_fission.h index 6ec028e75a..51917e1d7f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/split_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/split_fission.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_SPLIT_FISSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/splitv_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/splitv_fission.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/splitv_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/splitv_fission.cc index 7277822e5b..4fa45dc08b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/splitv_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/splitv_fission.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/splitv_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/splitv_fission.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore::opt { const BaseRef SplitVFission::DefinePattern() const { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/splitv_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/splitv_fission.h similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/splitv_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/splitv_fission.h index 061361655f..12cedc4cd4 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/splitv_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/splitv_fission.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_SPLITV_FISSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_SPLITV_FISSION_H_ -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fission/split_fission.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ir_fission/split_fission.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/tensor_scatter_update_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/tensor_scatter_update_fission.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/tensor_scatter_update_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/tensor_scatter_update_fission.cc index 037e86209d..601f9d13eb 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/tensor_scatter_update_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/tensor_scatter_update_fission.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/tensor_scatter_update_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/tensor_scatter_update_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/tensor_scatter_update_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/tensor_scatter_update_fission.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/tensor_scatter_update_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/tensor_scatter_update_fission.h index 846bdb0d64..45eccb1935 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/tensor_scatter_update_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/tensor_scatter_update_fission.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_TENSOR_SCATTER_UPDATE_FISSION_H_ #define MINDSPORE_CCSRC_PRE_ACTIVATE_ASCEND_IR_FISSION_TENSOR_SCATTER_UPDATE_FISSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/topk_split.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/topk_split.cc index 4c435f0b4b..30d4a1c361 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/topk_split.cc @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/topk_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/topk_split.h" #include #include #include +#include #include "utils/hash_set.h" -#include "backend/optimizer/common/helper.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/common/optimizer/helper.h" +#include "kernel/kernel_build_info.h" #include "utils/utils.h" -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/topk_split.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/topk_split.h index cda8d50341..a24ed02504 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/topk_split.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FISSION_TOPK_SPLIT_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/transdata_split.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/transdata_split.cc index 0e2c440191..aa548a5e59 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/transdata_split.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/transdata_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/transdata_split.h" #include #include "debug/anf_ir_dump.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/transdata_split.h similarity index 87% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/transdata_split.h index 765c1da4c7..2954440b93 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/transdata_split.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/transdata_split.h @@ -20,12 +20,12 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/unsorted_segment_sum_fission.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/unsorted_segment_sum_fission.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/unsorted_segment_sum_fission.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/unsorted_segment_sum_fission.cc index 0aca370509..244f081e96 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/unsorted_segment_sum_fission.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/unsorted_segment_sum_fission.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/unsorted_segment_sum_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/unsorted_segment_sum_fission.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/unsorted_segment_sum_fission.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/unsorted_segment_sum_fission.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fission/unsorted_segment_sum_fission.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/unsorted_segment_sum_fission.h index 0cf6add460..6275de039c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/unsorted_segment_sum_fission.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fission/unsorted_segment_sum_fission.h @@ -18,9 +18,9 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_fusion.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_fusion.cc index e24cfe87fc..1ffad3763f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_fusion.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_fusion.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_fusion.h similarity index 99% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_fusion.h index 3314d60402..3c968b63c0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_with_decay_rule.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_with_decay_rule.cc index 47fe90047f..9192d0a7e9 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_with_decay_rule.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_with_decay_rule.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_with_decay_rule.h similarity index 99% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_with_decay_rule.h index 650c8b375e..b3709a1637 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/adam_apply_one_with_decay_rule.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/add_input_to_output.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/add_input_to_output.cc index b613c79190..1135927733 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/add_input_to_output.h" +#include "plugin/device/ascend/optimizer/ir_fusion/add_input_to_output.h" #include #include -#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" +#include "plugin/device/ascend/optimizer/ir_fusion/input_to_output_registry.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/oplib/oplib.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/add_input_to_output.h similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/add_input_to_output.h index 3eb2755a55..c35ade4267 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/add_input_to_output.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/add_input_to_output.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_fusion.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_fusion.cc index a3fb7469e9..f1901de350 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_fusion.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/avgpool_3d_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_fusion.h" #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_fusion.h index d2ed386126..1249765c0b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_grad_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_grad_fusion.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_grad_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_grad_fusion.cc index 9e1173ca31..fc35ec792f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_grad_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_grad_fusion.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/avgpool_3d_grad_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_grad_fusion.h" #include #include #include #include -#include "backend/optimizer/ascend/ir_fusion/avgpool_3d_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_grad_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_grad_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_grad_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_grad_fusion.h index b6edc63df3..8f2a36629c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/avgpool_3d_grad_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/avgpool_3d_grad_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnorm_to_bninfer.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnorm_to_bninfer.cc index 4372bcd889..63e12e7a8c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h" +#include "plugin/device/ascend/optimizer/ir_fusion/batchnorm_to_bninfer.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "base/core_ops.h" #include "abstract/abstract_value.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnorm_to_bninfer.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnorm_to_bninfer.h index 2dede15aa7..26b46772be 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnorm_to_bninfer.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_BATCHNORM_TO_BNINFER_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnormgrad_to_bninfergrad.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnormgrad_to_bninfergrad.cc index 2a88d6fce1..a51e3439b0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h" +#include "plugin/device/ascend/optimizer/ir_fusion/batchnormgrad_to_bninfergrad.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "base/core_ops.h" #include "abstract/abstract_value.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnormgrad_to_bninfergrad.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnormgrad_to_bninfergrad.h index 79188c72ee..37183d2f2c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/batchnormgrad_to_bninfergrad.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_BATCHNORMGRAD_TO_BNINFERGRAD_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.cc index 3e0ed76d41..ec512ef291 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "utils/trace_base.h" #include "base/core_ops.h" #include "abstract/abstract_value.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h index cd45a6caae..3b744692d5 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/bn_reduce_grad_conv2d_backprop_filter_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_BN_REDUCE_GRAD_CONV2D_BACKPROP_FILTER_FUSION_H_ #include -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc index 5a248b71e5..63fcbef397 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h index 94d3bc8969..d4ec8aaa6e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_value_fusion.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_value_fusion.cc index 8fdabf2974..82d81eba24 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/clip_by_value_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_value_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_value_fusion.h index c78542bf54..07e393b61d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/clip_by_value_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_CLIP_BY_VALUE_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_mul_grad_fusion.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_mul_grad_fusion.cc index 74a9809cd9..8a9fee079f 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/confusion_mul_grad_fusion.h" #include #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "abstract/abstract_value.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "utils/trace_base.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_mul_grad_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_mul_grad_fusion.h index ba39175628..b6b8d301d7 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_mul_grad_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_CONFUSION_MUL_GRAD_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_softmax_grad_rule.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_softmax_grad_rule.cc index 82062300da..3edfd132ea 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/confusion_softmax_grad_rule.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_softmax_grad_rule.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_softmax_grad_rule.h index 1954dd66b1..ed508d9d29 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/confusion_softmax_grad_rule.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_CONFUSION_SOFTMAX_GRAD_RULE_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/conv2d_backprop_input_biasadd_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/conv2d_backprop_input_biasadd_fusion.cc similarity index 89% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/conv2d_backprop_input_biasadd_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/conv2d_backprop_input_biasadd_fusion.cc index 91022fbe35..2e2fea951d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/conv2d_backprop_input_biasadd_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/conv2d_backprop_input_biasadd_fusion.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/conv2d_backprop_input_biasadd_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/conv2d_backprop_input_biasadd_fusion.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" #include "utils/utils.h" #include "utils/trace_base.h" -#include "runtime/device/ascend/lic_manager.h" +#include "plugin/device/ascend/hal/device/lic_manager.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/conv2d_backprop_input_biasadd_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/conv2d_backprop_input_biasadd_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/conv2d_backprop_input_biasadd_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/conv2d_backprop_input_biasadd_fusion.h index 76a27f37af..0806191d69 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/conv2d_backprop_input_biasadd_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/conv2d_backprop_input_biasadd_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_CONV2D_BACKPROP_INPUT_BIASADD_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/derelu_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/derelu_fusion.cc index 6fba183efa..a0091574c6 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/derelu_fusion.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/derelu_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/derelu_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "abstract/abstract_value.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/derelu_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/derelu_fusion.h index 164f85611d..9914cef1ad 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/derelu_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/derelu_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_DERELU_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/fused_batch_norm_fusion.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/fused_batch_norm_fusion.cc index 0bbe6378c0..dad751894a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/fused_batch_norm_fusion.h" #include #include -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/fused_batch_norm_fusion.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/fused_batch_norm_fusion.h index beafc367d2..7e82d7b833 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/fused_batch_norm_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/input_to_output_registry.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/input_to_output_registry.cc index c3393bc83f..ce6f1020ef 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/input_to_output_registry.h" +#include "plugin/device/ascend/optimizer/ir_fusion/input_to_output_registry.h" #include #include "utils/utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/input_to_output_registry.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/input_to_output_registry.h diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_rule.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_rule.cc index 8f3e3c5fee..c0dbe7af02 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_rule.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_rule.h" #include #include #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "base/core_ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_rule.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_rule.h index 5a382a7423..93bd4f0266 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_rule.h @@ -23,9 +23,9 @@ #include #include "utils/hash_map.h" #include "ir/anf.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_rule.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_rule.cc index 743592a380..744109d0a9 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_rule.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_rule.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_rule.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_rule.h index 9ed6e56753..d70cde4ba7 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_rule.h @@ -19,8 +19,8 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc index 95c77a0712..9aab4126f5 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_v1_rule.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_v1_rule.h" #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_v1_rule.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_v1_rule.h index ff59e4005a..d74155fd47 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_mv_with_decay_v1_rule.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_right_rule.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_right_rule.cc index 0a1b8a84b7..310fe6c15d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_next_right_rule.h" #include -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "utils/trace_base.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_right_rule.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_right_rule.h index db92b9f16a..4636e46bd2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_next_right_rule.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_LAMB_NEXT_RIGHT_RULE_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_rule_fusion.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_rule_fusion.cc index 294047b276..26960a527e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_rule_fusion.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_rule_fusion.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_rule_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_rule_fusion.h index db48a4a6b2..2f9983948a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_rule_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_LAMB_UPDATE_WITH_LR_RULE_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_v2.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_v2.cc index 3d48b584a0..619747a8fb 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_v2.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h" +#include "plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_v2.h" #include #include #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_v2.h similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_v2.h index fe1e5d9e13..c11ffcc2ff 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/lamb_update_with_lr_v2.h @@ -23,9 +23,9 @@ #include #include "utils/hash_map.h" #include "ir/anf.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc index 5128ac6021..baca67356a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h index a8414023cd..ded4ba94e0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h @@ -17,9 +17,9 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_LAYER_NORM_BETA_GAMMA_BACKPROP_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/matmul_biasadd_fusion.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/matmul_biasadd_fusion.cc index de6eaff368..65c8ffd3db 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/matmul_biasadd_fusion.h" #include -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/matmul_biasadd_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/matmul_biasadd_fusion.h index 88ca97e029..688f35ef88 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/matmul_biasadd_fusion.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/momentum_lossscale_fusion.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/momentum_lossscale_fusion.cc index b1b653bb0c..5eb0e33c23 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/momentum_lossscale_fusion.h" #include #include #include -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/momentum_lossscale_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/momentum_lossscale_fusion.h index 0625e00f72..80423e22d4 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/momentum_lossscale_fusion.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_MOMENTUM_LOSSSCALE_FUSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_MOMENTUM_LOSSSCALE_FUSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_add_fusion.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_add_fusion.cc index 67a2bff798..0d9d90c671 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_add_fusion.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/mul_add_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/mul_add_fusion.h" #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_add_fusion.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_add_fusion.h index aa25db0c0b..1e0e6ac6f1 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_add_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_add_fusion.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_MUL_ADD_FUSION_H #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_MUL_ADD_FUSION_H -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_addn_fusion.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_addn_fusion.cc index 32b883931c..7bdc37df7c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_addn_fusion.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/mul_addn_fusion.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "frontend/optimizer/opt.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_addn_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_addn_fusion.h index c6f868058b..b53758b0e5 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/mul_addn_fusion.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_PASS_MUL_ADDN_FUSION_H #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_PASS_MUL_ADDN_FUSION_H -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/parameter_and_transop_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/parameter_and_transop_fusion.cc index a4f7f80a74..774452cd40 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/parameter_and_transop_fusion.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/parameter_and_transop_fusion.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "base/core_ops.h" #include "runtime/device/kernel_info.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/parameter_and_transop_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/parameter_and_transop_fusion.h index 605eb19d1c..e52662b441 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/parameter_and_transop_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/parameter_and_transop_fusion.h @@ -22,7 +22,7 @@ #include #include #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/prelu_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/prelu_fusion.cc similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/prelu_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/prelu_fusion.cc index 644512043d..963c29e1f3 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/prelu_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/prelu_fusion.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/prelu_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/prelu_fusion.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/prelu_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/prelu_fusion.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/prelu_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/prelu_fusion.h index 5dc1c2e641..a89da19352 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/prelu_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/prelu_fusion.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/refresh_parameter_format.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/refresh_parameter_format.cc index 20ee55e104..e2a1e65635 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/refresh_parameter_format.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/refresh_parameter_format.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/ir_fusion/refresh_parameter_format.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "runtime/device/kernel_info.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/refresh_parameter_format.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/refresh_parameter_format.h index 9dec340112..7697df970d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/refresh_parameter_format.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/refresh_parameter_format.h @@ -21,7 +21,7 @@ #include #include #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/remove_reshape_pair.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/remove_reshape_pair.cc index 3183df5e09..4a3f5cf765 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/remove_reshape_pair.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/remove_reshape_pair.h" +#include "plugin/device/ascend/optimizer/ir_fusion/remove_reshape_pair.h" #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/remove_reshape_pair.h similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/remove_reshape_pair.h index dcfeb6fc3d..30dac7c29a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/remove_reshape_pair.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/remove_reshape_pair.h @@ -19,9 +19,9 @@ #include #include "ir/anf.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/reshape_transpose_fusion.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/reshape_transpose_fusion.cc index dda3e89b54..ea863252e2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/reshape_transpose_fusion.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/reshape_transpose_fusion.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "base/core_ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/reshape_transpose_fusion.h similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/reshape_transpose_fusion.h index 75a31258e5..e36c610384 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/reshape_transpose_fusion.h @@ -22,9 +22,9 @@ #include #include #include "ir/anf.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_dropout_do_mask_v3_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_dropout_do_mask_v3_fusion.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_dropout_do_mask_v3_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_dropout_do_mask_v3_fusion.cc index d6b4198da7..eebdca16c3 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_dropout_do_mask_v3_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_dropout_do_mask_v3_fusion.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/softmax_dropout_do_mask_v3_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/softmax_dropout_do_mask_v3_fusion.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "base/core_ops.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_dropout_do_mask_v3_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_dropout_do_mask_v3_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_dropout_do_mask_v3_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_dropout_do_mask_v3_fusion.h index 1bfc451dd8..054977abfe 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_dropout_do_mask_v3_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_dropout_do_mask_v3_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_SOFTMAX_DROPOUT_DO_MASK_V3_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_grad_ext_fusion.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_grad_ext_fusion.cc index 79cb21142f..eb4235d7e6 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/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 "backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/softmax_grad_ext_fusion.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_grad_ext_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_grad_ext_fusion.h index b7ae7dda1c..242f2e0d7b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/softmax_grad_ext_fusion.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/square_sum_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/square_sum_fusion.cc index b83344260f..ddb229520a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/square_sum_fusion.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/square_sum_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/square_sum_fusion.h" #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "base/core_ops.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/square_sum_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/square_sum_fusion.h index 2c0e00fd50..d31944ef51 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/square_sum_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/square_sum_fusion.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_SQUARE_SUM_FUSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_IR_FUSION_SQUARE_SUM_FUSION_H_ -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_reshape_fusion.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_reshape_fusion.cc index 1f0709c719..d0e0b51991 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_reshape_fusion.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/transpose_reshape_fusion.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "base/core_ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_reshape_fusion.h similarity index 91% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_reshape_fusion.h index dd398e3eba..99e4f3be84 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_reshape_fusion.h @@ -22,9 +22,9 @@ #include #include #include "ir/anf.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_transdata_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_transdata_fusion.cc index b4641ab1f6..abe271d97d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_transdata_fusion.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/transpose_transdata_fusion.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" #include "base/core_ops.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_transdata_fusion.h similarity index 89% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_transdata_fusion.h index 4b1ec803c2..0561efa8fa 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transpose_transdata_fusion.h @@ -22,10 +22,10 @@ #include #include #include "ir/anf.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" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transposed_update_fusion.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transposed_update_fusion.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transposed_update_fusion.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transposed_update_fusion.cc index f8e723b35f..1a70845337 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transposed_update_fusion.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transposed_update_fusion.cc @@ -13,10 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fusion/transposed_update_fusion.h" +#include "plugin/device/ascend/optimizer/ir_fusion/transposed_update_fusion.h" #include -#include "backend/optimizer/ascend/ascend_helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include +#include "plugin/device/ascend/optimizer/ascend_helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "debug/anf_ir_dump.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transposed_update_fusion.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transposed_update_fusion.h similarity index 88% rename from mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transposed_update_fusion.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transposed_update_fusion.h index 828d7c7821..c405dc2efd 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/transposed_update_fusion.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/ir_fusion/transposed_update_fusion.h @@ -20,12 +20,12 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "ir/func_graph.h" #include "ir/anf.h" -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ascend_helper.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/ascend_helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/all_to_all_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/all_to_all_unify_mindir.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/all_to_all_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/all_to_all_unify_mindir.cc index 036f7aae9f..65d4bfbd9d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/all_to_all_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/all_to_all_unify_mindir.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/all_to_all_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/all_to_all_unify_mindir.h" #include #include #include "utils/trace_base.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "runtime/hccl_adapter/hccl_adapter.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/all_to_all_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/all_to_all_unify_mindir.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/all_to_all_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/all_to_all_unify_mindir.h index e18a4a19f1..c22336a7ed 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/all_to_all_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/all_to_all_unify_mindir.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_ALL_TO_ALL_UNIFY_MINDIR_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/avg_pool_grad_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/avg_pool_grad_unify_mindir.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/avg_pool_grad_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/avg_pool_grad_unify_mindir.cc index 8e0ba309d3..06a0df9479 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/avg_pool_grad_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/avg_pool_grad_unify_mindir.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/avg_pool_grad_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/avg_pool_grad_unify_mindir.h" #include #include @@ -26,9 +26,9 @@ #include "utils/check_convert_utils.h" #include "utils/convert_utils_base.h" #include "utils/trace_base.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/avg_pool_grad_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/avg_pool_grad_unify_mindir.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/avg_pool_grad_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/avg_pool_grad_unify_mindir.h index 22da36af68..0480cba8af 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/avg_pool_grad_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/avg_pool_grad_unify_mindir.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_AVG_POOL_GRAD_UNIFY_MINDIR_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/bn_grad_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/bn_grad_unify_mindir.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/bn_grad_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/bn_grad_unify_mindir.cc index 3550049fef..b740e459eb 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/bn_grad_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/bn_grad_unify_mindir.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/bn_grad_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/bn_grad_unify_mindir.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/bn_grad_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/bn_grad_unify_mindir.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/bn_grad_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/bn_grad_unify_mindir.h index d0f6531602..da4e74a7f2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/bn_grad_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/bn_grad_unify_mindir.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_BN_GRAD_UNIFY_MINDIR_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_BN_GRAD_UNIFY_MINDIR_H_ -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/conv2d_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/conv2d_unify_mindir.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/conv2d_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/conv2d_unify_mindir.cc index b27187f11c..a870a90048 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/conv2d_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/conv2d_unify_mindir.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/conv2d_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/conv2d_unify_mindir.h" #include #include @@ -25,9 +25,9 @@ #include "utils/ms_context.h" #include "utils/check_convert_utils.h" #include "utils/trace_base.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/conv2d_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/conv2d_unify_mindir.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/conv2d_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/conv2d_unify_mindir.h index 5e00f5da30..b32f980915 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/conv2d_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/conv2d_unify_mindir.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_CONV2D_UNIFY_MINDIR_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/dropout_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/dropout_unify_mindir.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/dropout_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/dropout_unify_mindir.cc index b887cb04f8..50412bb13c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/dropout_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/dropout_unify_mindir.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/dropout_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/dropout_unify_mindir.h" #include #include #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/log_adapter.h" #include "utils/ms_device_shape_transfer.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/dropout_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/dropout_unify_mindir.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/dropout_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/dropout_unify_mindir.h index 36d8b0d65e..98558ccd96 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/dropout_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/dropout_unify_mindir.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_DROPOUT_UNIFY_MINDIR_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/env_op_attr_update.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/env_op_attr_update.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/env_op_attr_update.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/env_op_attr_update.cc index fa690aa274..bfd2f5b0f8 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/env_op_attr_update.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/env_op_attr_update.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/env_op_attr_update.h" +#include "plugin/device/ascend/optimizer/mindir/env_op_attr_update.h" #include #include #include "utils/utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/env_op_attr_update.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/env_op_attr_update.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/env_op_attr_update.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/env_op_attr_update.h index 325ccdcca6..b9c84e8b95 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/env_op_attr_update.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/env_op_attr_update.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_ENV_OP_ATTR_UPDATE_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_ENV_OP_ATTR_UPDATE_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/fake_learned_scale_quant_grad_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/fake_learned_scale_quant_grad_unify_mindir.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/fake_learned_scale_quant_grad_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/fake_learned_scale_quant_grad_unify_mindir.cc index 6390aef03c..24bc4cb910 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/fake_learned_scale_quant_grad_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/fake_learned_scale_quant_grad_unify_mindir.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/fake_learned_scale_quant_grad_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/fake_learned_scale_quant_grad_unify_mindir.h" #include #include #include "utils/utils.h" #include "utils/ms_context.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/fake_learned_scale_quant_grad_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/fake_learned_scale_quant_grad_unify_mindir.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/fake_learned_scale_quant_grad_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/fake_learned_scale_quant_grad_unify_mindir.h index 2c364167c9..6d9e160256 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/fake_learned_scale_quant_grad_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/fake_learned_scale_quant_grad_unify_mindir.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_FAKE_LEARNED_SCALE_QUANT_GRAD_UNIFY_MINDIR_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_to_maxpool_with_argmax.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_to_maxpool_with_argmax.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_to_maxpool_with_argmax.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_to_maxpool_with_argmax.cc index 256ecadcfa..b15a13605c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_to_maxpool_with_argmax.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_to_maxpool_with_argmax.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/maxpool_to_maxpool_with_argmax.h" +#include "plugin/device/ascend/optimizer/mindir/maxpool_to_maxpool_with_argmax.h" #include #include @@ -22,9 +22,9 @@ #include "utils/utils.h" #include "utils/ms_context.h" #include "utils/trace_base.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_to_maxpool_with_argmax.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_to_maxpool_with_argmax.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_to_maxpool_with_argmax.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_to_maxpool_with_argmax.h index 6ae6262a42..2256f29237 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_to_maxpool_with_argmax.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_to_maxpool_with_argmax.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_with_argmax_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_with_argmax_unify_mindir.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_with_argmax_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_with_argmax_unify_mindir.cc index 30e404f61b..0f51f5ccf5 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_with_argmax_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_with_argmax_unify_mindir.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/maxpool_with_argmax_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/maxpool_with_argmax_unify_mindir.h" #include #include -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/utils.h" #include "utils/trace_base.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_with_argmax_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_with_argmax_unify_mindir.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_with_argmax_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_with_argmax_unify_mindir.h index fc618da3ac..5460e9e160 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/maxpool_with_argmax_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/maxpool_with_argmax_unify_mindir.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_MAXPOOL_WITH_ARGMAX_UNIFY_MINDIR_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/neighbor_exchange_v2_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/neighbor_exchange_v2_unify_mindir.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/neighbor_exchange_v2_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/neighbor_exchange_v2_unify_mindir.cc index 5598da5ca9..5f2089d1aa 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/neighbor_exchange_v2_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/neighbor_exchange_v2_unify_mindir.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/neighbor_exchange_v2_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/neighbor_exchange_v2_unify_mindir.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "runtime/hccl_adapter/hccl_adapter.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" +#include "backend/common/optimizer/helper.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/neighbor_exchange_v2_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/neighbor_exchange_v2_unify_mindir.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/neighbor_exchange_v2_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/neighbor_exchange_v2_unify_mindir.h index 6ab642864a..dea994b6f0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/neighbor_exchange_v2_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/neighbor_exchange_v2_unify_mindir.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/optimizer_unify_output.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/optimizer_unify_output.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/optimizer_unify_output.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/optimizer_unify_output.cc index 7005ba705c..cc53afbe21 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/optimizer_unify_output.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/optimizer_unify_output.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/optimizer_unify_output.h" +#include "plugin/device/ascend/optimizer/mindir/optimizer_unify_output.h" #include #include #include "abstract/abstract_value.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/optimizer_unify_output.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/optimizer_unify_output.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/optimizer_unify_output.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/optimizer_unify_output.h index 4596d9f410..4151d58268 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/optimizer_unify_output.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/optimizer_unify_output.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_OPTIMIZER_UNIFY_OUTPUT_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/slice_grad_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/slice_grad_unify_mindir.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/slice_grad_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/slice_grad_unify_mindir.cc index c4e37e6125..151227276a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/slice_grad_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/slice_grad_unify_mindir.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/slice_grad_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/slice_grad_unify_mindir.h" #include #include @@ -24,9 +24,9 @@ #include "utils/utils.h" #include "utils/ms_context.h" #include "utils/trace_base.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/slice_grad_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/slice_grad_unify_mindir.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/slice_grad_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/slice_grad_unify_mindir.h index b72868e465..7aa0f514b4 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/slice_grad_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/slice_grad_unify_mindir.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_SLICE_GRAD_UNIFY_MINDIR_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/space_batch_nd_attr_update.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/space_batch_nd_attr_update.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/space_batch_nd_attr_update.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/space_batch_nd_attr_update.cc index 5b1e183d8f..7f173a9931 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/space_batch_nd_attr_update.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/space_batch_nd_attr_update.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/space_batch_nd_attr_update.h" +#include "plugin/device/ascend/optimizer/mindir/space_batch_nd_attr_update.h" #include #include -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "base/core_ops.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/space_batch_nd_attr_update.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/space_batch_nd_attr_update.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/space_batch_nd_attr_update.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/space_batch_nd_attr_update.h index 8df21cacd1..6be13e42be 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/space_batch_nd_attr_update.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/space_batch_nd_attr_update.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_SPACE_BATCH_ND_ATTR_UPDATE_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.cc index c48e9b36e5..dfb5efd84e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h" +#include "plugin/device/ascend/optimizer/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" #include "utils/utils.h" #include "ir/primitive.h" #include "ir/tensor.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h index f5ebc3fc3d..59c58ae31c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/sparse_softmax_cross_entropy_with_logits_unify_mindir.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/update_input_names_strided_slice_grad.cc b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/update_input_names_strided_slice_grad.cc similarity index 90% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/update_input_names_strided_slice_grad.cc rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/update_input_names_strided_slice_grad.cc index 151105798c..1f569ea34e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/update_input_names_strided_slice_grad.cc +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/update_input_names_strided_slice_grad.cc @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/ascend/mindir/update_input_names_strided_slice_grad.h" +#include "plugin/device/ascend/optimizer/mindir/update_input_names_strided_slice_grad.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/mindir/update_input_names_strided_slice_grad.h b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/update_input_names_strided_slice_grad.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/ascend/mindir/update_input_names_strided_slice_grad.h rename to mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/update_input_names_strided_slice_grad.h index 5c5a7e6f46..95a3153d77 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/mindir/update_input_names_strided_slice_grad.h +++ b/mindspore/ccsrc/plugin/device/ascend/optimizer/mindir/update_input_names_strided_slice_grad.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ASCEND_MINDIR_UPDATE_INPUT_NAMES_STRIDED_SLICE_GRAD_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/plugin/device/cpu/hal/device/CMakeLists.txt b/mindspore/ccsrc/plugin/device/cpu/hal/device/CMakeLists.txt new file mode 100644 index 0000000000..9aaf00de32 --- /dev/null +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/CMakeLists.txt @@ -0,0 +1,23 @@ +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +if(ENABLE_CPU) + file(GLOB_RECURSE DEVICE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + list(REMOVE_ITEM DEVICE_SRC_LIST "mpi/mpi_adapter.cc" "mpi/mpi_export.cc") +endif() + +if(ENABLE_MPI AND ENABLE_CPU) + file(GLOB_RECURSE MPI_SRC_LIST "mpi/mpi_adapter.cc" "mpi/mpi_export.cc") + set_property(SOURCE ${MPI_SRC_LIST} + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + add_library(mpi_adapter SHARED ${MPI_SRC_LIST}) + target_link_libraries(mpi_adapter PRIVATE mindspore::ompi mindspore::pybind11_module -ldl ${SECUREC_LIBRARY}) +endif() + +set_property(SOURCE ${DEVICE_SRC_LIST}} + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) +if(ENABLE_CPU) + add_library(_mindspore_plugin_device_cpu_hal_device_obj OBJECT ${DEVICE_SRC_LIST}) +endif() \ No newline at end of file diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_common.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_common.h similarity index 100% rename from mindspore/ccsrc/runtime/device/cpu/cpu_common.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_common.h diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_device_address.cc b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_device_address.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/cpu/cpu_device_address.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_device_address.cc index b867c0ad4e..c3796ff455 100644 --- a/mindspore/ccsrc/runtime/device/cpu/cpu_device_address.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_device_address.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include #include #include "runtime/device/convert_tensor_utils.h" -#include "runtime/hardware/cpu/cpu_memory_pool.h" +#include "plugin/device/cpu/hal/hardware/cpu_memory_pool.h" #ifndef ENABLE_SECURITY #include "debug/data_dump/dump_json_parser.h" #endif diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_device_address.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_device_address.h similarity index 100% rename from mindspore/ccsrc/runtime/device/cpu/cpu_device_address.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_device_address.h diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_kernel_runtime.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_kernel_runtime.cc index 9bbd47c30f..ded073c449 100644 --- a/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_kernel_runtime.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/cpu/cpu_kernel_runtime.h" +#include "plugin/device/cpu/hal/device/cpu_kernel_runtime.h" #include #include #include @@ -23,12 +23,12 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" -#include "runtime/device/cpu/cpu_memory_manager.h" +#include "kernel/kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_memory_manager.h" #include "utils/ms_context.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/session_basic.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/session_basic.h" #include "frontend/operator/ops.h" #include "profiler/device/cpu/cpu_profiling.h" #include "utils/shape_utils.h" @@ -37,7 +37,7 @@ #include "debug/data_dump/cpu_e2e_dump.h" #include "debug/env_config_parser.h" #ifdef MEM_REUSE_DEBUG -#include "backend/optimizer/mem_reuse/mem_reuse_checker.h" +#include "common/mem_reuse/mem_reuse_checker.h" #endif #ifdef ENABLE_DUMP_IR #include "debug/rdr/running_data_recorder.h" diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_kernel_runtime.h similarity index 96% rename from mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_kernel_runtime.h index e1e568fc2d..d82cb52a4b 100644 --- a/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.h +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_kernel_runtime.h @@ -22,9 +22,9 @@ #include #include #include "runtime/device/kernel_runtime.h" -#include "backend/session/kernel_graph.h" -#include "backend/session/session_basic.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/session_basic.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/any.h" #include "profiler/device/cpu/cpu_profiling.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_memory_manager.cc b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_memory_manager.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/cpu/cpu_memory_manager.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_memory_manager.cc index d31be80916..6d3833ecbb 100644 --- a/mindspore/ccsrc/runtime/device/cpu/cpu_memory_manager.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_memory_manager.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/device/cpu/cpu_memory_manager.h" +#include "plugin/device/cpu/hal/device/cpu_memory_manager.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_context.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_memory_manager.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_memory_manager.h similarity index 92% rename from mindspore/ccsrc/runtime/device/cpu/cpu_memory_manager.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_memory_manager.h index e0181a58d7..06dfb12082 100644 --- a/mindspore/ccsrc/runtime/device/cpu/cpu_memory_manager.h +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_memory_manager.h @@ -19,12 +19,12 @@ #include #include #include -#include "backend/session/kernel_graph.h" -#include "backend/session/session_basic.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/session_basic.h" #include "runtime/device/device_address.h" #include "runtime/device/memory_manager.h" -#include "runtime/device/cpu/cpu_simple_mem_plan.h" -#include "runtime/hardware/cpu/cpu_memory_pool.h" +#include "plugin/device/cpu/hal/device/cpu_simple_mem_plan.h" +#include "plugin/device/cpu/hal/hardware/cpu_memory_pool.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.cc b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_simple_mem_plan.cc similarity index 96% rename from mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_simple_mem_plan.cc index 78c63bac81..daa9fcbb23 100644 --- a/mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_simple_mem_plan.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/cpu/cpu_simple_mem_plan.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/cpu/hal/device/cpu_simple_mem_plan.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_simple_mem_plan.h similarity index 96% rename from mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_simple_mem_plan.h index 8fce841807..e00f5ca80c 100644 --- a/mindspore/ccsrc/runtime/device/cpu/cpu_simple_mem_plan.h +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_simple_mem_plan.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_CPU_CPU_SIMPLE_MEM_PLAN_H_ #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" #include "runtime/device/device_address.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_tensor_array.cc b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_tensor_array.cc similarity index 90% rename from mindspore/ccsrc/runtime/device/cpu/cpu_tensor_array.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_tensor_array.cc index a8749f8fbc..98e7f7eb1d 100644 --- a/mindspore/ccsrc/runtime/device/cpu/cpu_tensor_array.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_tensor_array.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "runtime/device/cpu/cpu_tensor_array.h" +#include "plugin/device/cpu/hal/device/cpu_tensor_array.h" #include #include #include -#include "runtime/hardware/cpu/cpu_memory_pool.h" +#include "plugin/device/cpu/hal/hardware/cpu_memory_pool.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_tensor_array.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_tensor_array.h similarity index 100% rename from mindspore/ccsrc/runtime/device/cpu/cpu_tensor_array.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/cpu_tensor_array.h diff --git a/mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.cc b/mindspore/ccsrc/plugin/device/cpu/hal/device/kernel_select_cpu.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/device/kernel_select_cpu.cc index 41202e9a2d..adfc559e89 100644 --- a/mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/kernel_select_cpu.cc @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "runtime/device/cpu/kernel_select_cpu.h" +#include "plugin/device/cpu/hal/device/kernel_select_cpu.h" #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/kernel_compiler/oplib/opinfo.h" -#include "backend/kernel_compiler/oplib/oplib.h" -#include "backend/kernel_compiler/cpu/pyfunc/py_func_cpu_kernel.h" -#include "backend/kernel_compiler/cpu/custom/custom_aot_cpu_kernel.h" -#include "backend/kernel_compiler/cpu/custom/custom_julia_cpu_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "kernel/kernel_build_info.h" +#include "kernel/oplib/opinfo.h" +#include "kernel/oplib/oplib.h" +#include "plugin/device/cpu/kernel/pyfunc/py_func_cpu_kernel.h" +#include "plugin/device/cpu/kernel/custom/custom_aot_cpu_kernel.h" +#include "plugin/device/cpu/kernel/custom/custom_julia_cpu_kernel.h" #include "utils/trace_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/kernel_select_cpu.h similarity index 100% rename from mindspore/ccsrc/runtime/device/cpu/kernel_select_cpu.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/kernel_select_cpu.h diff --git a/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.cc b/mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_adapter.cc similarity index 99% rename from mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_adapter.cc index ce34eacd86..d18b9197d4 100644 --- a/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_adapter.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/cpu/mpi/mpi_adapter.h" +#include "plugin/device/cpu/hal/device/mpi/mpi_adapter.h" #include #include #include diff --git a/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_adapter.h similarity index 100% rename from mindspore/ccsrc/runtime/device/cpu/mpi/mpi_adapter.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_adapter.h diff --git a/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_export.cc b/mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_export.cc similarity index 94% rename from mindspore/ccsrc/runtime/device/cpu/mpi/mpi_export.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_export.cc index 71ef5c70c6..4c9d37bb61 100644 --- a/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_export.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_export.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/cpu/mpi/mpi_export.h" +#include "plugin/device/cpu/hal/device/mpi/mpi_export.h" #include -#include "runtime/device/cpu/mpi/mpi_adapter.h" +#include "plugin/device/cpu/hal/device/mpi/mpi_adapter.h" extern "C" { int GetMPIRankId() { diff --git a/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_export.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_export.h similarity index 100% rename from mindspore/ccsrc/runtime/device/cpu/mpi/mpi_export.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_export.h diff --git a/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_interface.cc b/mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_interface.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/cpu/mpi/mpi_interface.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_interface.cc index 2071314606..4658be8eb1 100644 --- a/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_interface.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_interface.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/cpu/mpi/mpi_interface.h" +#include "plugin/device/cpu/hal/device/mpi/mpi_interface.h" #ifdef ENABLE_MPI #include #include diff --git a/mindspore/ccsrc/runtime/device/cpu/mpi/mpi_interface.h b/mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_interface.h similarity index 100% rename from mindspore/ccsrc/runtime/device/cpu/mpi/mpi_interface.h rename to mindspore/ccsrc/plugin/device/cpu/hal/device/mpi/mpi_interface.h diff --git a/mindspore/ccsrc/runtime/device/cpu/readme.md b/mindspore/ccsrc/plugin/device/cpu/hal/device/readme.md similarity index 100% rename from mindspore/ccsrc/runtime/device/cpu/readme.md rename to mindspore/ccsrc/plugin/device/cpu/hal/device/readme.md diff --git a/mindspore/ccsrc/plugin/device/cpu/hal/hardware/CMakeLists.txt b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/CMakeLists.txt new file mode 100644 index 0000000000..5f5763cebc --- /dev/null +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/CMakeLists.txt @@ -0,0 +1,26 @@ +if(ENABLE_CPU) + file(GLOB_RECURSE HARDWARE_CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + list(REMOVE_ITEM HARDWARE_CPU_SRC_LIST "mpi_collective_comm_lib.cc" "mpi_communication_group.cc") + + if(WIN32) + list(REMOVE_ITEM HARDWARE_CPU_SRC_LIST "ms_collective_comm_lib.cc") + endif() + if(ENABLE_MPI) + set(MPI_COLLECTIVE_SRCS "mpi_collective_comm_lib.cc" + "mpi_communication_group.cc" + ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/runtime/collective/collective_communication_lib.cc + ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/runtime/collective/communication_group.cc) + set_property(SOURCE ${MPI_COLLECTIVE_SRCS} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + add_library(mpi_collective SHARED ${MPI_COLLECTIVE_SRCS}) + target_link_libraries(mpi_collective PRIVATE mindspore::ompi) + endif() + + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-abstract-non-virtual-dtor") + endif() + + set_property(SOURCE ${HARDWARE_CPU_SRC_LIST} PROPERTY + COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + add_library(_mindspore_plugin_device_cpu_hal_hardware_obj OBJECT ${HARDWARE_CPU_SRC_LIST}) +endif() \ No newline at end of file diff --git a/mindspore/ccsrc/runtime/hardware/cpu/cpu_device_context.cc b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_device_context.cc similarity index 92% rename from mindspore/ccsrc/runtime/hardware/cpu/cpu_device_context.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_device_context.cc index 937ad13d57..4cc023aed5 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/cpu_device_context.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_device_context.cc @@ -14,28 +14,28 @@ * limitations under the License. */ -#include "runtime/hardware/cpu/cpu_device_context.h" +#include "plugin/device/cpu/hal/hardware/cpu_device_context.h" #include -#include "runtime/device/cpu/cpu_device_address.h" -#include "runtime/device/cpu/cpu_memory_manager.h" -#include "backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "runtime/device/cpu/kernel_select_cpu.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_memory_manager.h" +#include "plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "kernel/kernel_build_info.h" +#include "plugin/device/cpu/hal/device/kernel_select_cpu.h" #include "utils/trace_base.h" #include "utils/context/graph_kernel_flags.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" -#include "backend/optimizer/common/common_backend_optimization.h" -#include "backend/optimizer/cpu/insert_cast_cpu.h" -#include "backend/optimizer/cpu/insert_format_transform_op.h" -#include "backend/optimizer/pass/replace_node_by_proxy.h" -#include "backend/optimizer/pass/erase_visit_attr.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/optimizer/common_backend_optimization.h" +#include "plugin/device/cpu/optimizer/insert_cast_cpu.h" +#include "plugin/device/cpu/optimizer/insert_format_transform_op.h" +#include "backend/common/pass/replace_node_by_proxy.h" +#include "backend/common/pass/erase_visit_attr.h" +#include "common/graph_kernel/adapter/graph_kernel_optimization.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "profiler/device/cpu/cpu_profiling.h" #if ((defined ENABLE_CPU) && (!defined _WIN32)) -#include "runtime/hardware/cpu/ms_collective_comm_lib.h" +#include "plugin/device/cpu/hal/hardware/ms_collective_comm_lib.h" #endif #ifndef ENABLE_SECURITY #include "debug/data_dump/dump_json_parser.h" diff --git a/mindspore/ccsrc/runtime/hardware/cpu/cpu_device_context.h b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_device_context.h similarity index 100% rename from mindspore/ccsrc/runtime/hardware/cpu/cpu_device_context.h rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_device_context.h diff --git a/mindspore/ccsrc/runtime/hardware/cpu/cpu_memory_pool.cc b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_memory_pool.cc similarity index 97% rename from mindspore/ccsrc/runtime/hardware/cpu/cpu_memory_pool.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_memory_pool.cc index 82af0c4156..bb55124b07 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/cpu_memory_pool.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_memory_pool.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware/cpu/cpu_memory_pool.h" +#include "plugin/device/cpu/hal/hardware/cpu_memory_pool.h" #include #include "utils/log_adapter.h" #include "utils/convert_utils_base.h" diff --git a/mindspore/ccsrc/runtime/hardware/cpu/cpu_memory_pool.h b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_memory_pool.h similarity index 95% rename from mindspore/ccsrc/runtime/hardware/cpu/cpu_memory_pool.h rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_memory_pool.h index 96c1d8f828..58b39b069b 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/cpu_memory_pool.h +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/cpu_memory_pool.h @@ -19,7 +19,7 @@ #include #include "utils/ms_utils.h" -#include "backend/optimizer/mem_reuse/mem_dynamic_allocator.h" +#include "common/mem_reuse/mem_dynamic_allocator.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/cpu/mpi_collective_comm_lib.cc b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_collective_comm_lib.cc similarity index 97% rename from mindspore/ccsrc/runtime/hardware/cpu/mpi_collective_comm_lib.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_collective_comm_lib.cc index 347c564c4c..3a2b14ac05 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/mpi_collective_comm_lib.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_collective_comm_lib.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware/cpu/mpi_collective_comm_lib.h" +#include "plugin/device/cpu/hal/hardware/mpi_collective_comm_lib.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/cpu/mpi_collective_comm_lib.h b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_collective_comm_lib.h similarity index 96% rename from mindspore/ccsrc/runtime/hardware/cpu/mpi_collective_comm_lib.h rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_collective_comm_lib.h index 543e1eab01..ab347d3db6 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/mpi_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_collective_comm_lib.h @@ -21,8 +21,8 @@ #include #include #include -#include "runtime/hardware/collective/collective_communication_lib.h" -#include "runtime/hardware/cpu/mpi_communication_group.h" +#include "runtime/collective/collective_communication_lib.h" +#include "plugin/device/cpu/hal/hardware/mpi_communication_group.h" #ifndef EXPORT_MPI_WRAPPER #define EXPORT_MPI_WRAPPER __attribute__((visibility("default"))) diff --git a/mindspore/ccsrc/runtime/hardware/cpu/mpi_communication_group.cc b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_communication_group.cc similarity index 96% rename from mindspore/ccsrc/runtime/hardware/cpu/mpi_communication_group.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_communication_group.cc index c73421a901..fb0f147742 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/mpi_communication_group.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_communication_group.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware/cpu/mpi_communication_group.h" +#include "plugin/device/cpu/hal/hardware/mpi_communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/cpu/mpi_communication_group.h b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_communication_group.h similarity index 96% rename from mindspore/ccsrc/runtime/hardware/cpu/mpi_communication_group.h rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_communication_group.h index 3db1afed4c..7f9017e5a4 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/mpi_communication_group.h +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/mpi_communication_group.h @@ -21,7 +21,7 @@ #include #include #include -#include "runtime/hardware/collective/communication_group.h" +#include "runtime/collective/communication_group.h" #include "utils/dlopen_macro.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/hardware/cpu/ms_collective_comm_lib.cc b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_collective_comm_lib.cc similarity index 98% rename from mindspore/ccsrc/runtime/hardware/cpu/ms_collective_comm_lib.cc rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_collective_comm_lib.cc index a5693dcdbd..3b5b7fb4e8 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/ms_collective_comm_lib.cc +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_collective_comm_lib.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware/cpu/ms_collective_comm_lib.h" +#include "plugin/device/cpu/hal/hardware/ms_collective_comm_lib.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/cpu/ms_collective_comm_lib.h b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_collective_comm_lib.h similarity index 95% rename from mindspore/ccsrc/runtime/hardware/cpu/ms_collective_comm_lib.h rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_collective_comm_lib.h index dc1cd7dc5a..ffd75f3cf2 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/ms_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_collective_comm_lib.h @@ -20,8 +20,8 @@ #include #include #include -#include "runtime/hardware/collective/collective_communication_lib.h" -#include "runtime/hardware/cpu/ms_communication_group.h" +#include "runtime/collective/collective_communication_lib.h" +#include "plugin/device/cpu/hal/hardware/ms_communication_group.h" #include "distributed/cluster/cluster_context.h" #include "fl/server/collective_ops_impl.h" diff --git a/mindspore/ccsrc/runtime/hardware/cpu/ms_communication_group.h b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_communication_group.h similarity index 96% rename from mindspore/ccsrc/runtime/hardware/cpu/ms_communication_group.h rename to mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_communication_group.h index 8d4a4c1e79..0816b01742 100644 --- a/mindspore/ccsrc/runtime/hardware/cpu/ms_communication_group.h +++ b/mindspore/ccsrc/plugin/device/cpu/hal/hardware/ms_communication_group.h @@ -20,7 +20,7 @@ #include #include #include -#include "runtime/hardware/collective/communication_group.h" +#include "runtime/collective/communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/plugin/device/cpu/kernel/CMakeLists.txt b/mindspore/ccsrc/plugin/device/cpu/kernel/CMakeLists.txt new file mode 100644 index 0000000000..bc6fe671f7 --- /dev/null +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/CMakeLists.txt @@ -0,0 +1,60 @@ +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-abstract-non-virtual-dtor -Wno-overloaded-virtual") +endif() + +if(ENABLE_CPU) + file(GLOB CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "*.cc" + "eigen/*.cc" + "mkldnn/*.cc" + "fl/*.cc" + "ps/*.cc" + "pyfunc/*.cc" + "rl/*.cc" + "custom/*.cc" + "environ/*.cc" + ) + + if(NOT ENABLE_MPI) + list(REMOVE_ITEM CPU_SRC_LIST "allgather_cpu_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "reduce_scatter_cpu_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "embedding_look_up_comm_grad_cpu_kernel.cc") + endif() + + if(PLATFORM_ARM64) + add_compile_definitions(ENABLE_ARM) + endif() +endif() + +if(NOT ENABLE_CPU OR WIN32) + list(REMOVE_ITEM CPU_SRC_LIST "ps/apply_momentum_ps_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "ps/embedding_look_up_proxy_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "ps/embedding_look_up_ps_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "ps/pserver_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "ps/pull_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "ps/push_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "ps/sparse_apply_adam_ps_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "ps/sparse_apply_ftrl_ps_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "ps/sparse_apply_lazy_adam_ps_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "fl/fused_pull_weight_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "fl/fused_push_weight_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "fl/get_model_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "fl/start_fl_job_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "fl/update_model_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "fl/push_metrics_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "fl/get_keys_kernel.cc") + list(REMOVE_ITEM CPU_SRC_LIST "fl/exchange_keys_kernel.cc") +endif() + +if(ENABLE_AKG AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND ENABLE_CPU) + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fopenmp") + file(GLOB_RECURSE AKG_CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "akg/*.cc" + ) +endif() + +set_property(SOURCE ${CPU_SRC_LIST} ${AKG_CPU_SRC_LIST} + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_KERNEL) +if(ENABLE_CPU) + add_library(_mindspore_plugin_device_cpu_kernel_obj OBJECT ${CPU_SRC_LIST} ${AKG_CPU_SRC_LIST}) +endif() diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/OWNERS b/mindspore/ccsrc/plugin/device/cpu/kernel/OWNERS similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/OWNERS rename to mindspore/ccsrc/plugin/device/cpu/kernel/OWNERS diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/adam_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/adam_cpu_kernel.cc index c8dd23fc05..608a5bf850 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/adam_cpu_kernel.h" -#include "backend/kernel_compiler/cpu/nnacl/errorcode.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/adam_cpu_kernel.h" +#include "plugin/device/cpu/kernel/nnacl/errorcode.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/adam_fp32.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/adam_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/adam_cpu_kernel.h index 0cf73cd1a4..656a93b3fe 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_delta_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_delta_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/adam_delta_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/adam_delta_cpu_kernel.cc index b2d1674d53..1dbb86c36e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_delta_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_delta_cpu_kernel.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/adam_delta_cpu_kernel.h" +#include "plugin/device/cpu/kernel/adam_delta_cpu_kernel.h" #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/adam_fp32.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_delta_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_delta_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/adam_delta_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/adam_delta_cpu_kernel.h index 4c03fa6388..611bb76201 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_delta_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_delta_cpu_kernel.h @@ -19,8 +19,8 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_weight_decay_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_weight_decay_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/adam_weight_decay_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/adam_weight_decay_cpu_kernel.cc index 2b39b95535..c90b539ca1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_weight_decay_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_weight_decay_cpu_kernel.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/adam_weight_decay_cpu_kernel.h" +#include "plugin/device/cpu/kernel/adam_weight_decay_cpu_kernel.h" #include -#include "backend/kernel_compiler/cpu/nnacl/errorcode.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/nnacl/errorcode.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/adam_fp32.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_weight_decay_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_weight_decay_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/adam_weight_decay_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/adam_weight_decay_cpu_kernel.h index ef1357ccfc..16ccf33716 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/adam_weight_decay_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/adam_weight_decay_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.cc similarity index 86% rename from mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.cc index 03cf68b26c..57b073fd22 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.h" +#include "plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.h" #include #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/akg/cpu/akg_cpu_kernel_mod.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/kernel/akg/akg_cpu_kernel_mod.h" #include "utils/ms_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.h b/mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.h index c3e7d4491d..9acaf04de6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_AKG_CPU_AKG_CPU_KERNEL_BUILD_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_AKG_CPU_AKG_CPU_KERNEL_BUILD_H_ #include -#include "backend/kernel_compiler/akg/akg_kernel_build.h" +#include "kernel/akg/akg_kernel_build.h" #include "base/base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_mod.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_mod.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_mod.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_mod.cc index 9ad862bb3d..04bc58efd3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_mod.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/akg/cpu/akg_cpu_kernel_mod.h" +#include "plugin/device/cpu/kernel/akg/akg_cpu_kernel_mod.h" #include #include @@ -23,7 +23,7 @@ #include #include #include "nlohmann/json.hpp" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" #include "common/thread_pool.h" #include "utils/ms_utils.h" #include "mindspore/ccsrc/debug/common.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_mod.h b/mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_mod.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_mod.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_mod.h index c823a3fc34..7930ecb209 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_mod.h @@ -23,8 +23,8 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_mod.h" +#include "kernel/kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_mod.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/allgather_cpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/allgather_cpu_kernel.cc index 5e3efcca3f..ff3d995b44 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/allgather_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/allgather_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" -#include "runtime/device/cpu/mpi/mpi_interface.h" +#include "plugin/device/cpu/kernel/allgather_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/mpi/mpi_interface.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/allgather_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/allgather_cpu_kernel.h index e5e7390c77..c990d4162d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/allgather_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_adagrad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/apply_adagrad_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/apply_adagrad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/apply_adagrad_cpu_kernel.cc index 6bcb44f5d1..6ccd7694fe 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_adagrad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/apply_adagrad_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/apply_adagrad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/apply_adagrad_cpu_kernel.h" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_adagrad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/apply_adagrad_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/apply_adagrad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/apply_adagrad_cpu_kernel.h index 23e8496e5c..6a252e46a5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_adagrad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/apply_adagrad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/apply_momentum_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/apply_momentum_cpu_kernel.cc index 65a302dafa..fa19db7679 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/apply_momentum_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/apply_momentum_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/apply_momentum_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/apply_momentum_cpu_kernel.h index 69baece715..2d8a0c4e6b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/apply_momentum_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/argmax_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/argmax_cpu_kernel.cc index 7ee87cf518..12162fda87 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/argmax_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/argmax_cpu_kernel.h" +#include "plugin/device/cpu/kernel/argmax_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/argmax_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/argmax_cpu_kernel.h index 503372759c..2db14520ef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/argmax_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_with_value_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/argmax_with_value_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_with_value_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/argmax_with_value_cpu_kernel.cc index e0924a03cb..7bea85d460 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_with_value_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/argmax_with_value_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/argmax_with_value_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/argmax_with_value_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_with_value_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/argmax_with_value_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_with_value_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/argmax_with_value_cpu_kernel.h index 537ed2fb4d..aea3424710 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_with_value_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/argmax_with_value_cpu_kernel.h @@ -22,8 +22,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmin_with_value_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/argmin_with_value_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/argmin_with_value_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/argmin_with_value_cpu_kernel.cc index 9d53c89772..f69fbb87ef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmin_with_value_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/argmin_with_value_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/argmin_with_value_cpu_kernel.h" +#include "plugin/device/cpu/kernel/argmin_with_value_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmin_with_value_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/argmin_with_value_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/argmin_with_value_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/argmin_with_value_cpu_kernel.h index 720613d127..ddb9761991 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/argmin_with_value_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/argmin_with_value_cpu_kernel.h @@ -22,8 +22,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_cpu_kernel.cc index 676aa53915..0d6b12f334 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_cpu_kernel.cc @@ -14,17 +14,17 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/arithmetic_cpu_kernel.h" +#include "plugin/device/cpu/kernel/arithmetic_cpu_kernel.h" #include #include #include #include -#include "backend/kernel_compiler/cpu/nnacl/fp32/power_fp32.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32/sub_fp32.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32/mul_fp32.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/power_fp32.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/sub_fp32.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/mul_fp32.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_cpu_kernel.h index b26c5bc2c5..f39aa034a4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_cpu_kernel.h @@ -19,9 +19,9 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/nnacl/arithmetic.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/nnacl/arithmetic.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_logic_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_logic_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_logic_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_logic_cpu_kernel.cc index 15bc9606c2..919a4cbfd6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_logic_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_logic_cpu_kernel.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/arithmetic_logic_cpu_kernel.h" +#include "plugin/device/cpu/kernel/arithmetic_logic_cpu_kernel.h" #include #include #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_logic_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_logic_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_logic_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_logic_cpu_kernel.h index 7445aaba9e..045009b129 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_logic_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_logic_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_self_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_self_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_self_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_self_cpu_kernel.cc index 2427829744..dcc6261896 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_self_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_self_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/arithmetic_self_cpu_kernel.h" +#include "plugin/device/cpu/kernel/arithmetic_self_cpu_kernel.h" #include #include @@ -23,7 +23,7 @@ #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_self_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_self_cpu_kernel.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_self_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_self_cpu_kernel.h index 4843eaf66e..7881cd4506 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/arithmetic_self_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/arithmetic_self_cpu_kernel.h @@ -25,8 +25,8 @@ using complex64 = std::complex; using complex128 = std::complex; -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/assign_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/assign_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/assign_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/assign_cpu_kernel.cc index 371a80baf4..94f37690cc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/assign_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/assign_cpu_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/assign_cpu_kernel.h" +#include "plugin/device/cpu/kernel/assign_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/assign_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/assign_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/assign_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/assign_cpu_kernel.h index 444bd6506e..b1eb8cb633 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/assign_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/assign_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_cpu_kernel.cc index 40a32c634d..d97ae79392 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/bias_add_cpu_kernel.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32/add_fp32.h" -#include "backend/kernel_compiler/cpu/nnacl/errorcode.h" +#include "plugin/device/cpu/kernel/bias_add_cpu_kernel.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/add_fp32.h" +#include "plugin/device/cpu/kernel/nnacl/errorcode.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_cpu_kernel.h index b364948d5b..f5e6554868 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_grad_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_grad_cpu_kernel.cc index 85764037e4..02e54c82fd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32/reduce_fp32.h" -#include "backend/kernel_compiler/cpu/nnacl/errorcode.h" +#include "plugin/device/cpu/kernel/bias_add_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/reduce_fp32.h" +#include "plugin/device/cpu/kernel/nnacl/errorcode.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_grad_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_grad_cpu_kernel.h index 8c02711468..67d3735995 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/bias_add_grad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_cpu_kernel.cc index 534f979ad7..fd64c3b6de 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/binary_cross_entropy_cpu_kernel.h" +#include "plugin/device/cpu/kernel/binary_cross_entropy_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_cpu_kernel.h index e13dce9afe..1ceeda95ad 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_grad_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_grad_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_grad_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_grad_kernel.cc index 17fb25be54..c7f55f602e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_grad_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_grad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/binary_cross_entropy_grad_kernel.h" +#include "plugin/device/cpu/kernel/binary_cross_entropy_grad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_grad_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_grad_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_grad_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_grad_kernel.h index 5225f852cb..cb20d5ae2e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/binary_cross_entropy_grad_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/binary_cross_entropy_grad_kernel.h @@ -20,9 +20,9 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/binary_cross_entropy_cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/binary_cross_entropy_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_decode_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_decode_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_decode_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_decode_cpu_kernel.cc index 8d85a980c6..15caeba035 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_decode_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_decode_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/boundingbox_decode_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/boundingbox_decode_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_decode_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_decode_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_decode_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_decode_cpu_kernel.h index 305b7699bb..91fbbb08db 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_decode_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_decode_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_encode_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_encode_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_encode_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_encode_cpu_kernel.cc index 5ceed1bcf3..08c4ccb238 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_encode_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_encode_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/boundingbox_encode_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/boundingbox_encode_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_encode_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_encode_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_encode_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_encode_cpu_kernel.h index 09b9835253..80ca4b8c8a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/boundingbox_encode_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/boundingbox_encode_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/broadcast_to_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/broadcast_to_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/broadcast_to_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/broadcast_to_cpu_kernel.cc index 45779f61d0..36ce86369c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/broadcast_to_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/broadcast_to_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/broadcast_to_cpu_kernel.h" -#include "backend/kernel_compiler/cpu/nnacl/errorcode.h" +#include "plugin/device/cpu/kernel/broadcast_to_cpu_kernel.h" +#include "plugin/device/cpu/kernel/nnacl/errorcode.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/broadcast_to_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/broadcast_to_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/broadcast_to_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/broadcast_to_cpu_kernel.h index d4032617a1..63b4b5d604 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/broadcast_to_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/broadcast_to_cpu_kernel.h @@ -20,9 +20,9 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/nnacl/base/broadcast_to.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/nnacl/base/broadcast_to.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cast_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/cast_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cast_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/cast_cpu_kernel.cc index 0d95bfe064..eb5d150565 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cast_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cast_cpu_kernel.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/cast_cpu_kernel.h" +#include "plugin/device/cpu/kernel/cast_cpu_kernel.h" #include #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cast_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/cast_cpu_kernel.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cast_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/cast_cpu_kernel.h index d8a8cb6166..e5c4d4e728 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cast_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cast_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/check_valid_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/check_valid_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/check_valid_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/check_valid_cpu_kernel.cc index 02f466c02f..cbb02b7074 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/check_valid_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/check_valid_cpu_kernel.cc @@ -16,8 +16,8 @@ #include -#include "backend/kernel_compiler/cpu/check_valid_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/check_valid_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/check_valid_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/check_valid_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/check_valid_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/check_valid_cpu_kernel.h index b7f6b60c2e..895b5351f7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/check_valid_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/check_valid_cpu_kernel.h @@ -19,8 +19,8 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cholesky_inverse_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/cholesky_inverse_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cholesky_inverse_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/cholesky_inverse_cpu_kernel.cc index b39b2c4cef..021b59c8c6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cholesky_inverse_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cholesky_inverse_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/cholesky_inverse_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/cholesky_inverse_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cholesky_inverse_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/cholesky_inverse_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cholesky_inverse_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/cholesky_inverse_cpu_kernel.h index 7e4eee37d4..ff1fec2a3b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cholesky_inverse_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cholesky_inverse_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_CHOLESKYINVERSE_CPU_KERNEL_H_ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { constexpr size_t kInputNum = 1; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/coalesce_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/coalesce_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/coalesce_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/coalesce_cpu_kernel.cc index e335dfe7d0..fc31d40bdb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/coalesce_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/coalesce_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/coalesce_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/coalesce_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/coalesce_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/coalesce_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/coalesce_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/coalesce_cpu_kernel.h index 40a46bd5ff..37b583ede0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/coalesce_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/coalesce_cpu_kernel.h @@ -26,8 +26,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/concat_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/concat_cpu_kernel.cc index 6ede1f310d..8d49c52158 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/concat_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/concat_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/concat_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/concat_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/concat_cpu_kernel.h index 5b8fda87f6..77646d0c82 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/concat_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_offset_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/concat_offset_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/concat_offset_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/concat_offset_cpu_kernel.cc index d0c12185b9..2512b328f7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_offset_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/concat_offset_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/concat_offset_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/concat_offset_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_offset_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/concat_offset_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/concat_offset_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/concat_offset_cpu_kernel.h index d2892b6097..4934a306b0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/concat_offset_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/concat_offset_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel.cc index bb0be4ec92..6e349178d9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" #include #include #include #include "utils/profile.h" -#include "runtime/framework/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/actor_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel.h index 640a44e172..40aff16201 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel.h @@ -24,12 +24,12 @@ #include #include -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_mod.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_mod.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" #include "ir/anf.h" -#include "runtime/framework/graph_scheduler.h" +#include "runtime/graph_scheduler/graph_scheduler.h" #include "actor/actormgr.h" #include "common/thread_pool.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_factory.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_factory.cc index e70c31f253..2e7cbf2931 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_factory.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include #include #include #include "runtime/device/kernel_info.h" -#include "runtime/device/cpu/kernel_select_cpu.h" +#include "plugin/device/cpu/hal/device/kernel_select_cpu.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_factory.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_factory.h index 2075cb1f2b..413a851ce8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_factory.h @@ -24,9 +24,9 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/oplib/oplib.h" -#include "runtime/device/cpu/kernel_select_cpu.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "kernel/oplib/oplib.h" +#include "plugin/device/cpu/hal/device/kernel_select_cpu.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_mod.h b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_mod.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_mod.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_mod.h index b234569003..bce96e0ca6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_mod.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_CPU_KERNEL_MOD_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_CPU_KERNEL_MOD_H_ -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/crop_and_resize_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/crop_and_resize_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/crop_and_resize_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/crop_and_resize_cpu_kernel.cc index 79d50ce505..d92378742f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/crop_and_resize_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/crop_and_resize_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/crop_and_resize_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/crop_and_resize_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/crop_and_resize_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/crop_and_resize_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/crop_and_resize_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/crop_and_resize_cpu_kernel.h index 04501df14e..46c4a4530c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/crop_and_resize_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/crop_and_resize_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cross_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/cross_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cross_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/cross_cpu_kernel.cc index 2a6b49afc2..7b15061944 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cross_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cross_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/cross_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/cross_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace { const size_t kDataSizeThreshold = 4 * 1024; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cross_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/cross_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cross_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/cross_cpu_kernel.h index d6d59432bb..741db763b3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cross_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cross_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ctcloss_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ctcloss_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ctcloss_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ctcloss_cpu_kernel.cc index 71095bc6b6..af160b754c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ctcloss_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ctcloss_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ctcloss_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/ctcloss_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ctcloss_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ctcloss_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ctcloss_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ctcloss_cpu_kernel.h index aacb218f7b..94d0e82e3c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ctcloss_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ctcloss_cpu_kernel.h @@ -23,8 +23,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cummax_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/cummax_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cummax_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/cummax_cpu_kernel.cc index 6cdf24a15f..d283d27fa8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cummax_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cummax_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/cummax_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/cummax_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cummax_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/cummax_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cummax_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/cummax_cpu_kernel.h index e277f84335..c2b9b10e15 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cummax_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cummax_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cumsum_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/cumsum_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cumsum_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/cumsum_cpu_kernel.cc index 63d86aa78d..4bdc0c2f4b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cumsum_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cumsum_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/cumsum_cpu_kernel.h" +#include "plugin/device/cpu/kernel/cumsum_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cumsum_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/cumsum_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/cumsum_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/cumsum_cpu_kernel.h index 4873ea4dbf..1a2b0257ff 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cumsum_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/cumsum_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_aot_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_aot_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_aot_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_aot_cpu_kernel.cc index 08d5f91c32..3b35abe2b2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_aot_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_aot_cpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/custom/custom_aot_cpu_kernel.h" +#include "plugin/device/cpu/kernel/custom/custom_aot_cpu_kernel.h" #if !defined(_WIN32) && !defined(_WIN64) #include @@ -24,8 +24,8 @@ #include #include #include "abstract/utils.h" -#include "runtime/device/cpu/cpu_common.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/hal/device/cpu_common.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "utils/file_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_aot_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_aot_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_aot_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_aot_cpu_kernel.h index 2a2750a6b3..5ad8e56d10 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_aot_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_aot_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_julia_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_julia_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_julia_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_julia_cpu_kernel.cc index dce7a27216..bebdc61504 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_julia_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_julia_cpu_kernel.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/custom/custom_julia_cpu_kernel.h" +#include "plugin/device/cpu/kernel/custom/custom_julia_cpu_kernel.h" #include #include #include #include #include "abstract/utils.h" -#include "runtime/device/cpu/cpu_common.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/custom/julia_api.h" +#include "plugin/device/cpu/hal/device/cpu_common.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/custom/julia_api.h" #include "utils/file_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_julia_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_julia_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_julia_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_julia_cpu_kernel.h index f5ada468a4..226ffe9c03 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/custom_julia_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/custom_julia_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/julia_api.h b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/julia_api.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/custom/julia_api.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/custom/julia_api.h index e504ea15e6..61a4ea6d26 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/custom/julia_api.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/custom/julia_api.h @@ -26,7 +26,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/debug_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/debug_cpu_kernel.cc index 33d0fbd7b8..f80ca62840 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/debug_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/debug_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/debug_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/debug_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/debug_cpu_kernel.h index 846d8f6dce..20e7377cb5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/debug_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/depthtospace_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/depthtospace_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/depthtospace_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/depthtospace_cpu_kernel.cc index 95fe87fc96..6c28a23cef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/depthtospace_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/depthtospace_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/depthtospace_cpu_kernel.h" +#include "plugin/device/cpu/kernel/depthtospace_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/depthtospace_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/depthtospace_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/depthtospace_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/depthtospace_cpu_kernel.h index f80295e251..c8d7486074 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/depthtospace_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/depthtospace_cpu_kernel.h @@ -19,8 +19,8 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/dropout_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/dropout_cpu_kernel.cc index feb1d45b65..605179b760 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dropout_cpu_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/dropout_cpu_kernel.h" +#include "plugin/device/cpu/kernel/dropout_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/dropout_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/dropout_cpu_kernel.h index 6800ca8bc9..ab7878b3d4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dropout_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_grad_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/dropout_grad_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_grad_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/dropout_grad_kernel.cc index b945e021b8..3bd643cf70 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_grad_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dropout_grad_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/dropout_grad_kernel.h" +#include "plugin/device/cpu/kernel/dropout_grad_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32_grad/dropout_grad.h" +#include "plugin/device/cpu/kernel/nnacl/fp32_grad/dropout_grad.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_grad_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/dropout_grad_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_grad_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/dropout_grad_kernel.h index 63563a4c35..0d1c92bd7a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dropout_grad_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dropout_grad_kernel.h @@ -22,8 +22,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_assign_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_assign_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_assign_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_assign_cpu_kernel.cc index 4717d62d82..f7dc7cac3f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_assign_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_assign_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/dynamic_assign_cpu_kernel.h" +#include "plugin/device/cpu/kernel/dynamic_assign_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_assign_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_assign_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_assign_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_assign_cpu_kernel.h index ba20dc86d4..b04c9f46d0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_assign_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_assign_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_shape_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_shape_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_shape_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_shape_cpu_kernel.cc index 7e04c0bf78..05d15d5892 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_shape_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_shape_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/dynamic_shape_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/dynamic_shape_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_shape_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_shape_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_shape_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_shape_cpu_kernel.h index 811f08551d..31a8ae6a38 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_shape_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_shape_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_stitch_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_stitch_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_stitch_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_stitch_cpu_kernel.cc index f6ec37b2ca..66aa440931 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_stitch_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_stitch_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/dynamic_stitch_cpu_kernel.h" +#include "plugin/device/cpu/kernel/dynamic_stitch_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_stitch_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_stitch_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_stitch_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_stitch_cpu_kernel.h index 7383614cb6..8bf8fb694f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/dynamic_stitch_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/dynamic_stitch_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_cpu_kernel.cc index 1340dc280a..a4f75dcf98 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/cholesky_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/cholesky_cpu_kernel.h" #include -#include "backend/kernel_compiler/cpu/eigen/eigen_common_utils.h" +#include "plugin/device/cpu/kernel/eigen/eigen_common_utils.h" #include "utils/ms_utils.h" #include "Eigen/Cholesky" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_cpu_kernel.h index 51aeaa3108..84b8cfea90 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_cpu_kernel.h @@ -17,8 +17,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_CHOLESKY_CPU_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_CHOLESKY_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_solve_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_solve_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_solve_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_solve_cpu_kernel.cc index 040a0a48bd..ce6849e1b1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_solve_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_solve_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/cholesky_solve_cpu_kernel.h" -#include "backend/kernel_compiler/cpu/eigen/eigen_common_utils.h" +#include "plugin/device/cpu/kernel/eigen/cholesky_solve_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/eigen_common_utils.h" #include "Eigen/Cholesky" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_solve_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_solve_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_solve_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_solve_cpu_kernel.h index b82880ba23..99a0719e6d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/cholesky_solve_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/cholesky_solve_cpu_kernel.h @@ -17,8 +17,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_CHOLESKY_CPU_SOLVE_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_CHOLESKY_CPU_SOLVE_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eig_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eig_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eig_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eig_cpu_kernel.cc index 8030ecf122..2b4e6cffb2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eig_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eig_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/eig_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/eig_cpu_kernel.h" #include -#include "backend/kernel_compiler/cpu/eigen/eigen_common_utils.h" +#include "plugin/device/cpu/kernel/eigen/eigen_common_utils.h" #include "utils/ms_utils.h" #include "Eigen/Eigenvalues" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eig_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eig_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eig_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eig_cpu_kernel.h index c1b7179f58..22533b2ee7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eig_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eig_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eigen_common_utils.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eigen_common_utils.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eigen_common_utils.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eigen_common_utils.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eigh_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eigh_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eigh_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eigh_cpu_kernel.cc index 89f47c911c..db007806e0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eigh_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eigh_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/eigh_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/eigh_cpu_kernel.h" #include -#include "backend/kernel_compiler/cpu/eigen/eigen_common_utils.h" +#include "plugin/device/cpu/kernel/eigen/eigen_common_utils.h" #include "Eigen/Eigenvalues" #include "utils/ms_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eigh_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eigh_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eigh_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eigh_cpu_kernel.h index d1c693158e..c6e79d59be 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/eigh_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/eigh_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_cpu_kernel.cc index 6255a0c6df..b1ed073c4a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/lu_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/lu_cpu_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_cpu_kernel.h index f6a890e05b..5e59e78ad5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_EIGEN_LU_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_solve_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_solve_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_solve_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_solve_cpu_kernel.cc index c56a338014..64553ffd22 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_solve_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_solve_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/lu_solve_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/lu_solve_cpu_kernel.h" #include #include #include "utils/ms_utils.h" -#include "backend/kernel_compiler/cpu/eigen/eigen_common_utils.h" +#include "plugin/device/cpu/kernel/eigen/eigen_common_utils.h" #include "Eigen/Dense" #include "Eigen/LU" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_solve_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_solve_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_solve_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_solve_cpu_kernel.h index b8943b8093..71ef2868b4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/lu_solve_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/lu_solve_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matmul_double_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matmul_double_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matmul_double_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matmul_double_cpu_kernel.cc index c1e4a037cc..ae96d0c06f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matmul_double_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matmul_double_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/matmul_double_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/matmul_double_cpu_kernel.h" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matmul_double_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matmul_double_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matmul_double_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matmul_double_cpu_kernel.h index 03326e1162..ea516e86e3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matmul_double_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matmul_double_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_EIGEN_MATMUL_DOUBLE_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matrix_inverse_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matrix_inverse_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matrix_inverse_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matrix_inverse_cpu_kernel.cc index 7e23a4c54e..2e9568cfda 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matrix_inverse_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matrix_inverse_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/matrix_inverse_cpu_kernel.h" -#include "backend/kernel_compiler/cpu/eigen/eigen_common_utils.h" +#include "plugin/device/cpu/kernel/eigen/matrix_inverse_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/eigen_common_utils.h" #include "Eigen/Dense" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matrix_inverse_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matrix_inverse_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matrix_inverse_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matrix_inverse_cpu_kernel.h index fe827fff1a..7e51b98bd5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/matrix_inverse_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/matrix_inverse_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_MATRIX_INVERSE_CPU_KERNEL_H #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/qr_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/qr_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/qr_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/qr_cpu_kernel.cc index bfcd61cc2b..a4376f171c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/qr_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/qr_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/qr_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/qr_cpu_kernel.h" #include #include "Eigen/Dense" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/qr_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/qr_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/qr_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/qr_cpu_kernel.h index d73f283f38..f2273bc0e1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/qr_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/qr_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_EIGEN_QR_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/solve_triangular_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/solve_triangular_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/solve_triangular_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/solve_triangular_cpu_kernel.cc index e59b6dd127..e0c844e762 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/solve_triangular_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/solve_triangular_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eigen/solve_triangular_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eigen/solve_triangular_cpu_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/solve_triangular_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/solve_triangular_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/solve_triangular_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eigen/solve_triangular_cpu_kernel.h index 638316e20e..8829e701af 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eigen/solve_triangular_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eigen/solve_triangular_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_EIGEN_SOLVE_TRIANGULAR_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/eltwise_grad_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/eltwise_grad_cpu_kernel.cc index 4543993927..0a30ab6605 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eltwise_grad_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/eltwise_grad_cpu_kernel.h" #include #include #include "common/thread_pool.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "nnacl/fp32_grad/activation_grad.h" #include "nnacl/fp32_grad/arithmetic_grad.h" #include "nnacl/errorcode.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/eltwise_grad_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/eltwise_grad_cpu_kernel.h index a90b4dadb6..7881752c6b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/eltwise_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/eltwise_grad_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include "mindspore/core/ir/dtype/type_id.h" -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" using complex64 = std::complex; using complex128 = std::complex; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/elu_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/elu_grad_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/elu_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/elu_grad_cpu_kernel.cc index 4a790f2cb0..a910363b02 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/elu_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/elu_grad_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/elu_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/elu_grad_cpu_kernel.h" #include #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/elu_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/elu_grad_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/elu_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/elu_grad_cpu_kernel.h index 963a1e6a32..59aeb96085 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/elu_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/elu_grad_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_comm_grad_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_comm_grad_cpu_kernel.cc index eebf24eef2..e171245e03 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_comm_grad_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/embedding_look_up_comm_grad_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" -#include "runtime/device/cpu/mpi/mpi_interface.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/mpi/mpi_interface.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_comm_grad_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_comm_grad_cpu_kernel.h index 8e80b39a13..f3b08ded06 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_comm_grad_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.cc index 2f1b1bd738..4e46790515 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h" +#include "plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "ir/primitive.h" #include "common/thread_pool.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.h index 6b99472688..17f4cb4867 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_create.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_create.cc similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_create.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_create.cc index 1c36b9c751..097f32ce8a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_create.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_create.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/environ/environ_cpu_create.h" -#include "backend/kernel_compiler/environ_manager.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/cpu/kernel/environ/environ_cpu_create.h" +#include "kernel/environ_manager.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_create.h b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_create.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_create.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_create.h index 6ca98ab6a3..40a481cc47 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_create.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_create.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_destroy_all.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_destroy_all.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_destroy_all.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_destroy_all.cc index cd86c14ac3..6a0cb2a718 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_destroy_all.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_destroy_all.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/environ/environ_cpu_destroy_all.h" -#include "backend/kernel_compiler/environ_manager.h" +#include "plugin/device/cpu/kernel/environ/environ_cpu_destroy_all.h" +#include "kernel/environ_manager.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_destroy_all.h b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_destroy_all.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_destroy_all.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_destroy_all.h index 5b00872131..96813fc8d8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_destroy_all.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_destroy_all.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_get.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_get.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_get.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_get.cc index f292a96994..e088c64f86 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_get.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_get.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/environ/environ_cpu_get.h" -#include "backend/kernel_compiler/environ_manager.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/cpu/kernel/environ/environ_cpu_get.h" +#include "kernel/environ_manager.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_get.h b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_get.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_get.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_get.h index 3614e37acf..f5f0dcfaf7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_get.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_get.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_set.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_set.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_set.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_set.cc index db5181aae0..d12cd36e28 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_set.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_set.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/environ/environ_cpu_set.h" -#include "backend/kernel_compiler/environ_manager.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/hardware/cpu/cpu_memory_pool.h" +#include "plugin/device/cpu/kernel/environ/environ_cpu_set.h" +#include "kernel/environ_manager.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/hardware/cpu_memory_pool.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_set.h b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_set.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_set.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_set.h index bb9bf28451..a178cb076a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/environ/environ_cpu_set.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/environ/environ_cpu_set.h @@ -19,8 +19,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/equal_count_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/equal_count_cpu_kernel.cc index 8b64b39aee..1abfc7d0d2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/equal_count_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/equal_count_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/equal_count_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/equal_count_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/equal_count_cpu_kernel.h index 617d3e6be6..b5a4aec9e5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/equal_count_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/expm1_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/expm1_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/expm1_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/expm1_cpu_kernel.cc index 3a612a585a..2fcbba5500 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/expm1_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/expm1_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/expm1_cpu_kernel.h" +#include "plugin/device/cpu/kernel/expm1_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/expm1_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/expm1_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/expm1_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/expm1_cpu_kernel.h index 5b18582b2b..85a7460c3a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/expm1_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/expm1_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_EXPM1_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/exchange_keys_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/exchange_keys_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/exchange_keys_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/exchange_keys_kernel.cc index b4e3ef009e..b1dfc8db76 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/exchange_keys_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/exchange_keys_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fl/exchange_keys_kernel.h" +#include "plugin/device/cpu/kernel/fl/exchange_keys_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/exchange_keys_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/exchange_keys_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/exchange_keys_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/exchange_keys_kernel.h index 7750e391a5..bad2231c9e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/exchange_keys_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/exchange_keys_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "fl/worker/fl_worker.h" #include "fl/armour/secure_protocol/key_agreement.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_pull_weight_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_pull_weight_kernel.cc index 213f5ce1d7..83dcf07506 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_pull_weight_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.h" +#include "plugin/device/cpu/kernel/fl/fused_pull_weight_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_pull_weight_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_pull_weight_kernel.h index b24b42d922..d56290c934 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_pull_weight_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_pull_weight_kernel.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "schema/fl_job_generated.h" #include "ps/ps_context.h" #include "fl/worker/fl_worker.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_push_weight_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_push_weight_kernel.cc index dea6bbb42f..54c1c78806 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_push_weight_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.h" +#include "plugin/device/cpu/kernel/fl/fused_push_weight_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_push_weight_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_push_weight_kernel.h index d693eedb64..936ea2cd7c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/fused_push_weight_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/fused_push_weight_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "ps/ps_context.h" #include "fl/worker/fl_worker.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_keys_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_keys_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_keys_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_keys_kernel.cc index d51d14067f..1dd58c1648 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_keys_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_keys_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fl/get_keys_kernel.h" +#include "plugin/device/cpu/kernel/fl/get_keys_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_keys_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_keys_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_keys_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_keys_kernel.h index f17460fccd..2d36bcbf05 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_keys_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_keys_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "fl/worker/fl_worker.h" #include "fl/armour/secure_protocol/key_agreement.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_model_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_model_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_model_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_model_kernel.cc index 0c08588ea7..27ad4dde9c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_model_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_model_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fl/get_model_kernel.h" +#include "plugin/device/cpu/kernel/fl/get_model_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_model_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_model_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_model_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_model_kernel.h index 9f968c3598..8f18b77f5b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/get_model_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/get_model_kernel.h @@ -23,8 +23,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "fl/worker/fl_worker.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/push_metrics_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/push_metrics_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/push_metrics_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/push_metrics_kernel.cc index 5629f57bf9..dc798380f6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/push_metrics_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/push_metrics_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fl/push_metrics_kernel.h" +#include "plugin/device/cpu/kernel/fl/push_metrics_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/push_metrics_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/push_metrics_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/push_metrics_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/push_metrics_kernel.h index f7bd6734f2..3e1a1c0d0e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/push_metrics_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/push_metrics_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "fl/worker/fl_worker.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/start_fl_job_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/start_fl_job_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/start_fl_job_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/start_fl_job_kernel.cc index e8ad69019c..cc4732f5c3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/start_fl_job_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/start_fl_job_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fl/start_fl_job_kernel.h" +#include "plugin/device/cpu/kernel/fl/start_fl_job_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/start_fl_job_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/start_fl_job_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/start_fl_job_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/start_fl_job_kernel.h index c8b2df38d4..499053a3d7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/start_fl_job_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/start_fl_job_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "fl/worker/fl_worker.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/update_model_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/update_model_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/update_model_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/update_model_kernel.cc index 392bd659fe..d6cd492f23 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/update_model_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/update_model_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fl/update_model_kernel.h" +#include "plugin/device/cpu/kernel/fl/update_model_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/update_model_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/update_model_kernel.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fl/update_model_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fl/update_model_kernel.h index 14b96188f7..735af4d650 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fl/update_model_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fl/update_model_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "fl/worker/fl_worker.h" #include "fl/armour/secure_protocol/masking.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fused_ada_factor_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fused_ada_factor_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fused_ada_factor_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fused_ada_factor_cpu_kernel.cc index c13cf39526..1eeed6965d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fused_ada_factor_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fused_ada_factor_cpu_kernel.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fused_ada_factor_cpu_kernel.h" +#include "plugin/device/cpu/kernel/fused_ada_factor_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fused_ada_factor_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fused_ada_factor_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fused_ada_factor_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fused_ada_factor_cpu_kernel.h index a5de42dd78..0ca6248a2a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fused_ada_factor_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fused_ada_factor_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fused_cast_adam_weight_decay_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/fused_cast_adam_weight_decay_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fused_cast_adam_weight_decay_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/fused_cast_adam_weight_decay_cpu_kernel.cc index 0c10d0e155..c055c734b8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fused_cast_adam_weight_decay_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fused_cast_adam_weight_decay_cpu_kernel.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/fused_cast_adam_weight_decay_cpu_kernel.h" +#include "plugin/device/cpu/kernel/fused_cast_adam_weight_decay_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "nnacl/fp32/adam_fp32.h" #include "utils/ms_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/fused_cast_adam_weight_decay_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/fused_cast_adam_weight_decay_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/fused_cast_adam_weight_decay_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/fused_cast_adam_weight_decay_cpu_kernel.h index 603993ae2f..5b0ef54645 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/fused_cast_adam_weight_decay_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/fused_cast_adam_weight_decay_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/gather_cpu_kernel.cc index 420d673738..addee7f6c5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/gather_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/gather_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "nnacl/gather_parameter.h" #include "nnacl/base/gather_base.h" #include "common/thread_pool.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/gather_cpu_kernel.h index f6c4db4b5c..d9e9f85cfa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_cpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/nnacl/base/gather_base.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/nnacl/base/gather_base.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_cpu_kernel.cc index c061e98ecc..1d295ded9e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/gather_d_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/gather_d_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_cpu_kernel.h index e9108d25ee..207a106c09 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_GATHER_D_CPU_KERNEL_H_ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_grad_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_grad_cpu_kernel.cc index 4873e8f5fb..e8b15747ef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_grad_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/gather_d_grad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/gather_d_grad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_grad_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_grad_cpu_kernel.h index beb3ece83f..52ca5e07c0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/gather_d_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/gather_d_grad_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/gathernd_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/gathernd_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/gathernd_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/gathernd_cpu_kernel.cc index df20c764e6..410982873f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/gathernd_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/gathernd_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/gathernd_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/gathernd_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/gathernd_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/gathernd_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/gathernd_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/gathernd_cpu_kernel.h index dd2f5dcf08..207de09be9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/gathernd_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/gathernd_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_cpu_kernel.cc index 8eca39ce53..2200c6bc6f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/grid_sampler_3d_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/grid_sampler_3d_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace { const size_t kDataSizeThreshold = 64 * 1024; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_cpu_kernel.h index d4814ddc9b..06c2d2439d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_grad_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_grad_cpu_kernel.cc index 1d9ccaf822..55e2a5049a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_grad_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/grid_sampler_3d_grad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/grid_sampler_3d_grad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace { const size_t kDataSizeThreshold = 64 * 1024; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_grad_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_grad_cpu_kernel.h index c3854484b2..7423576eee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/grid_sampler_3d_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/grid_sampler_3d_grad_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_cpu_kernel.cc index f4364d1fdb..0b7ec2f5d6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/hsigmoid_cpu_kernel.h" +#include "plugin/device/cpu/kernel/hsigmoid_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_cpu_kernel.h index 2688b0f682..881de68bf2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_grad_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_grad_cpu_kernel.cc index d425d1894d..c4e6ca0a9f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/hsigmoid_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/hsigmoid_grad_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_grad_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_grad_cpu_kernel.h index 86c9ba2554..8d0ce719aa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsigmoid_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hsigmoid_grad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsv_to_rgb_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/hsv_to_rgb_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hsv_to_rgb_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/hsv_to_rgb_cpu_kernel.cc index 0b2339d2aa..a74e6f6a76 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsv_to_rgb_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hsv_to_rgb_cpu_kernel.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/hsv_to_rgb_cpu_kernel.h" +#include "plugin/device/cpu/kernel/hsv_to_rgb_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsv_to_rgb_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/hsv_to_rgb_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hsv_to_rgb_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/hsv_to_rgb_cpu_kernel.h index c75ef2c795..b16de53975 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hsv_to_rgb_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hsv_to_rgb_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_HSV_TO_RGB_CPU_KERNEL_H_ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/hswish_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/hswish_cpu_kernel.cc index ae86ba14da..4f9c69f7d1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hswish_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/hswish_cpu_kernel.h" +#include "plugin/device/cpu/kernel/hswish_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/hswish_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/hswish_cpu_kernel.h index f7b540a0b6..df1e32ff82 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hswish_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/hswish_grad_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/hswish_grad_cpu_kernel.cc index e423381fd7..3b259071f3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hswish_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/hswish_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/hswish_grad_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/hswish_grad_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/hswish_grad_cpu_kernel.h index aa40527e93..da8aa5ad13 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/hswish_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/hswish_grad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/iou_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/iou_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/iou_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/iou_cpu_kernel.cc index 77d9bb8757..8d65d3720c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/iou_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/iou_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/iou_cpu_kernel.h" +#include "plugin/device/cpu/kernel/iou_cpu_kernel.h" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/iou_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/iou_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/iou_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/iou_cpu_kernel.h index ecd61e69a9..6264d2b52c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/iou_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/iou_cpu_kernel.h @@ -18,8 +18,8 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/isfinite_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/isfinite_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/isfinite_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/isfinite_cpu_kernel.cc index 1c21a47227..d8817d24b8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/isfinite_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/isfinite_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/isfinite_cpu_kernel.h" +#include "plugin/device/cpu/kernel/isfinite_cpu_kernel.h" #include #include "abstract/utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/isfinite_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/isfinite_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/isfinite_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/isfinite_cpu_kernel.h index 334ef63569..d97b1d9c35 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/isfinite_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/isfinite_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/isinf_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/isinf_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/isinf_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/isinf_cpu_kernel.cc index c970c72682..74a72b17fd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/isinf_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/isinf_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/isinf_cpu_kernel.h" +#include "plugin/device/cpu/kernel/isinf_cpu_kernel.h" #include #include "abstract/utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/isinf_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/isinf_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/isinf_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/isinf_cpu_kernel.h index 8d0f73284d..17b264fe68 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/isinf_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/isinf_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/isnan_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/isnan_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/isnan_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/isnan_cpu_kernel.cc index 8335d5417a..e09b2cc7ea 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/isnan_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/isnan_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/isnan_cpu_kernel.h" +#include "plugin/device/cpu/kernel/isnan_cpu_kernel.h" #include #include "abstract/utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/isnan_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/isnan_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/isnan_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/isnan_cpu_kernel.h index 74227df39c..283504c6c0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/isnan_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/isnan_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2_normalize_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/l2_normalize_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/l2_normalize_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/l2_normalize_cpu_kernel.cc index 4a4f6637ed..54bf5aca8f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2_normalize_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/l2_normalize_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/l2_normalize_cpu_kernel.h" +#include "plugin/device/cpu/kernel/l2_normalize_cpu_kernel.h" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2_normalize_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/l2_normalize_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/l2_normalize_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/l2_normalize_cpu_kernel.h index b3cf6a29ae..ad26de9d2c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2_normalize_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/l2_normalize_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2loss_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/l2loss_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/l2loss_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/l2loss_cpu_kernel.cc index caa72749ec..c800a6e95b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2loss_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/l2loss_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/l2loss_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/l2loss_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2loss_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/l2loss_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/l2loss_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/l2loss_cpu_kernel.h index 075e9eea80..dab4c6c46b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2loss_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/l2loss_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2normalize_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/l2normalize_grad_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/l2normalize_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/l2normalize_grad_cpu_kernel.cc index 6204dab300..3bd0bf7bd2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2normalize_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/l2normalize_grad_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/l2normalize_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/l2normalize_grad_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2normalize_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/l2normalize_grad_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/l2normalize_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/l2normalize_grad_cpu_kernel.h index 51c69ac67c..cb57610e7f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/l2normalize_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/l2normalize_grad_cpu_kernel.h @@ -19,8 +19,8 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_cpu_kernel.cc index 163542ad88..c41d739868 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/layer_norm_cpu_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/layer_norm_cpu_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_cpu_kernel.h index c20db24a14..6fe4a00c75 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_grad_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_grad_cpu_kernel.cc index 565bfc3eb2..db8433f542 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/layer_norm_grad_cpu_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/layer_norm_grad_cpu_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_grad_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_grad_cpu_kernel.h index e82ed7a5c7..30b98f1ad4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/layer_norm_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/layer_norm_grad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/log_matrix_determinant_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/log_matrix_determinant_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/log_matrix_determinant_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/log_matrix_determinant_cpu_kernel.cc index 9bf060e968..5f7bd35bd0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/log_matrix_determinant_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/log_matrix_determinant_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/log_matrix_determinant_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/log_matrix_determinant_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "Eigen/LU" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/log_matrix_determinant_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/log_matrix_determinant_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/log_matrix_determinant_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/log_matrix_determinant_cpu_kernel.h index d6f824ad2f..24458b9af8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/log_matrix_determinant_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/log_matrix_determinant_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/lower_bound_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/lower_bound_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/lower_bound_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/lower_bound_cpu_kernel.cc index 42ce7e225d..9c22b9668f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/lower_bound_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/lower_bound_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/lower_bound_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/lower_bound_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace { size_t kDataSizeThreshold_ = 4 * 1024; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/lower_bound_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/lower_bound_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/lower_bound_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/lower_bound_cpu_kernel.h index 49c4992e64..2bda564839 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/lower_bound_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/lower_bound_cpu_kernel.h @@ -18,8 +18,8 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/lstsq_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/lstsq_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/lstsq_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/lstsq_cpu_kernel.cc index 700b3ff33d..50c803ef9e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/lstsq_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/lstsq_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/lstsq_cpu_kernel.h" +#include "plugin/device/cpu/kernel/lstsq_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/lstsq_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/lstsq_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/lstsq_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/lstsq_cpu_kernel.h index 715251dd1f..9020eb3845 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/lstsq_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/lstsq_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/lu_solve_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/lu_solve_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/lu_solve_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/lu_solve_cpu_kernel.cc index afff6c5370..93642b87f6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/lu_solve_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/lu_solve_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/lu_solve_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/lu_solve_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/lu_solve_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/lu_solve_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/lu_solve_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/lu_solve_cpu_kernel.h index bed1750f39..f09a3b352c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/lu_solve_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/lu_solve_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { constexpr size_t kInputNum = 3; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/map_cache_idx_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/map_cache_idx_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/map_cache_idx_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/map_cache_idx_cpu_kernel.cc index 281bfa654e..47514025bd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/map_cache_idx_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/map_cache_idx_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/map_cache_idx_cpu_kernel.h" +#include "plugin/device/cpu/kernel/map_cache_idx_cpu_kernel.h" #include #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/cache_embedding_hashmap_struct.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/map_cache_idx_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/map_cache_idx_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/map_cache_idx_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/map_cache_idx_cpu_kernel.h index e7a0209a17..3e255b2ad3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/map_cache_idx_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/map_cache_idx_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/map_uniform_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/map_uniform_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/map_uniform_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/map_uniform_cpu_kernel.cc index 0941d24bb1..3fed7ff995 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/map_uniform_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/map_uniform_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/map_uniform_cpu_kernel.h" +#include "plugin/device/cpu/kernel/map_uniform_cpu_kernel.h" #include #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/map_uniform_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/map_uniform_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/map_uniform_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/map_uniform_cpu_kernel.h index 425131db8e..04e6005e2a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/map_uniform_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/map_uniform_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_cpu_kernel.cc index 2b3fa79cfb..fd0284a01d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/masked_select_cpu_kernel.h" +#include "plugin/device/cpu/kernel/masked_select_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_cpu_kernel.h index d6d9c52220..58242d629c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_cpu_kernel.h @@ -19,8 +19,8 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_grad_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_grad_cpu_kernel.cc index d9ed35c4d5..5c1b3cf99b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_grad_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/masked_select_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/masked_select_grad_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_grad_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_grad_cpu_kernel.h index ff8665ba78..ece38359e7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/masked_select_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/masked_select_grad_cpu_kernel.h @@ -19,8 +19,8 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_band_part_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_band_part_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_band_part_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_band_part_cpu_kernel.cc index 3e0084c23a..594b48b2d1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_band_part_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_band_part_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/matrix_band_part_cpu_kernel.h" +#include "plugin/device/cpu/kernel/matrix_band_part_cpu_kernel.h" #include #include "utils/ms_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_band_part_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_band_part_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_band_part_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_band_part_cpu_kernel.h index 0e27132863..4fef17a5cb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_band_part_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_band_part_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_EIGEN_MATRIX_BAND_PART_H #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_determinant_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_determinant_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_determinant_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_determinant_cpu_kernel.cc index c8d728cf1d..ca6263dbc4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_determinant_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_determinant_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/matrix_determinant_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/matrix_determinant_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "Eigen/Core" #include "Eigen/LU" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_determinant_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_determinant_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_determinant_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_determinant_cpu_kernel.h index b71e1d8e70..13fb1497a5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_determinant_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_determinant_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_diag_part_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_diag_part_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_diag_part_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_diag_part_cpu_kernel.cc index 5250622808..9eacb67876 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_diag_part_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_diag_part_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/matrix_diag_part_cpu_kernel.h" +#include "plugin/device/cpu/kernel/matrix_diag_part_cpu_kernel.h" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_diag_part_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_diag_part_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_diag_part_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_diag_part_cpu_kernel.h index 5971fee220..9d8434e12e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_diag_part_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_diag_part_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_inverse_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_inverse_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_inverse_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_inverse_cpu_kernel.cc index 3b7fe77519..a7d682b463 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_inverse_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_inverse_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/matrix_inverse_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/matrix_inverse_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "Eigen/Core" #include "Eigen/LU" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_inverse_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_inverse_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_inverse_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_inverse_cpu_kernel.h index d4c062a7b0..e9734bc1dc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_inverse_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_inverse_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_set_diag_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_set_diag_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_set_diag_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_set_diag_cpu_kernel.cc index 28371e2b27..9dd9835047 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_set_diag_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_set_diag_cpu_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/matrix_set_diag_cpu_kernel.h" +#include "plugin/device/cpu/kernel/matrix_set_diag_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_set_diag_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_set_diag_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_set_diag_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/matrix_set_diag_cpu_kernel.h index 261860f08b..45f0e05646 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/matrix_set_diag_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/matrix_set_diag_cpu_kernel.h @@ -22,9 +22,9 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { class MatrixSetDiagCpuKernelMod : public NativeCpuKernelMod { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/maximum_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/maximum_cpu_kernel.cc index 4117ebb111..ce88b34d87 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/maximum_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/maximum_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/maximum_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/maximum_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/maximum_cpu_kernel.h index 9ffcceaabe..dd4a07ce13 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/maximum_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_MAXIMUM_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/maximum_grad_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/maximum_grad_cpu_kernel.cc index d59ad9e279..5f4ec0f23e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/maximum_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/maximum_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/maximum_grad_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/maximum_grad_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/maximum_grad_cpu_kernel.h index 01d3e96f05..9cb00dc889 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/maximum_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/maximum_grad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/minimum_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/minimum_cpu_kernel.cc index e18b37798d..0dc6a34172 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/minimum_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/minimum_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/minimum_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/minimum_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/minimum_cpu_kernel.h index 02f596bd19..84ed45e21d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/minimum_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_MINIMUM_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/minimum_grad_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/minimum_grad_cpu_kernel.cc index 249c809d43..a15a21452f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/minimum_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/minimum_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/minimum_grad_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/minimum_grad_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/minimum_grad_cpu_kernel.h index ee59f801c1..8fba88f125 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/minimum_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/minimum_grad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_cpu_kernel.cc index e5a68fcc96..86185b4971 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mirror_pad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/mirror_pad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_cpu_kernel.h index 6e1ee8721c..52cc3d78dd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_grad_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_grad_cpu_kernel.cc index a58a638413..0074bc83cc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_grad_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mirror_pad_grad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/mirror_pad_grad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_grad_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_grad_cpu_kernel.h index 57b1e40ae6..9d5a6559fb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mirror_pad_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mirror_pad_grad_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { class MirrorPadGradCpuKernelMod : public NativeCpuKernelMod { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/addn_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/addn_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/addn_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/addn_cpu_kernel.cc index e7a9309acd..696aeb5a7b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/addn_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/addn_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/addn_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32/add_fp32.h" -#include "backend/kernel_compiler/cpu/nnacl/errorcode.h" +#include "plugin/device/cpu/kernel/mkldnn/addn_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/add_fp32.h" +#include "plugin/device/cpu/kernel/nnacl/errorcode.h" #include "utils/ms_utils.h" #include "common/thread_pool.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/addn_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/addn_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/addn_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/addn_cpu_kernel.h index 32e19841f5..707467b8bf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/addn_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/addn_cpu_kernel.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_ADDN_CPU_KERNEL_H_ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/assignadd_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/assignadd_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/assignadd_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/assignadd_cpu_kernel.cc index 9712bc1b5c..6da458daec 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/assignadd_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/assignadd_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/assignadd_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/mkldnn/assignadd_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/assignadd_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/assignadd_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/assignadd_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/assignadd_cpu_kernel.h index 989f2a317e..9bff8e6371 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/assignadd_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/assignadd_cpu_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_cpu_kernel.cc index a7828285db..67ece67ef4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/batch_norm_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/mkldnn/batch_norm_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_cpu_kernel.h index bced14f565..e2468d4b46 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_cpu_kernel.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_BATCH_NORM_CPU_KERNEL_H_ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_grad_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_grad_cpu_kernel.cc index d2b16f7c76..a3dfd824a0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_grad_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/batch_norm_grad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/mkldnn/batch_norm_grad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_grad_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_grad_cpu_kernel.h index 8eb8a2d79e..4e52eb86f7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/batch_norm_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/batch_norm_grad_cpu_kernel.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_BATCH_NORM_GRAD_CPU_KERNEL_H_ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_filter_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_filter_cpu_kernel.cc index c83ffb0967..1ecc7c590d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_filter_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/conv2d_grad_filter_cpu_kernel.h" #include #include #include "utils/ms_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_filter_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_filter_cpu_kernel.h index 24100c26f7..a8ad65c2ba 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_filter_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_input_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_input_cpu_kernel.cc index 6b3adbc003..84a7fabc7b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_input_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/conv2d_grad_input_cpu_kernel.h" #include #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_input_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_input_cpu_kernel.h index a90eecfcf1..300b212487 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv2d_grad_input_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv_cpu_kernel.cc index 48bb3ffbf9..fdd947e828 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/conv_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/conv_cpu_kernel.h" #include #include #include "utils/ms_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv_cpu_kernel.h index 8b43836e3d..f0789b34f9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/conv_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/eltwise_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/eltwise_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/eltwise_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/eltwise_cpu_kernel.cc index bf12709475..6c06353c28 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/eltwise_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/eltwise_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/eltwise_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/eltwise_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/eltwise_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/eltwise_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/eltwise_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/eltwise_cpu_kernel.h index f9c5089dd3..0bbeba27c1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/eltwise_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/eltwise_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_cpu_kernel.cc index b1f7536aed..bccdae95ce 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/log_softmax_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/log_softmax_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_cpu_kernel.h index d3a7ffa867..8d447c4332 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_grad_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_grad_cpu_kernel.cc index 9dcdaa2463..70467ac066 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/log_softmax_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/log_softmax_grad_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_grad_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_grad_cpu_kernel.h index 0c0601956b..e981f9efad 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/log_softmax_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/log_softmax_grad_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_cpu_kernel.cc index 976627cb38..b8ca3881ee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/lstm_cpu_kernel.h" #include #include "utils/ms_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { namespace { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_cpu_kernel.h index c49b877dbb..c06c6b6f81 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_grad_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_grad_cpu_kernel.cc index 48b0cc2ae7..d71c4c8350 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_grad_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/lstm_grad_cpu_kernel.h" #include #include #include "utils/ms_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_grad_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_grad_cpu_kernel.h index 6e0d098c61..fec207e8a5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/lstm_grad_cpu_kernel.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/matmul_cpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/matmul_cpu_kernel.cc index 949dcc0a2c..90da564c23 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/matmul_cpu_kernel.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/matmul_cpu_kernel.h" #include #include "common/thread_pool.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" -#include "backend/kernel_compiler/cpu/nnacl/matmul_parameter.h" -#include "backend/kernel_compiler/cpu/nnacl/fp32/matmul_fp32.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/matmul_parameter.h" +#include "plugin/device/cpu/kernel/nnacl/fp32/matmul_fp32.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/matmul_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/matmul_cpu_kernel.h index b4a5590961..50c75a3260 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/matmul_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.cc index 97d693c8c9..27ea020df3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h index 0f727f600b..4cc3fc0d2c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h @@ -24,8 +24,8 @@ #include #include #include "dnnl.hpp" -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #ifdef USE_MS_THREADPOOL_FOR_DNNL #include "dnnl_threadpool.hpp" #include "dnnl_threadpool_iface.hpp" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_avg_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_avg_grad_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_avg_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_avg_grad_cpu_kernel.cc index 7159b6d0ae..654b71ecf7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_avg_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_avg_grad_cpu_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/pooling_avg_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/pooling_avg_grad_cpu_kernel.h" #include #include #include #include "utils/ms_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_avg_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_avg_grad_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_avg_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_avg_grad_cpu_kernel.h index 1831a20de1..3899cbc4a6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_avg_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_avg_grad_cpu_kernel.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_cpu_kernel.cc index 242df1195b..790a6d2543 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_cpu_kernel.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/pooling_cpu_kernel.h" #include #include #include "utils/ms_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_cpu_kernel.h index 2d82b97a2d..f46354c0c1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_max_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_max_grad_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_max_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_max_grad_cpu_kernel.cc index 6e8b63afd1..16d4e4424b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_max_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_max_grad_cpu_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/pooling_max_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/pooling_max_grad_cpu_kernel.h" #include #include #include #include "utils/ms_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_max_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_max_grad_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_max_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_max_grad_cpu_kernel.h index 55996d0be1..fa24fb86c3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_max_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/pooling_max_grad_cpu_kernel.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cpu_kernel.cc index 3b474236fe..0a449010ee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/softmax_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cpu_kernel.h index 956bdf0969..4d0a75f538 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc index 222dff3706..5f36e2e20e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h" #include #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h index 29e5f82f8f..c477ee6d2f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc index 8b325a1c65..5100b3b8b1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h" #include #include #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h index 8e4f8eeb63..9e97141027 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/mkldnn/mkl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/multinomial_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/multinomial_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/multinomial_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/multinomial_cpu_kernel.cc index 45287d41d5..c4bf8d9c49 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/multinomial_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/multinomial_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/multinomial_cpu_kernel.h" +#include "plugin/device/cpu/kernel/multinomial_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/multinomial_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/multinomial_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/multinomial_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/multinomial_cpu_kernel.h index 9ba048917e..b885e5234b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/multinomial_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/multinomial_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "nnacl/base/tile_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nms_with_mask_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/nms_with_mask_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nms_with_mask_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/nms_with_mask_cpu_kernel.cc index 0ed134c5e9..58ed3371bf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/nms_with_mask_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/nms_with_mask_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/nms_with_mask_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/nms_with_mask_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nms_with_mask_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nms_with_mask_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nms_with_mask_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nms_with_mask_cpu_kernel.h index eb4a1165c3..586dfffbeb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/nms_with_mask_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/nms_with_mask_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/CMakeLists.txt b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/CMakeLists.txt rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/CMakeLists.txt diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/OWNERS b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/OWNERS similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/OWNERS rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/OWNERS diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/README.md b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/README.md similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/README.md rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/README.md diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/activation_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/activation_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/activation_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/activation_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/adder.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/adder.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/adder.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/adder.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/affine_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/affine_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/affine_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/affine_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/all_gather_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/all_gather_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/all_gather_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/all_gather_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/arg_min_max_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/arg_min_max_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/arg_min_max_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/arg_min_max_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/arithmetic.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/arithmetic.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/arithmetic.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/arithmetic.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/arithmetic_self_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/arithmetic_self_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/arithmetic_self_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/arithmetic_self_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDw3x3Int8BorderPixel.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDw3x3Int8BorderPixel.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDw3x3Int8BorderPixel.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDw3x3Int8BorderPixel.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwFp32Border.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwFp32Border.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwFp32Border.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwFp32Border.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwFp32Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwFp32Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwFp32Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwFp32Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwFp32Row.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwFp32Row.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwFp32Row.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwFp32Row.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwInt8Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwInt8Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwInt8Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwInt8Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwInt8PostAlign4.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwInt8PostAlign4.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwInt8PostAlign4.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwInt8PostAlign4.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwInt8PostAlign4PerChannel.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwInt8PostAlign4PerChannel.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwInt8PostAlign4PerChannel.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwInt8PostAlign4PerChannel.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwInt8Row.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwInt8Row.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/ConvDwInt8Row.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/ConvDwInt8Row.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/DeconvDwFp32Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/DeconvDwFp32Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/DeconvDwFp32Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/DeconvDwFp32Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/DeconvDwInt8Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/DeconvDwInt8Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/DeconvDwInt8Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/DeconvDwInt8Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/DeconvDwInt8Post.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/DeconvDwInt8Post.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/DeconvDwInt8Post.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/DeconvDwInt8Post.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/IndirectGemmInt16to32_8x4.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/IndirectGemmInt8_2x4.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatVecMulFp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatVecMulFp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatVecMulFp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatVecMulFp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulFp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulFp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulFp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulFp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulFp32Opt.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulFp32Opt.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulFp32Opt.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulFp32Opt.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulFp32Opt12x4.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulFp32Opt12x4.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulFp32Opt12x4.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulFp32Opt12x4.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulInt8.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulInt8.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulInt8.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulInt8.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulInt8Opt.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulInt8Opt.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulInt8Opt.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulInt8Opt.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulWinogradFp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulWinogradFp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/MatmulWinogradFp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/MatmulWinogradFp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/PostFuncBiasReluC4.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/PostFuncBiasReluC4.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/PostFuncBiasReluC4.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/PostFuncBiasReluC4.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/PostFuncBiasReluC8.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/PostFuncBiasReluC8.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/PostFuncBiasReluC8.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/PostFuncBiasReluC8.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/PreSum4x16Int8Peroc.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/PreSum4x16Int8Peroc.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/PreSum4x16Int8Peroc.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/PreSum4x16Int8Peroc.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/PreSum4x16Int8Pert.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/PreSum4x16Int8Pert.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/PreSum4x16Int8Pert.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/PreSum4x16Int8Pert.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/TiledC4MatmulFp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/TiledC4MatmulFp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/TiledC4MatmulFp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/TiledC4MatmulFp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/WinogradTransLeft.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/WinogradTransLeft.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/WinogradTransLeft.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/WinogradTransLeft.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/WinogradTransRight.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/WinogradTransRight.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm32/WinogradTransRight.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm32/WinogradTransRight.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/AdderFp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/AdderFp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/AdderFp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/AdderFp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Corner.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Corner.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Corner.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Corner.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Horizontal.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Horizontal.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Horizontal.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Horizontal.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Stride1.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Stride1.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Stride1.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Stride1.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Stride2.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Stride2.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Stride2.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Stride2.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Vertical.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Vertical.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Fp32Vertical.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Fp32Vertical.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8Corner.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8Corner.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8Corner.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8Corner.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8Horizontal.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8Horizontal.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8Horizontal.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8Horizontal.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8Stride2.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8Stride2.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8Stride2.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8Stride2.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8Vertical.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8Vertical.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Int8Vertical.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Int8Vertical.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Line.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Line.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDw3x3Line.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDw3x3Line.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Border.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Border.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Border.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Border.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Indirect3x3.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Indirect3x3.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Indirect3x3.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Indirect3x3.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Indirect5x5.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Indirect5x5.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Indirect5x5.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Indirect5x5.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Row.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Row.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwFp32Row.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwFp32Row.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwInt8Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwInt8Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwInt8Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwInt8Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwInt8PostAlign4.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwInt8PostAlign4.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwInt8PostAlign4.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwInt8PostAlign4.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwInt8PostAlign4PerChannel.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwInt8PostAlign4PerChannel.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwInt8PostAlign4PerChannel.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwInt8PostAlign4PerChannel.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwInt8Row.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwInt8Row.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvDwInt8Row.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvDwInt8Row.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvFp32Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvFp32Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/ConvFp32Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/ConvFp32Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/DeconvDwFp32Border.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/DeconvDwFp32Border.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/DeconvDwFp32Border.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/DeconvDwFp32Border.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/DeconvDwFp32Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/DeconvDwFp32Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/DeconvDwFp32Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/DeconvDwFp32Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/DeconvDwInt8Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/DeconvDwInt8Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/DeconvDwInt8Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/DeconvDwInt8Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/DeconvDwInt8Post.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/DeconvDwInt8Post.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/DeconvDwInt8Post.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/DeconvDwInt8Post.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/IndirectGemmInt16to32_8x4.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatVecMulFp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatVecMulFp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatVecMulFp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatVecMulFp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32Opt.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32Opt.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32Opt.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32Opt.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32OptRow12.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32OptRow12.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32OptRow12.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32OptRow12.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32OptRow4.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32OptRow4.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32OptRow4.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32OptRow4.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32OptRow8.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32OptRow8.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulFp32OptRow8.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulFp32OptRow8.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulInt8.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulInt8.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulInt8.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulInt8.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulInt8Opt.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulInt8Opt.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulInt8Opt.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulInt8Opt.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulR4Int8.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulR4Int8.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulR4Int8.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulR4Int8.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulWinogradFp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulWinogradFp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/MatmulWinogradFp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/MatmulWinogradFp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PostFuncBiasReluC4.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PostFuncBiasReluC4.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PostFuncBiasReluC4.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PostFuncBiasReluC4.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PostFuncBiasReluC8.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PostFuncBiasReluC8.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PostFuncBiasReluC8.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PostFuncBiasReluC8.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PostFuncInt8C4Neon64.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PostFuncInt8C4Neon64.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PostFuncInt8C4Neon64.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PostFuncInt8C4Neon64.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PreSum4x16Int8Peroc.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PreSum4x16Int8Peroc.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PreSum4x16Int8Peroc.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PreSum4x16Int8Peroc.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PreSum4x16Int8Pert.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PreSum4x16Int8Pert.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/PreSum4x16Int8Pert.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/PreSum4x16Int8Pert.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/SPMM8x8Fp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/SPMM8x8Fp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/SPMM8x8Fp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/SPMM8x8Fp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/TiledC4MatmulFp32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/TiledC4MatmulFp32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/TiledC4MatmulFp32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/TiledC4MatmulFp32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/WinogradTransLeft.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/WinogradTransLeft.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/WinogradTransLeft.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/WinogradTransLeft.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/WinogradTransRight.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/WinogradTransRight.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm64/WinogradTransRight.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm64/WinogradTransRight.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/Float16Tofloat32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/Float16Tofloat32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/Float16Tofloat32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/Float16Tofloat32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/Float32ToFloat16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/Float32ToFloat16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/Float32ToFloat16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/Float32ToFloat16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/MatVecMulFp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/MatVecMulFp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/MatVecMulFp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/MatVecMulFp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/Matmul12x8Fp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/Matmul12x8Fp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/Matmul12x8Fp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/Matmul12x8Fp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/TiledC4MatmulFp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/TiledC4MatmulFp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/TiledC4MatmulFp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/TiledC4MatmulFp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/WinogradTransLeft.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/WinogradTransLeft.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/WinogradTransLeft.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/WinogradTransLeft.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/WinogradTransRight.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/WinogradTransRight.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/arm82_aarch32_fp16/WinogradTransRight.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/arm82_aarch32_fp16/WinogradTransRight.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/avx/ConvDwFp32Avx3x3.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/avx/ConvDwFp32Avx3x3.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/avx/ConvDwFp32Avx3x3.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/avx/ConvDwFp32Avx3x3.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/avx/ConvDwFp32BorderAvx.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/avx/ConvDwFp32BorderAvx.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/avx/ConvDwFp32BorderAvx.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/avx/ConvDwFp32BorderAvx.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/avx/ConvDwFp32RowAvx.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/avx/ConvDwFp32RowAvx.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/avx/ConvDwFp32RowAvx.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/avx/ConvDwFp32RowAvx.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/avx/MatmulAvx.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/avx/MatmulAvx.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/avx/MatmulAvx.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/avx/MatmulAvx.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/ConvDwFp16Border.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/ConvDwFp16Border.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/ConvDwFp16Border.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/ConvDwFp16Border.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/ConvDwFp16Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/ConvDwFp16Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/ConvDwFp16Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/ConvDwFp16Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/ConvDwFp16Row.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/ConvDwFp16Row.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/ConvDwFp16Row.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/ConvDwFp16Row.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/DeconvDwFp16Border.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/DeconvDwFp16Border.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/DeconvDwFp16Border.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/DeconvDwFp16Border.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/DeconvDwFp16Center.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/DeconvDwFp16Center.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/DeconvDwFp16Center.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/DeconvDwFp16Center.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/Float16ToFloat32.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/Float16ToFloat32.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/Float16ToFloat32.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/Float16ToFloat32.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/Float32ToFloat16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/Float32ToFloat16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/Float32ToFloat16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/Float32ToFloat16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatVecMulFp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatVecMulFp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatVecMulFp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatVecMulFp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/Matmul12X16Fp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/Matmul12X16Fp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/Matmul12X16Fp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/Matmul12X16Fp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatmulBaseFp16Neon.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatmulBaseFp16Neon.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatmulBaseFp16Neon.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatmulBaseFp16Neon.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatmulFp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatmulFp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatmulFp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatmulFp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatmulFp16Opt.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatmulFp16Opt.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatmulFp16Opt.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatmulFp16Opt.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatmulWinogradFp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatmulWinogradFp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/MatmulWinogradFp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/MatmulWinogradFp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/PostFuncBiasReluC4Fp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/PostFuncBiasReluC4Fp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/PostFuncBiasReluC4Fp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/PostFuncBiasReluC4Fp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/PostFuncBiasReluC8Fp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/PostFuncBiasReluC8Fp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/PostFuncBiasReluC8Fp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/PostFuncBiasReluC8Fp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/TiledC4MatmulFp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/TiledC4MatmulFp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/TiledC4MatmulFp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/TiledC4MatmulFp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/VecMatmulFp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/VecMatmulFp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/VecMatmulFp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/VecMatmulFp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/WinogradTransLeftFp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/WinogradTransLeftFp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/WinogradTransLeftFp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/WinogradTransLeftFp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/WinogradTransRightFp16.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/WinogradTransRightFp16.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/fp16/WinogradTransRightFp16.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/fp16/WinogradTransRightFp16.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/opt/DynamicMatmulSdot4x4x16AIWI.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/opt/DynamicMatmulSdot4x4x16AIWI.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/opt/DynamicMatmulSdot4x4x16AIWI.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/opt/DynamicMatmulSdot4x4x16AIWI.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/opt/MatmulDpInt8.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/opt/MatmulDpInt8.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/opt/MatmulDpInt8.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/opt/MatmulDpInt8.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/opt/MatmulDpInt8Opt.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/opt/MatmulDpInt8Opt.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/opt/MatmulDpInt8Opt.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/opt/MatmulDpInt8Opt.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/opt/MatmulOptR4Int8.S b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/opt/MatmulOptR4Int8.S similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/opt/MatmulOptR4Int8.S rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/opt/MatmulOptR4Int8.S diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly_global.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly_global.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly_global.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly_global.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/attention_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/attention_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/attention_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/attention_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/arithmetic_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/arithmetic_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/arithmetic_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/arithmetic_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/arithmetic_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/arithmetic_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/arithmetic_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/arithmetic_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/batch_to_space_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/batch_to_space_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/batch_to_space_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/batch_to_space_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/batch_to_space_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/batch_to_space_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/batch_to_space_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/batch_to_space_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/broadcast_to.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/broadcast_to.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/broadcast_to.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/broadcast_to.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/broadcast_to.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/broadcast_to.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/broadcast_to.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/broadcast_to.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/cast_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/cast_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/cast_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/cast_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/concat_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/concat_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/concat_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/concat_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/concat_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/concat_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/concat_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/concat_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/conv1x1_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/conv1x1_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/conv1x1_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/conv1x1_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/conv1x1_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/conv1x1_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/conv1x1_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/conv1x1_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/conv_common_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/conv_common_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/conv_common_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/conv_common_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/conv_common_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/conv_common_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/conv_common_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/conv_common_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/depth_to_space_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/depth_to_space_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/depth_to_space_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/depth_to_space_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/depth_to_space_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/depth_to_space_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/depth_to_space_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/depth_to_space_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/fill_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/fill_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/fill_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/fill_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/fill_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/fill_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/fill_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/fill_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/gather_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/gather_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/gather_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/gather_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/gather_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/gather_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/gather_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/gather_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/minimal_filtering_generator.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/minimal_filtering_generator.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/minimal_filtering_generator.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/minimal_filtering_generator.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/minimal_filtering_generator.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/minimal_filtering_generator.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/minimal_filtering_generator.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/minimal_filtering_generator.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/slice_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/slice_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/slice_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/slice_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/slice_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/slice_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/slice_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/slice_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/space_to_depth_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/space_to_depth_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/space_to_depth_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/space_to_depth_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/space_to_depth_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/space_to_depth_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/space_to_depth_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/space_to_depth_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/split_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/split_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/split_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/split_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/split_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/split_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/split_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/split_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/split_with_over_lap_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/split_with_over_lap_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/split_with_over_lap_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/split_with_over_lap_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/split_with_over_lap_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/split_with_over_lap_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/split_with_over_lap_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/split_with_over_lap_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/stack_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/stack_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/stack_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/stack_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/stack_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/stack_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/stack_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/stack_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/tile_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/tile_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/tile_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/tile_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/tile_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/tile_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/tile_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/tile_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/transpose_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/transpose_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/transpose_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/transpose_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/transpose_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/transpose_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/transpose_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/transpose_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/unsorted_segment_sum_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/unsorted_segment_sum_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/unsorted_segment_sum_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/unsorted_segment_sum_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/unsorted_segment_sum_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/unsorted_segment_sum_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/unsorted_segment_sum_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/unsorted_segment_sum_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/unstack_base.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/unstack_base.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/unstack_base.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/unstack_base.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/unstack_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/unstack_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/unstack_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/unstack_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/zeroslike_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/zeroslike_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/base/zeroslike_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/base/zeroslike_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/batch_to_space.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/batch_to_space.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/batch_to_space.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/batch_to_space.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/batchnorm_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/batchnorm_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/batchnorm_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/batchnorm_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/broadcast_to_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/broadcast_to_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/broadcast_to_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/broadcast_to_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/call_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/call_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/call_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/call_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/common_func.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/common_func.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/common_func.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/common_func.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/common_func.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/common_func.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/common_func.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/common_func.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/concat_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/concat_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/concat_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/concat_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/constant_of_shape_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/constant_of_shape_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/constant_of_shape_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/constant_of_shape_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/conv_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/conv_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/conv_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/conv_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/crop_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/crop_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/crop_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/crop_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/cumsum_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/cumsum_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/cumsum_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/cumsum_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/custom_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/custom_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/custom_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/custom_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/depth_to_space_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/depth_to_space_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/depth_to_space_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/depth_to_space_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/detection_post_process_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/detection_post_process_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/detection_post_process_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/detection_post_process_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/dynamic_quant_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/dynamic_quant_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/dynamic_quant_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/dynamic_quant_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/errorcode.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/errorcode.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/errorcode.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/errorcode.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/exp_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/exp_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/exp_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/exp_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_10x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_11x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_12x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x48_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x48_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x48_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x48_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x64_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x64_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x64_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x64_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x80_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x80_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x80_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x80_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x96_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x96_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x96_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_1x96_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x48_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x48_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x48_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x48_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x64_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x64_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x64_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x64_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x80_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x80_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x80_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x80_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x96_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x96_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x96_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_2x96_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x48_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x48_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x48_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x48_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x64_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x64_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x64_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x64_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x80_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x80_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x80_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x80_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x96_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x96_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x96_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_3x96_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x48_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x48_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x48_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x48_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x64_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x64_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x64_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x64_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x80_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x80_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x80_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x80_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x96_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x96_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x96_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_4x96_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x48_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x48_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x48_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x48_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x64_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x64_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x64_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x64_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x80_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x80_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x80_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_5x80_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x48_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x48_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x48_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x48_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x64_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x64_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x64_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_6x64_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x48_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x48_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x48_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_7x48_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x48_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x48_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x48_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_8x48_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x16_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x16_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x16_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x16_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x32_kernel_nhwc_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x32_kernel_nhwc_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x32_kernel_nhwc_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_avx512/nnacl_gemm_avx512_9x32_kernel_nhwc_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_10x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_11x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_12x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x16_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x16_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x16_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x16_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x16_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x16_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x16_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x16_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x24_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x32_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_1x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x16_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x24_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x32_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_2x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x16_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x24_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x32_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_3x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x16_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x24_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_4x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x16_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_5x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x16_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_6x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_7x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_8x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32_asm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32_asm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32_asm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/gemm_fma/nnacl_gemm_fma_9x8_kernel_nc8hw8_fp32_asm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/generate_hpc.sh b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/generate_hpc.sh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/generate_hpc.sh rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/generate_hpc.sh diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/generator.py b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/generator.py similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/generator.py rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/generator.py diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/template_file/gemm_avx512_nhwc_asm.c.in b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/template_file/gemm_avx512_nhwc_asm.c.in similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/template_file/gemm_avx512_nhwc_asm.c.in rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/template_file/gemm_avx512_nhwc_asm.c.in diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/template_file/gemm_fma_nc8hw8.c.in b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/template_file/gemm_fma_nc8hw8.c.in similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/template_file/gemm_fma_nc8hw8.c.in rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/template_file/gemm_fma_nc8hw8.c.in diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/template_file/gemm_fma_nc8hw8_asm.c.in b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/template_file/gemm_fma_nc8hw8_asm.c.in similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/HPC-generator/template_file/gemm_fma_nc8hw8_asm.c.in rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/HPC-generator/template_file/gemm_fma_nc8hw8_asm.c.in diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/conv.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/conv.c similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/conv.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/conv.c index bab950c8bb..e0a1aa7cee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/experiment/conv.c +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/experiment/conv.c @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include +#include "mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/conv_parameter.h" #include "nnacl/tensor_c.h" #include "nnacl/op_base.h" #include "nnacl/kernel.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fill_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fill_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fill_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fill_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/activation_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/activation_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/activation_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/activation_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/activation_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/activation_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/activation_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/activation_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arg_min_max_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arg_min_max_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arg_min_max_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arg_min_max_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arg_min_max_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arg_min_max_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arg_min_max_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arg_min_max_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arithmetic_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arithmetic_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arithmetic_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arithmetic_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arithmetic_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arithmetic_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arithmetic_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arithmetic_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arithmetic_self_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arithmetic_self_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arithmetic_self_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arithmetic_self_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arithmetic_self_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arithmetic_self_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/arithmetic_self_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/arithmetic_self_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/batchnorm_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/batchnorm_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/batchnorm_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/batchnorm_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/batchnorm_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/batchnorm_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/batchnorm_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/batchnorm_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/cast_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/cast_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/cast_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/cast_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/common_func_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/common_func_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/common_func_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/common_func_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/common_func_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/common_func_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/common_func_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/common_func_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/constant_of_shape_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/constant_of_shape_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/constant_of_shape_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/constant_of_shape_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/conv_depthwise_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/conv_depthwise_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/conv_depthwise_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/conv_depthwise_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/conv_depthwise_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/conv_depthwise_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/conv_depthwise_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/conv_depthwise_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/conv_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/conv_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/conv_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/conv_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/conv_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/conv_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/conv_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/conv_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/crop_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/crop_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/crop_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/crop_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/crop_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/crop_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/crop_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/crop_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/deconv_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/deconv_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/deconv_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/deconv_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/deconv_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/deconv_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/deconv_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/deconv_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/deconv_winograd_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/deconv_winograd_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/deconv_winograd_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/deconv_winograd_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/deconv_winograd_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/deconv_winograd_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/deconv_winograd_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/deconv_winograd_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/exp_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/exp_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/exp_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/exp_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/exp_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/exp_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/exp_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/exp_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/fill_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/fill_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/fill_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/fill_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/fill_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/fill_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/fill_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/fill_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/gru_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/gru_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/gru_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/gru_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/gru_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/gru_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/gru_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/gru_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/instance_norm_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/instance_norm_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/instance_norm_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/instance_norm_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/instance_norm_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/instance_norm_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/instance_norm_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/instance_norm_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/layer_norm_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/layer_norm_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/layer_norm_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/layer_norm_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/layer_norm_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/layer_norm_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/layer_norm_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/layer_norm_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/log_softmax_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/log_softmax_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/log_softmax_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/log_softmax_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/log_softmax_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/log_softmax_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/log_softmax_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/log_softmax_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/lstm_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/lstm_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/lstm_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/lstm_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/lstm_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/lstm_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/lstm_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/lstm_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/matmul_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/matmul_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/matmul_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/matmul_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/matmul_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/matmul_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/matmul_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/matmul_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/matrix_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/matrix_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/matrix_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/matrix_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/matrix_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/matrix_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/matrix_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/matrix_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/one_hot_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/one_hot_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/one_hot_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/one_hot_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/one_hot_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/one_hot_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/one_hot_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/one_hot_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pack_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pack_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pack_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pack_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pack_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pack_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pack_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pack_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pad_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pad_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pad_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pad_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pad_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pad_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pad_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pad_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pooling_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pooling_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pooling_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pooling_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pooling_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pooling_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/pooling_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/pooling_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/power_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/power_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/power_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/power_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/power_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/power_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/power_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/power_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/prelu_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/prelu_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/prelu_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/prelu_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/prelu_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/prelu_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/prelu_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/prelu_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/quant_dtype_cast_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/quant_dtype_cast_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/quant_dtype_cast_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/quant_dtype_cast_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/quant_dtype_cast_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/quant_dtype_cast_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/quant_dtype_cast_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/quant_dtype_cast_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/ragged_range_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/ragged_range_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/ragged_range_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/ragged_range_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/ragged_range_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/ragged_range_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/ragged_range_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/ragged_range_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/range_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/range_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/range_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/range_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/reduce_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/reduce_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/reduce_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/reduce_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/reduce_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/reduce_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/reduce_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/reduce_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/resize_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/resize_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/resize_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/resize_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/resize_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/resize_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/resize_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/resize_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/scale_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/scale_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/scale_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/scale_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/scale_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/scale_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/scale_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/scale_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/softmax_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/softmax_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/softmax_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/softmax_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/softmax_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/softmax_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/softmax_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/softmax_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/sparse_to_dense_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/sparse_to_dense_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/sparse_to_dense_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/sparse_to_dense_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/sparse_to_dense_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/sparse_to_dense_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/sparse_to_dense_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/sparse_to_dense_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/splice_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/splice_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/splice_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/splice_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/splice_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/splice_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/splice_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/splice_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/topk_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/topk_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/topk_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/topk_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/topk_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/topk_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/topk_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/topk_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/transpose_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/transpose_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/transpose_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/transpose_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/transpose_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/transpose_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/transpose_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/transpose_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/unique_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/unique_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/unique_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/unique_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/unique_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/unique_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/unique_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/unique_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/where_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/where_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/where_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/where_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/where_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/where_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/where_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/where_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_transform_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_transform_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_transform_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_transform_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_transform_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_transform_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_transform_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_transform_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16/winograd_utils_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16/winograd_utils_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/activation_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/activation_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/activation_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/activation_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/activation_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/activation_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/activation_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/activation_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/arithmetic_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/arithmetic_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/arithmetic_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/arithmetic_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/arithmetic_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/arithmetic_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/arithmetic_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/arithmetic_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/arithmetic_self_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/arithmetic_self_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/arithmetic_self_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/arithmetic_self_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/arithmetic_self_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/arithmetic_self_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/arithmetic_self_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/arithmetic_self_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/batch_norm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/batch_norm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/batch_norm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/batch_norm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/batch_norm.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/batch_norm.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/batch_norm.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/batch_norm.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/convolution_grad_filter.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/convolution_grad_filter.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/convolution_grad_filter.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/convolution_grad_filter.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/convolution_grad_filter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/convolution_grad_filter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/convolution_grad_filter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/convolution_grad_filter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/convolution_grad_input.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/convolution_grad_input.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/convolution_grad_input.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/convolution_grad_input.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/convolution_grad_input.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/convolution_grad_input.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/convolution_grad_input.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/convolution_grad_input.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/dropout_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/dropout_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/dropout_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/dropout_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/dropout_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/dropout_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/dropout_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/dropout_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/gemm_fp16.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/gemm_fp16.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/gemm_fp16.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/gemm_fp16.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/gemm_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/gemm_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/gemm_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/gemm_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/layernorm_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/layernorm_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/layernorm_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/layernorm_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/layernorm_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/layernorm_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/layernorm_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/layernorm_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/pack_fp16_ext.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/pack_fp16_ext.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/pack_fp16_ext.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/pack_fp16_ext.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/pack_fp16_ext.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/pack_fp16_ext.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/pack_fp16_ext.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/pack_fp16_ext.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/pooling_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/pooling_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/pooling_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/pooling_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/pooling_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/pooling_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/pooling_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/pooling_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/resize_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/resize_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/resize_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/resize_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/resize_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/resize_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/resize_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/resize_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/strided_slice_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/strided_slice_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/strided_slice_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/strided_slice_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/strided_slice_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/strided_slice_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/strided_slice_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/strided_slice_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/unsorted_segment_sum.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/unsorted_segment_sum.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/unsorted_segment_sum.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/unsorted_segment_sum.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/unsorted_segment_sum.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/unsorted_segment_sum.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp16_grad/unsorted_segment_sum.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp16_grad/unsorted_segment_sum.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/activation_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/activation_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/activation_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/activation_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/activation_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/activation_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/activation_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/activation_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/adam_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/adam_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/adam_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/adam_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/add_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/add_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/add_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/add_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/add_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/add_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/add_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/add_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adder_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/adder_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adder_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/adder_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adder_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/adder_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adder_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/adder_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arg_min_max_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arg_min_max_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arg_min_max_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arg_min_max_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arg_min_max_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arg_min_max_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arg_min_max_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arg_min_max_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_compare_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_compare_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_compare_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_compare_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_compare_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_compare_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_compare_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_compare_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_self_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_self_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_self_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_self_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_self_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_self_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/arithmetic_self_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/arithmetic_self_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/attention_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/attention_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/attention_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/attention_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/attention_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/attention_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/attention_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/attention_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/batchnorm_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/batchnorm_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/batchnorm_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/batchnorm_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/batchnorm_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/batchnorm_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/batchnorm_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/batchnorm_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/bias_add.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/bias_add.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/bias_add.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/bias_add.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/bias_add.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/bias_add.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/bias_add.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/bias_add.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/common_func_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/common_func_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/common_func_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/common_func_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/common_func_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/common_func_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/common_func_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/common_func_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/constant_of_shape_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/constant_of_shape_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/constant_of_shape_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/constant_of_shape_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_1x1_x86_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_1x1_x86_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_1x1_x86_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_1x1_x86_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_1x1_x86_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_1x1_x86_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_1x1_x86_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_1x1_x86_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_common_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_common_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_common_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_common_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_common_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_common_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_common_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_common_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_depthwise_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_depthwise_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_depthwise_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_depthwise_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_depthwise_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_depthwise_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_depthwise_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_depthwise_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_winograd_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_winograd_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_winograd_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_winograd_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_winograd_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_winograd_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/conv_winograd_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/conv_winograd_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/crop_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/crop_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/crop_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/crop_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/crop_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/crop_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/crop_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/crop_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/cumsum_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/cumsum_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/cumsum_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/cumsum_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/cumsum_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/cumsum_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/cumsum_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/cumsum_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_winograd_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_winograd_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_winograd_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_winograd_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_winograd_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_winograd_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/deconv_winograd_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/deconv_winograd_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/detection_post_process_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/detection_post_process_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/detection_post_process_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/detection_post_process_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/detection_post_process_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/detection_post_process_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/detection_post_process_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/detection_post_process_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/div_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/div_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/div_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/div_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/div_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/div_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/div_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/div_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/embedding_lookup_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/embedding_lookup_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/embedding_lookup_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/embedding_lookup_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/embedding_lookup_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/embedding_lookup_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/embedding_lookup_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/embedding_lookup_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/exp_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/exp_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/exp_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/exp_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/exp_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/exp_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/exp_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/exp_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/gatherNd_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/gatherNd_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/gatherNd_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/gatherNd_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/gatherNd_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/gatherNd_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/gatherNd_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/gatherNd_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/gru_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/gru_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/gru_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/gru_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/gru_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/gru_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/gru_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/gru_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/instance_norm_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/instance_norm_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/instance_norm_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/instance_norm_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/instance_norm_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/instance_norm_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/instance_norm_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/instance_norm_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/invert_permutation_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/invert_permutation_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/invert_permutation_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/invert_permutation_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/invert_permutation_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/invert_permutation_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/invert_permutation_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/invert_permutation_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/l2_norm_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/l2_norm_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/l2_norm_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/l2_norm_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/l2_norm_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/l2_norm_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/l2_norm_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/l2_norm_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/layer_norm_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/layer_norm_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/layer_norm_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/layer_norm_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/layer_norm_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/layer_norm_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/layer_norm_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/layer_norm_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/local_response_norm_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/local_response_norm_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/local_response_norm_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/local_response_norm_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/local_response_norm_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/local_response_norm_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/local_response_norm_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/local_response_norm_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/log_softmax_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/log_softmax_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/log_softmax_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/log_softmax_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/log_softmax_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/log_softmax_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/log_softmax_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/log_softmax_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/lstm_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/lstm_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/lstm_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/lstm_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/lstm_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/lstm_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/lstm_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/lstm_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_avx512_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_avx512_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_avx512_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_avx512_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_avx512_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_avx512_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_avx512_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_avx512_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/matmul_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/matmul_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/mul_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/mul_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/mul_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/mul_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/mul_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/mul_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/mul_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/mul_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/one_hot_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/one_hot_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/one_hot_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/one_hot_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/one_hot_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/one_hot_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/one_hot_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/one_hot_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pack_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pack_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pack_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pack_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pack_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pack_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pack_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pack_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pad_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pad_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pad_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pad_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pad_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pad_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pad_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pad_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pooling_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pooling_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pooling_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pooling_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pooling_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pooling_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/pooling_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/pooling_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/power_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/power_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/power_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/power_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/power_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/power_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/power_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/power_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/prelu_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/prelu_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/prelu_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/prelu_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/prelu_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/prelu_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/prelu_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/prelu_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/prior_box_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/prior_box_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/prior_box_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/prior_box_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/ragged_range_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/ragged_range_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/ragged_range_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/ragged_range_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/ragged_range_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/ragged_range_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/ragged_range_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/ragged_range_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/range_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/range_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/range_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/range_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/rank_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/rank_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/rank_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/rank_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reduce_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reduce_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reduce_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reduce_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reduce_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reduce_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reduce_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reduce_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/resize_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/resize_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/resize_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/resize_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/resize_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/resize_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/resize_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/resize_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reverse_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reverse_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reverse_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reverse_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reverse_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reverse_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reverse_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reverse_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reverse_sequence_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reverse_sequence_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reverse_sequence_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reverse_sequence_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reverse_sequence_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reverse_sequence_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/reverse_sequence_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/reverse_sequence_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/rmsprop_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/rmsprop_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/rmsprop_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/rmsprop_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/rmsprop_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/rmsprop_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/rmsprop_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/rmsprop_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/roi_pooling_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/roi_pooling_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/roi_pooling_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/roi_pooling_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/roi_pooling_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/roi_pooling_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/roi_pooling_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/roi_pooling_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/scale_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/scale_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/scale_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/scale_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/scale_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/scale_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/scale_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/scale_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/scatter_nd_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/scatter_nd_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/scatter_nd_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/scatter_nd_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/scatter_nd_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/scatter_nd_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/scatter_nd_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/scatter_nd_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/softmax_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/softmax_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/softmax_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/softmax_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/softmax_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/softmax_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/softmax_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/softmax_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/space_to_batch_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/space_to_batch_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/space_to_batch_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/space_to_batch_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/space_to_batch_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/space_to_batch_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/space_to_batch_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/space_to_batch_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/sparse_to_dense_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/sparse_to_dense_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/sparse_to_dense_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/sparse_to_dense_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/sparse_to_dense_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/sparse_to_dense_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/sparse_to_dense_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/sparse_to_dense_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/splice_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/splice_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/splice_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/splice_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/splice_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/splice_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/splice_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/splice_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/squared_difference.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/squared_difference.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/squared_difference.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/squared_difference.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/squared_difference.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/squared_difference.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/squared_difference.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/squared_difference.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/strided_slice_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/strided_slice_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/strided_slice_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/strided_slice_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/strided_slice_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/strided_slice_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/strided_slice_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/strided_slice_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/sub_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/sub_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/sub_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/sub_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/sub_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/sub_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/sub_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/sub_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/topk_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/topk_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/topk_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/topk_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/topk_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/topk_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/topk_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/topk_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/transpose_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/transpose_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/transpose_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/transpose_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/transpose_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/transpose_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/transpose_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/transpose_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/unique_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/unique_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/unique_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/unique_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/unique_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/unique_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/unique_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/unique_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/where_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/where_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/where_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/where_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/where_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/where_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/where_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/where_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_avx.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_avx.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_avx.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_avx.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_avx.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_avx.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_avx.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_avx.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_transform.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_transform.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_transform.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_transform.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_transform.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_transform.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_transform.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_transform.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_utils.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_utils.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_utils.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_utils.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_utils.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_utils.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/winograd_utils.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/winograd_utils.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/activation_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/activation_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/activation_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/activation_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/activation_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/activation_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/activation_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/activation_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/arithmetic_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/arithmetic_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/arithmetic_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/arithmetic_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/arithmetic_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/arithmetic_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/arithmetic_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/arithmetic_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/batch_norm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/batch_norm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/batch_norm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/batch_norm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/batch_norm.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/batch_norm.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/batch_norm.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/batch_norm.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/batch_norm_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/batch_norm_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/batch_norm_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/batch_norm_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/binary_cross_entropy.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/binary_cross_entropy.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/binary_cross_entropy.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/binary_cross_entropy.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/binary_cross_entropy.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/binary_cross_entropy.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/binary_cross_entropy.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/binary_cross_entropy.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/binary_cross_entropy_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/binary_cross_entropy_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/binary_cross_entropy_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/binary_cross_entropy_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/binary_cross_entropy_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/binary_cross_entropy_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/binary_cross_entropy_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/binary_cross_entropy_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/convolution_grad_filter.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/convolution_grad_filter.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/convolution_grad_filter.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/convolution_grad_filter.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/convolution_grad_filter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/convolution_grad_filter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/convolution_grad_filter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/convolution_grad_filter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/convolution_grad_input.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/convolution_grad_input.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/convolution_grad_input.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/convolution_grad_input.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/convolution_grad_input.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/convolution_grad_input.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/convolution_grad_input.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/convolution_grad_input.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/dropout_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/dropout_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/dropout_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/dropout_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/dropout_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/dropout_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/dropout_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/dropout_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/dropout_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/dropout_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/dropout_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/dropout_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/gemm.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/gemm.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/gemm.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/gemm.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/gemm.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/gemm.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/gemm.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/gemm.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/layernorm_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/layernorm_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/layernorm_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/layernorm_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/layernorm_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/layernorm_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/layernorm_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/layernorm_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/layernormgrad_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/layernormgrad_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/layernormgrad_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/layernormgrad_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/lstm_grad_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/lstm_grad_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/lstm_grad_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/lstm_grad_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/lstm_grad_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/lstm_grad_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/lstm_grad_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/lstm_grad_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/optimizer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/optimizer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/optimizer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/optimizer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/pack_ext.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/pack_ext.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/pack_ext.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/pack_ext.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/pack_ext.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/pack_ext.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/pack_ext.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/pack_ext.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/pooling_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/pooling_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/pooling_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/pooling_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/pooling_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/pooling_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/pooling_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/pooling_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/reduce_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/reduce_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/reduce_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/reduce_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/reduce_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/reduce_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/reduce_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/reduce_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/resize_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/resize_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/resize_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/resize_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/resize_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/resize_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/resize_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/resize_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/resize_grad_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/resize_grad_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/resize_grad_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/resize_grad_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/smooth_l1_loss.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/smooth_l1_loss.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/smooth_l1_loss.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/smooth_l1_loss.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax_crossentropy_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax_crossentropy_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax_crossentropy_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax_crossentropy_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/softmax_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/softmax_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/strided_slice_grad.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/strided_slice_grad.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/strided_slice_grad.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/strided_slice_grad.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/strided_slice_grad.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/strided_slice_grad.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/strided_slice_grad.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/strided_slice_grad.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/utils.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/utils.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_grad/utils.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_grad/utils.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_sparse/matmul_sparse_x1_fp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_sparse/matmul_sparse_x1_fp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_sparse/matmul_sparse_x1_fp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_sparse/matmul_sparse_x1_fp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_sparse/matmul_sparse_x1_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_sparse/matmul_sparse_x1_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32_sparse/matmul_sparse_x1_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32_sparse/matmul_sparse_x1_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/gather_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/gather_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/gather_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/gather_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/gelu_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/gelu_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/gelu_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/gelu_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/glu_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/glu_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/glu_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/glu_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/gru_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/gru_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/gru_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/gru_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/adam_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/adam_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/adam_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/adam_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/adam_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/adam_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/adam_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/adam_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/add_sub_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/add_sub_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/add_sub_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/add_sub_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/add_sub_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/add_sub_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/add_sub_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/add_sub_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/addn_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/addn_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/addn_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/addn_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/addn_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/addn_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/addn_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/addn_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/affine_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/affine_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/affine_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/affine_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/affine_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/affine_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/affine_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/affine_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/all_gather.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/all_gather.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/all_gather.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/all_gather.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/apply_momentum_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/apply_momentum_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/apply_momentum_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/apply_momentum_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/apply_momentum_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/apply_momentum_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/apply_momentum_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/apply_momentum_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/argmin_max_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/argmin_max_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/argmin_max_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/argmin_max_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/argmin_max_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/argmin_max_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/argmin_max_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/argmin_max_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_compare_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_compare_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_compare_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_compare_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_compare_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_compare_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_compare_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_compare_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/arithmetic_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/arithmetic_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assert_op_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assert_op_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assert_op_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assert_op_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assert_op_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assert_op_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assert_op_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assert_op_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assign_add_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assign_add_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assign_add_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assign_add_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assign_add_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assign_add_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assign_add_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assign_add_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assign_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assign_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assign_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assign_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assign_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assign_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/assign_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/assign_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/attention_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/attention_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/attention_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/attention_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/attention_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/attention_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/attention_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/attention_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/audio_spectrogram_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/audio_spectrogram_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/audio_spectrogram_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/audio_spectrogram_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/audio_spectrogram_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/audio_spectrogram_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/audio_spectrogram_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/audio_spectrogram_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/batch_to_space_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/batch_to_space_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/batch_to_space_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/batch_to_space_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/batch_to_space_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/batch_to_space_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/batch_to_space_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/batch_to_space_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bias_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bias_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bias_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bias_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bias_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bias_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bias_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bias_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bias_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bias_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bias_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bias_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bias_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bias_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bias_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bias_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/binary_cross_entropy_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/binary_cross_entropy_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/binary_cross_entropy_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/binary_cross_entropy_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/binary_cross_entropy_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/binary_cross_entropy_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/binary_cross_entropy_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/binary_cross_entropy_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bn_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bn_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bn_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bn_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bn_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bn_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/bn_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/bn_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/broadcast_to_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/broadcast_to_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/broadcast_to_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/broadcast_to_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/broadcast_to_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/broadcast_to_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/broadcast_to_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/broadcast_to_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/cast_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/cast_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/cast_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/cast_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/cast_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/cast_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/cast_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/cast_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/common_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/common_infer.c similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/common_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/common_infer.c index 47d81d9ba6..4b796e9e16 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/common_infer.c +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/common_infer.c @@ -17,7 +17,7 @@ #include #include #include "nnacl/infer/infer_register.h" -#include "nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #ifndef CONTROLFLOW_TENSORLIST_CLIP int MallocTensorListData(TensorListC *tensor_list, TypeIdC dtype, const vvector *tensor_shape) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/common_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/common_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/common_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/common_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/concat_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/concat_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/concat_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/concat_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/concat_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/concat_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/concat_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/concat_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/constant_of_shape_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/constant_of_shape_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/constant_of_shape_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/constant_of_shape_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/constant_of_shape_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/constant_of_shape_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/constant_of_shape_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/constant_of_shape_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_read_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_read_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_read_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_read_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_read_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_read_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_read_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_read_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_write_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_write_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_write_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_write_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_write_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_write_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensor_array_write_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensor_array_write_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_fromtensor_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_fromtensor_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_fromtensor_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_fromtensor_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_fromtensor_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_fromtensor_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_fromtensor_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_fromtensor_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_getitem_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_getitem_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_getitem_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_getitem_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_getitem_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_getitem_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_getitem_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_getitem_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_reserve_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_reserve_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_reserve_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_reserve_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_reserve_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_reserve_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_reserve_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_reserve_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_setitem_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_setitem_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_setitem_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_setitem_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_setitem_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_setitem_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_setitem_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_setitem_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_stack_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_stack_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_stack_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_stack_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_stack_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_stack_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/control/tensorlist_stack_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/control/tensorlist_stack_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_grad_filter_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_grad_filter_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_grad_filter_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_grad_filter_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_grad_filter_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_grad_filter_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_grad_filter_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_grad_filter_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_grad_input_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_grad_input_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_grad_input_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_grad_input_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_grad_input_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_grad_input_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_grad_input_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_grad_input_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/conv2d_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/conv2d_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/crop_and_resize_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/crop_and_resize_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/crop_and_resize_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/crop_and_resize_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/crop_and_resize_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/crop_and_resize_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/crop_and_resize_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/crop_and_resize_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/crop_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/crop_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/crop_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/crop_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/crop_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/crop_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/crop_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/crop_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/cumsum_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/cumsum_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/cumsum_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/cumsum_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/cumsum_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/cumsum_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/cumsum_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/cumsum_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/deconv2d_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/deconv2d_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/deconv2d_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/deconv2d_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/deconv2d_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/deconv2d_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/deconv2d_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/deconv2d_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/depth_to_space_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/depth_to_space_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/depth_to_space_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/depth_to_space_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/depth_to_space_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/depth_to_space_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/depth_to_space_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/depth_to_space_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/depthwise_conv2d_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/depthwise_conv2d_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/depthwise_conv2d_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/depthwise_conv2d_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/depthwise_conv2d_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/depthwise_conv2d_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/depthwise_conv2d_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/depthwise_conv2d_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/detection_post_process_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/detection_post_process_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/detection_post_process_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/detection_post_process_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/detection_post_process_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/detection_post_process_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/detection_post_process_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/detection_post_process_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dropout_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dropout_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dropout_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dropout_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dropout_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dropout_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dropout_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dropout_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dropout_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dropout_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dropout_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dropout_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dropout_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dropout_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dropout_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dropout_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dynamic_quant_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dynamic_quant_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dynamic_quant_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dynamic_quant_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dynamic_quant_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dynamic_quant_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/dynamic_quant_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/dynamic_quant_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/embedding_lookup_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/embedding_lookup_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/embedding_lookup_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/embedding_lookup_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/embedding_lookup_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/embedding_lookup_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/embedding_lookup_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/embedding_lookup_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/expand_dims_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/expand_dims_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/expand_dims_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/expand_dims_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/expand_dims_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/expand_dims_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/expand_dims_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/expand_dims_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fft_imag_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fft_imag_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fft_imag_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fft_imag_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fft_imag_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fft_imag_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fft_imag_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fft_imag_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fft_real_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fft_real_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fft_real_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fft_real_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fft_real_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fft_real_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fft_real_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fft_real_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fill_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fill_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fill_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fill_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fill_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fill_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fill_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fill_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/flatten_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/flatten_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/flatten_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/flatten_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/flatten_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/flatten_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/flatten_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/flatten_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/flatten_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/flatten_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/flatten_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/flatten_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/flatten_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/flatten_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/flatten_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/flatten_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/full_connection_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/full_connection_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/full_connection_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/full_connection_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/full_connection_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/full_connection_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/full_connection_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/full_connection_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fused_batchnorm_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fused_batchnorm_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fused_batchnorm_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fused_batchnorm_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fused_batchnorm_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fused_batchnorm_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/fused_batchnorm_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/fused_batchnorm_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gather_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gather_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gather_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gather_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gather_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gather_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gather_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gather_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gather_nd_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gather_nd_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gather_nd_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gather_nd_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gather_nd_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gather_nd_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gather_nd_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gather_nd_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/glu_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/glu_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/glu_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/glu_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/glu_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/glu_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/glu_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/glu_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/group_conv2d_grad_input_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/group_conv2d_grad_input_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/group_conv2d_grad_input_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/group_conv2d_grad_input_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/group_conv2d_grad_input_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/group_conv2d_grad_input_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/group_conv2d_grad_input_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/group_conv2d_grad_input_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gru_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gru_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gru_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gru_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gru_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gru_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/gru_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/gru_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer_register.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer_register.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer_register.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer_register.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer_register.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer_register.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer_register.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer_register.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/instance_norm_fp32.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/instance_norm_fp32.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/instance_norm_fp32.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/instance_norm_fp32.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/instance_norm_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/instance_norm_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/instance_norm_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/instance_norm_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/invert_permutation_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/invert_permutation_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/invert_permutation_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/invert_permutation_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/invert_permutation_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/invert_permutation_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/invert_permutation_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/invert_permutation_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/layer_norm_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/layer_norm_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/layer_norm_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/layer_norm_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/layer_norm_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/layer_norm_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/layer_norm_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/layer_norm_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/layer_norm_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/layer_norm_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/layer_norm_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/layer_norm_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/layer_norm_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/layer_norm_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/layer_norm_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/layer_norm_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lin_space_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lin_space_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lin_space_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lin_space_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lin_space_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lin_space_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lin_space_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lin_space_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/log_softmax_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/log_softmax_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/log_softmax_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/log_softmax_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/log_softmax_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/log_softmax_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/log_softmax_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/log_softmax_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lstm_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lstm_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lstm_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lstm_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lstm_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lstm_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lstm_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lstm_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lstm_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lstm_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/lstm_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/lstm_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/matmul_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/matmul_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/matmul_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/matmul_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/matmul_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/matmul_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/matmul_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/matmul_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/max_min_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/max_min_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/max_min_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/max_min_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/max_min_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/max_min_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/max_min_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/max_min_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/mean_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/mean_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/mean_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/mean_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/mean_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/mean_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/mean_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/mean_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/mfcc_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/mfcc_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/mfcc_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/mfcc_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/mfcc_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/mfcc_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/mfcc_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/mfcc_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/non_max_suppression_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/non_max_suppression_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/non_max_suppression_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/non_max_suppression_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/non_max_suppression_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/non_max_suppression_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/non_max_suppression_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/non_max_suppression_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/one_hot_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/one_hot_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/one_hot_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/one_hot_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/one_hot_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/one_hot_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/one_hot_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/one_hot_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/partial_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/partial_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/partial_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/partial_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/partial_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/partial_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/partial_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/partial_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pooling_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pooling_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pooling_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pooling_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pooling_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pooling_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pooling_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pooling_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pooling_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pooling_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pooling_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pooling_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pooling_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pooling_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/pooling_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/pooling_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/power_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/power_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/power_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/power_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/power_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/power_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/power_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/power_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/prior_box_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/prior_box_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/prior_box_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/prior_box_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/prior_box_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/prior_box_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/prior_box_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/prior_box_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/quant_dtype_cast_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/quant_dtype_cast_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/quant_dtype_cast_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/quant_dtype_cast_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/quant_dtype_cast_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/quant_dtype_cast_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/quant_dtype_cast_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/quant_dtype_cast_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/ragged_range_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/ragged_range_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/ragged_range_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/ragged_range_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/ragged_range_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/ragged_range_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/ragged_range_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/ragged_range_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/random_standard_normal_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/random_standard_normal_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/random_standard_normal_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/random_standard_normal_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/random_standard_normal_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/random_standard_normal_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/random_standard_normal_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/random_standard_normal_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/range_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/range_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/range_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/range_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/range_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/range_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/range_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/range_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/rank_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/rank_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/rank_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/rank_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/rank_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/rank_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/rank_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/rank_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reduce_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reduce_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reduce_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reduce_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reduce_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reduce_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reduce_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reduce_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reduce_scatter.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reduce_scatter.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reduce_scatter.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reduce_scatter.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reshape_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reshape_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reshape_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reshape_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reshape_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reshape_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/reshape_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/reshape_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/resize_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/resize_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/resize_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/resize_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/resize_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/resize_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/resize_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/resize_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/resize_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/resize_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/resize_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/resize_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/resize_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/resize_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/resize_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/resize_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/rfft_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/rfft_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/rfft_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/rfft_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/rfft_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/rfft_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/rfft_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/rfft_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/roi_pooling_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/roi_pooling_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/roi_pooling_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/roi_pooling_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/roi_pooling_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/roi_pooling_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/roi_pooling_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/roi_pooling_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/scatter_nd_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/scatter_nd_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/scatter_nd_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/scatter_nd_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/scatter_nd_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/scatter_nd_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/scatter_nd_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/scatter_nd_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/scatter_nd_update_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/scatter_nd_update_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/scatter_nd_update_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/scatter_nd_update_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/scatter_nd_update_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/scatter_nd_update_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/scatter_nd_update_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/scatter_nd_update_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/select_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/select_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/select_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/select_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/select_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/select_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/select_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/select_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sgd_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sgd_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sgd_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sgd_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sgd_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sgd_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sgd_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sgd_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/shape_fusion_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/shape_fusion_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/shape_fusion_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/shape_fusion_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/shape_fusion_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/shape_fusion_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/shape_fusion_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/shape_fusion_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/shape_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/shape_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/shape_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/shape_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/shape_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/shape_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/shape_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/shape_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/size_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/size_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/size_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/size_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/size_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/size_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/size_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/size_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/slice_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/slice_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/slice_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/slice_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/slice_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/slice_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/slice_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/slice_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/softmax_cross_entropy_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/softmax_cross_entropy_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/softmax_cross_entropy_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/softmax_cross_entropy_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/softmax_cross_entropy_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/softmax_cross_entropy_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/softmax_cross_entropy_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/softmax_cross_entropy_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/softmax_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/softmax_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/softmax_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/softmax_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/softmax_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/softmax_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/softmax_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/softmax_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_batch_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_batch_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_batch_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_batch_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_batch_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_batch_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_batch_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_batch_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_batch_nd_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_batch_nd_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_batch_nd_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_batch_nd_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_batch_nd_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_batch_nd_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_batch_nd_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_batch_nd_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_depth_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_depth_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_depth_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_depth_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_depth_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_depth_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/space_to_depth_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/space_to_depth_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sparse_softmax_cross_entropy_with_logits_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sparse_softmax_cross_entropy_with_logits_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sparse_softmax_cross_entropy_with_logits_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sparse_softmax_cross_entropy_with_logits_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sparse_softmax_cross_entropy_with_logits_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sparse_softmax_cross_entropy_with_logits_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sparse_softmax_cross_entropy_with_logits_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sparse_softmax_cross_entropy_with_logits_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sparse_to_dense_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sparse_to_dense_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sparse_to_dense_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sparse_to_dense_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sparse_to_dense_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sparse_to_dense_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/sparse_to_dense_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/sparse_to_dense_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/splice_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/splice_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/splice_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/splice_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/splice_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/splice_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/splice_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/splice_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/split_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/split_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/split_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/split_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/split_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/split_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/split_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/split_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/split_with_over_lap_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/split_with_over_lap_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/split_with_over_lap_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/split_with_over_lap_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/split_with_over_lap_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/split_with_over_lap_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/split_with_over_lap_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/split_with_over_lap_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/squeeze_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/squeeze_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/squeeze_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/squeeze_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/squeeze_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/squeeze_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/squeeze_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/squeeze_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/stack_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/stack_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/stack_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/stack_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/stack_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/stack_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/stack_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/stack_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/strided_slice_grad_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/strided_slice_grad_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/strided_slice_grad_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/strided_slice_grad_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/strided_slice_grad_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/strided_slice_grad_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/strided_slice_grad_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/strided_slice_grad_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/strided_slice_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/strided_slice_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/strided_slice_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/strided_slice_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/strided_slice_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/strided_slice_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/strided_slice_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/strided_slice_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_extract_features_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_extract_features_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_extract_features_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_extract_features_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_extract_features_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_extract_features_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_extract_features_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_extract_features_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_normalize_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_normalize_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_normalize_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_normalize_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_normalize_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_normalize_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_normalize_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_normalize_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_predict_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_predict_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_predict_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_predict_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_predict_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_predict_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/custom_predict_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/custom_predict_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/hashtable_lookup_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/hashtable_lookup_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/hashtable_lookup_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/hashtable_lookup_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/hashtable_lookup_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/hashtable_lookup_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/hashtable_lookup_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/hashtable_lookup_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/lsh_projection_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/lsh_projection_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/lsh_projection_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/lsh_projection_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/lsh_projection_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/lsh_projection_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/lsh_projection_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/lsh_projection_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/skip_gram_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/skip_gram_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/skip_gram_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/skip_gram_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/skip_gram_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/skip_gram_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/string/skip_gram_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/string/skip_gram_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/tile_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/tile_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/tile_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/tile_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/tile_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/tile_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/tile_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/tile_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/topk_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/topk_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/topk_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/topk_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/topk_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/topk_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/topk_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/topk_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/transpose_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/transpose_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/transpose_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/transpose_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/transpose_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/transpose_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/transpose_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/transpose_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/uniform_real_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/uniform_real_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/uniform_real_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/uniform_real_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/uniform_real_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/uniform_real_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/uniform_real_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/uniform_real_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unique_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unique_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unique_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unique_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unique_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unique_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unique_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unique_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unsorted_segment_sum_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unsorted_segment_sum_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unsorted_segment_sum_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unsorted_segment_sum_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unsorted_segment_sum_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unsorted_segment_sum_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unsorted_segment_sum_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unsorted_segment_sum_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unsqueeze_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unsqueeze_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unsqueeze_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unsqueeze_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unsqueeze_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unsqueeze_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unsqueeze_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unsqueeze_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unstack_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unstack_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unstack_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unstack_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unstack_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unstack_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/unstack_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/unstack_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/where_infer.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/where_infer.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/where_infer.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/where_infer.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/where_infer.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/where_infer.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/where_infer.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/where_infer.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/instance_norm_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/instance_norm_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/instance_norm_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/instance_norm_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/add_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/add_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/add_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/add_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/add_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/add_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/add_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/add_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arg_min_max_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arg_min_max_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arg_min_max_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arg_min_max_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arg_min_max_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arg_min_max_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arg_min_max_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arg_min_max_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arithmetic_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arithmetic_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arithmetic_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arithmetic_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arithmetic_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arithmetic_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arithmetic_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arithmetic_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arithmetic_self_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arithmetic_self_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arithmetic_self_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arithmetic_self_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arithmetic_self_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arithmetic_self_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/arithmetic_self_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/arithmetic_self_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/batch_to_space_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/batch_to_space_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/batch_to_space_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/batch_to_space_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/batch_to_space_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/batch_to_space_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/batch_to_space_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/batch_to_space_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/batchnorm_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/batchnorm_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/batchnorm_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/batchnorm_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/batchnorm_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/batchnorm_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/batchnorm_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/batchnorm_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/common_func_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/common_func_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/common_func_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/common_func_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/common_func_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/common_func_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/common_func_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/common_func_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/concat_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/concat_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/concat_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/concat_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/concat_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/concat_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/concat_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/concat_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv1x1_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv1x1_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv1x1_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv1x1_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv1x1_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv1x1_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv1x1_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv1x1_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv3x3_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv3x3_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv3x3_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv3x3_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv3x3_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv3x3_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv3x3_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv3x3_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_depthwise_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_depthwise_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_depthwise_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_depthwise_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_depthwise_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_depthwise_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_depthwise_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_depthwise_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/conv_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/conv_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/crop_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/crop_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/crop_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/crop_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/crop_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/crop_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/crop_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/crop_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/deconv_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/deconv_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/deconv_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/deconv_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/deconv_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/deconv_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/deconv_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/deconv_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/depth_to_space_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/depth_to_space_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/depth_to_space_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/depth_to_space_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/depth_to_space_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/depth_to_space_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/depth_to_space_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/depth_to_space_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/div_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/div_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/div_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/div_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/div_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/div_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/div_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/div_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/dynamic_matmul_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/dynamic_matmul_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/dynamic_matmul_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/dynamic_matmul_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/dynamic_matmul_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/dynamic_matmul_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/dynamic_matmul_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/dynamic_matmul_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/dynamic_quant_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/dynamic_quant_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/dynamic_quant_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/dynamic_quant_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/dynamic_quant_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/dynamic_quant_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/dynamic_quant_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/dynamic_quant_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/fixed_point.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/fixed_point.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/fixed_point.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/fixed_point.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/fixed_point.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/fixed_point.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/fixed_point.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/fixed_point.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/gatherNd_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/gatherNd_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/gatherNd_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/gatherNd_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/gatherNd_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/gatherNd_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/gatherNd_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/gatherNd_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/gather_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/gather_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/gather_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/gather_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/gather_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/gather_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/gather_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/gather_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/hswish_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/hswish_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/hswish_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/hswish_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/hswish_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/hswish_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/hswish_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/hswish_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/l2_norm_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/l2_norm_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/l2_norm_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/l2_norm_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/l2_norm_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/l2_norm_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/l2_norm_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/l2_norm_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/layer_norm_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/layer_norm_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/layer_norm_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/layer_norm_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/layer_norm_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/layer_norm_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/layer_norm_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/layer_norm_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/leaky_relu_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/leaky_relu_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/leaky_relu_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/leaky_relu_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/leaky_relu_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/leaky_relu_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/leaky_relu_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/leaky_relu_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/matmul_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/matmul_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/matmul_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/matmul_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/matmul_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/matmul_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/matmul_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/matmul_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/mul_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/mul_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/mul_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/mul_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/mul_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/mul_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/mul_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/mul_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pack_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pack_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pack_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pack_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pack_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pack_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pack_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pack_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pad_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pad_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pad_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pad_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pad_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pad_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pad_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pad_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pooling_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pooling_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pooling_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pooling_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pooling_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pooling_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/pooling_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/pooling_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/power_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/power_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/power_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/power_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/power_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/power_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/power_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/power_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/quant_dtype_cast_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/quant_dtype_cast_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/quant_dtype_cast_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/quant_dtype_cast_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/quant_dtype_cast_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/quant_dtype_cast_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/quant_dtype_cast_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/quant_dtype_cast_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/quantize.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/quantize.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/quantize.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/quantize.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/quantize.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/quantize.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/quantize.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/quantize.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/reduce_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/reduce_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/reduce_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/reduce_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/reduce_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/reduce_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/reduce_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/reduce_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/relux_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/relux_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/relux_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/relux_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/relux_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/relux_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/relux_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/relux_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/reshape_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/reshape_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/reshape_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/reshape_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/reshape_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/reshape_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/reshape_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/reshape_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/resize_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/resize_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/resize_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/resize_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/resize_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/resize_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/resize_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/resize_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/scale_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/scale_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/scale_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/scale_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/scale_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/scale_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/scale_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/scale_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/sigmoid_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/sigmoid_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/sigmoid_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/sigmoid_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/sigmoid_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/sigmoid_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/sigmoid_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/sigmoid_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/slice_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/slice_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/slice_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/slice_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/slice_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/slice_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/slice_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/slice_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/softmax_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/softmax_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/softmax_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/softmax_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/softmax_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/softmax_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/softmax_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/softmax_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/space_to_batch_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/space_to_batch_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/space_to_batch_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/space_to_batch_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/space_to_batch_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/space_to_batch_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/space_to_batch_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/space_to_batch_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/split_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/split_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/split_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/split_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/split_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/split_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/split_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/split_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/squeeze_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/squeeze_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/squeeze_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/squeeze_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/squeeze_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/squeeze_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/squeeze_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/squeeze_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/sub_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/sub_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/sub_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/sub_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/sub_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/sub_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/sub_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/sub_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/tanh_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/tanh_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/tanh_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/tanh_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/tanh_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/tanh_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/tanh_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/tanh_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/topk_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/topk_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/topk_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/topk_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/topk_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/topk_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/topk_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/topk_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/transpose_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/transpose_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/transpose_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/transpose_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/transpose_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/transpose_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/transpose_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/transpose_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/unsqueeze_int8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/unsqueeze_int8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/unsqueeze_int8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/unsqueeze_int8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/unsqueeze_int8.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/unsqueeze_int8.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/int8/unsqueeze_int8.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/int8/unsqueeze_int8.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/DeconvMatMulAvx.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/DeconvMatMulAvx.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/DeconvMatMulAvx.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/DeconvMatMulAvx.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/PostFuncBiasReluC8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/PostFuncBiasReluC8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/PostFuncBiasReluC8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/PostFuncBiasReluC8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/TiledC8MatMulFp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/TiledC8MatMulFp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/TiledC8MatMulFp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/TiledC8MatMulFp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/WinogradPostFuncBiasReluC8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/WinogradPostFuncBiasReluC8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/WinogradPostFuncBiasReluC8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/WinogradPostFuncBiasReluC8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/WinogradTransAvx.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/WinogradTransAvx.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/WinogradTransAvx.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/WinogradTransAvx.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/common_utils.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/common_utils.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/common_utils.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/common_utils.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/common_utils.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/common_utils.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/avx/common_utils.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/avx/common_utils.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_avx512_instructions.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_avx512_instructions.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_avx512_instructions.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_avx512_instructions.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_avx_instructions.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_avx_instructions.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_avx_instructions.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_avx_instructions.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_instructions.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_instructions.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_instructions.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_instructions.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_instructions_fp16.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_instructions_fp16.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_instructions_fp16.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_instructions_fp16.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_neon_instructions.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_neon_instructions.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_neon_instructions.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_neon_instructions.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_sse_instructions.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_sse_instructions.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_sse_instructions.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_sse_instructions.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/ConvDwFp32IndirectRow.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/ConvDwFp32IndirectRow.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/ConvDwFp32IndirectRow.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/ConvDwFp32IndirectRow.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/ConvDwFp32Row_sse.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/ConvDwFp32Row_sse.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/ConvDwFp32Row_sse.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/ConvDwFp32Row_sse.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/DepthwiseFp32_Sse.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/DepthwiseFp32_Sse.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/DepthwiseFp32_Sse.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/DepthwiseFp32_Sse.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/MatMul_Sse.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/MatMul_Sse.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/MatMul_Sse.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/MatMul_Sse.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/PostFuncBiasReluC8.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/PostFuncBiasReluC8.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/PostFuncBiasReluC8.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/PostFuncBiasReluC8.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/TiledC4MatMulFp32.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/TiledC4MatMulFp32.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/TiledC4MatMulFp32.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/TiledC4MatMulFp32.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/WinogradPostFuncBiasReluC4.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/WinogradPostFuncBiasReluC4.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/WinogradPostFuncBiasReluC4.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/WinogradPostFuncBiasReluC4.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/WinogradTrans.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/WinogradTrans.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/WinogradTrans.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/WinogradTrans.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/sse_common.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/sse_common.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/sse/sse_common.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/sse/sse_common.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/kernel.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/kernel.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/kernel.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/kernel.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/kernel.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/kernel.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/l2_norm_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/l2_norm_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/l2_norm_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/l2_norm_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/layer_norm_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/layer_norm_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/layer_norm_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/layer_norm_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/lsh_projection_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/lsh_projection_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/lsh_projection_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/lsh_projection_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/lstm_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/lstm_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/lstm_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/lstm_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/matmul_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/matmul_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/matmul_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/matmul_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/mul_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/mul_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/mul_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/mul_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_common.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_common.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_common.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_common.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_common.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_common.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_common.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_common.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_utils.c b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_utils.c similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_utils.c rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_utils.c diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_utils.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_utils.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_utils.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_utils.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/non_max_suppression_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/non_max_suppression_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/non_max_suppression_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/non_max_suppression_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/one_hot_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/one_hot_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/one_hot_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/one_hot_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/op_base.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/op_base.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/op_base.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/op_base.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/optimize/CMakeLists.txt b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/optimize/CMakeLists.txt similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/optimize/CMakeLists.txt rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/optimize/CMakeLists.txt diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/pack.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/pack.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/pack.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/pack.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/pad_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/pad_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/pad_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/pad_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/partial_fusion_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/partial_fusion_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/partial_fusion_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/partial_fusion_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/pooling_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/pooling_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/pooling_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/pooling_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/power_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/power_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/power_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/power_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/predict_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/predict_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/predict_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/predict_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/prelu_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/prelu_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/prelu_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/prelu_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/prior_box_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/prior_box_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/prior_box_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/prior_box_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/ragged_range_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/ragged_range_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/ragged_range_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/ragged_range_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/random_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/random_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/random_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/random_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/reduce_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/reduce_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/reduce_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/reduce_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/reduce_scatter_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/reduce_scatter_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/reduce_scatter_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/reduce_scatter_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/reshape_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/reshape_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/reshape_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/reshape_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/resize_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/resize_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/resize_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/resize_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/reverse_sequence_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/reverse_sequence_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/reverse_sequence_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/reverse_sequence_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/scale.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/scale.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/scale.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/scale.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/sigmoid_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/sigmoid_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/sigmoid_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/sigmoid_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/skip_gram_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/skip_gram_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/skip_gram_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/skip_gram_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/slice_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/slice_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/slice_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/slice_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/softmax_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/softmax_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/softmax_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/softmax_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/space_to_depth_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/space_to_depth_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/space_to_depth_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/space_to_depth_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/sparse_to_dense_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/sparse_to_dense_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/sparse_to_dense_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/sparse_to_dense_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/splice_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/splice_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/splice_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/splice_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/split_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/split_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/split_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/split_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/squeeze_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/squeeze_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/squeeze_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/squeeze_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/stack_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/stack_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/stack_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/stack_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/strided_slice_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/strided_slice_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/strided_slice_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/strided_slice_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/tensor_array_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/tensor_array_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/tensor_array_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/tensor_array_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/tensor_c.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/tensor_c.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/tensor_c.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/tensor_c.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/tensorlist_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/tensorlist_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/tensorlist_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/tensorlist_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/transpose.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/transpose.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/transpose.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/transpose.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/unsqueeze_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/unsqueeze_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/unsqueeze_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/unsqueeze_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/unstack_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/unstack_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/unstack_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/unstack_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/upsample_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/upsample_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/upsample_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/upsample_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/where_parameter.h b/mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/where_parameter.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/where_parameter.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/where_parameter.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/one_hot_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/one_hot_cpu_kernel.cc index 3986f729cb..d017e741a2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/one_hot_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/one_hot_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/one_hot_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/one_hot_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/one_hot_cpu_kernel.h index 57b2256b25..6cbdad2f59 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/one_hot_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/pack_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/pack_cpu_kernel.cc index c0510bc6aa..521c4bf4ca 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/pack_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/pack_cpu_kernel.h" +#include "plugin/device/cpu/kernel/pack_cpu_kernel.h" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/pack_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/pack_cpu_kernel.h index 104bf3b427..8aea4c2ee1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pack_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/pack_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pad_and_shift_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/pad_and_shift_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/pad_and_shift_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/pad_and_shift_cpu_kernel.cc index d396e865ad..de88de13f1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pad_and_shift_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/pad_and_shift_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/pad_and_shift_cpu_kernel.h" +#include "plugin/device/cpu/kernel/pad_and_shift_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pad_and_shift_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/pad_and_shift_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/pad_and_shift_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/pad_and_shift_cpu_kernel.h index f3901cf676..35f6888d92 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pad_and_shift_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/pad_and_shift_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/pad_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/pad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/pad_cpu_kernel.cc index 85b4d1d4e7..e9ea64f593 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/pad_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/pad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/pad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/pad_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/pad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/pad_cpu_kernel.h index 1997e38349..4cd7ce6ee0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/pad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/print_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/print_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/print_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/print_cpu_kernel.cc index 412bff20e7..21a82a9e71 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/print_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/print_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/print_cpu_kernel.h" +#include "plugin/device/cpu/kernel/print_cpu_kernel.h" #include #include "ir/tensor.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" using mindspore::tensor::Tensor; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/print_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/print_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/print_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/print_cpu_kernel.h index d04712e5d5..8f808a2f46 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/print_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/print_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/apply_momentum_ps_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/apply_momentum_ps_kernel.cc index 1e92c7afef..178851741d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/apply_momentum_ps_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h" +#include "plugin/device/cpu/kernel/ps/apply_momentum_ps_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/apply_momentum_ps_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/apply_momentum_ps_kernel.h index 0a5951c700..b89d5e1f4d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/apply_momentum_ps_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" -#include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h" +#include "plugin/device/cpu/kernel/ps/pserver_kernel.h" +#include "plugin/device/cpu/kernel/apply_momentum_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_proxy_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_proxy_kernel.cc index df65632ab6..d776bf0867 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_proxy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h" +#include "plugin/device/cpu/kernel/ps/embedding_look_up_proxy_kernel.h" #include #include #include "ps/worker.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_proxy_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_proxy_kernel.h index b23ed91a62..8e21bb650d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_proxy_kernel.h @@ -17,9 +17,9 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_EMBEDDING_LOOK_UP_PROXY_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_EMBEDDING_LOOK_UP_PROXY_KERNEL_H_ -#include "backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h" +#include "plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.h" #include -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_ps_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_ps_kernel.cc index 5340d43387..8b6e3bbaa9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_ps_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h" +#include "plugin/device/cpu/kernel/ps/embedding_look_up_ps_kernel.h" #include #include #include -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" #include "ps/util.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_ps_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_ps_kernel.h index a77dba7ef6..af05744d0f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/embedding_look_up_ps_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h" -#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" +#include "plugin/device/cpu/kernel/embedding_look_up_cpu_kernel.h" +#include "plugin/device/cpu/kernel/ps/pserver_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/pserver_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/pserver_kernel.cc index 085c75173d..6cf1457c86 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/pserver_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" +#include "plugin/device/cpu/kernel/ps/pserver_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/pserver_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/pserver_kernel.h index d10b65a24b..eef1e55ed7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pserver_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/pserver_kernel.h @@ -18,7 +18,7 @@ #include #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #include "ps/util.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/pull_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/pull_kernel.cc index 84d429fd26..79b62c37cf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/pull_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ps/pull_kernel.h" +#include "plugin/device/cpu/kernel/ps/pull_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/pull_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/pull_kernel.h index 5adfed9967..ed9d702e25 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/pull_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/pull_kernel.h @@ -21,8 +21,8 @@ #include #include "ps/worker.h" #include "ps/util.h" -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/push_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/push_kernel.cc index 420dbd72a3..12dfdc46ce 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/push_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ps/push_kernel.h" +#include "plugin/device/cpu/kernel/ps/push_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/push_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/push_kernel.h index 59f3775928..a85757dba7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/push_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/push_kernel.h @@ -21,8 +21,8 @@ #include #include "ps/worker.h" #include "ps/util.h" -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_adam_ps_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_adam_ps_kernel.cc index c5ace7f592..2310ef9437 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_adam_ps_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.h" +#include "plugin/device/cpu/kernel/ps/sparse_apply_adam_ps_kernel.h" #include -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "ps/util.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_adam_ps_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_adam_ps_kernel.h index 8c47a67fc1..baeb75b6cc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_adam_ps_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" -#include "backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h" +#include "plugin/device/cpu/kernel/ps/pserver_kernel.h" +#include "plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_ftrl_ps_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_ftrl_ps_kernel.cc index b2d5e777e4..c5ed3ccdcc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_ftrl_ps_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/ps/sparse_apply_ftrl_ps_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_ftrl_ps_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_ftrl_ps_kernel.h index 129a3b21cb..1bd6d522b9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_ftrl_ps_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" -#include "backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/ps/pserver_kernel.h" +#include "plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_lazy_adam_ps_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_lazy_adam_ps_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_lazy_adam_ps_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_lazy_adam_ps_kernel.cc index 000ab4fa87..f8c9412c0d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_lazy_adam_ps_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_lazy_adam_ps_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/ps/sparse_apply_lazy_adam_ps_kernel.h" +#include "plugin/device/cpu/kernel/ps/sparse_apply_lazy_adam_ps_kernel.h" #include -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "ps/util.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_lazy_adam_ps_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_lazy_adam_ps_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_lazy_adam_ps_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_lazy_adam_ps_kernel.h index 82fee54a1a..676820cefe 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/ps/sparse_apply_lazy_adam_ps_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/ps/sparse_apply_lazy_adam_ps_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" -#include "backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h" +#include "plugin/device/cpu/kernel/ps/pserver_kernel.h" +#include "plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pyfunc/py_func_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/pyfunc/py_func_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/pyfunc/py_func_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/pyfunc/py_func_cpu_kernel.cc index 64e388b99b..57fcf49726 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pyfunc/py_func_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/pyfunc/py_func_cpu_kernel.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/pyfunc/py_func_cpu_kernel.h" +#include "plugin/device/cpu/kernel/pyfunc/py_func_cpu_kernel.h" #include #include #include "Eigen/Core" #include "Eigen/src/Core/arch/CUDA/Half.h" #include "abstract/utils.h" -#include "runtime/device/cpu/cpu_common.h" +#include "plugin/device/cpu/hal/device/cpu_common.h" #include "pybind_api/ir/tensor_py.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/pyfunc/py_func_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/pyfunc/py_func_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/pyfunc/py_func_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/pyfunc/py_func_cpu_kernel.h index d9ed9d9f2d..1c5df6b04e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/pyfunc/py_func_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/pyfunc/py_func_cpu_kernel.h @@ -23,7 +23,7 @@ #include #include "pybind11/pybind11.h" #include "pybind11/numpy.h" -#include "backend/kernel_compiler/cpu/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" namespace py = pybind11; namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/random_choice_with_mask_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/random_choice_with_mask_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/random_choice_with_mask_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/random_choice_with_mask_cpu_kernel.cc index 3bcb32d2db..2f6b9a1409 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/random_choice_with_mask_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/random_choice_with_mask_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/random_choice_with_mask_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/random_choice_with_mask_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #define MAX_DIMENSION 5 namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/random_choice_with_mask_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/random_choice_with_mask_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/random_choice_with_mask_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/random_choice_with_mask_cpu_kernel.h index 4edfe964c9..02030400f5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/random_choice_with_mask_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/random_choice_with_mask_cpu_kernel.h @@ -18,8 +18,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/random_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/random_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/random_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/random_cpu_kernel.cc index 5cf0b4c658..e968eca930 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/random_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/random_cpu_kernel.cc @@ -15,8 +15,8 @@ */ #include #include -#include "runtime/device/cpu/cpu_device_address.h" -#include "backend/kernel_compiler/cpu/random_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "plugin/device/cpu/kernel/random_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/random_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/random_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/random_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/random_cpu_kernel.h index bb7630dd70..9d50ee90e1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/random_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/random_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/range_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/range_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/range_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/range_cpu_kernel.cc index b6af1936f7..f18e7cecd2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/range_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/range_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/range_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/range_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/range_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/range_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/range_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/range_cpu_kernel.h index 1b9bd26cc8..05cf75d79a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/range_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/range_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rank_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rank_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rank_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rank_cpu_kernel.cc index 9fbf7bc136..8c031505fc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rank_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rank_cpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rank_cpu_kernel.h" +#include "plugin/device/cpu/kernel/rank_cpu_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rank_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rank_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rank_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rank_cpu_kernel.h index df95b8a97d..8355806f02 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rank_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rank_cpu_kernel.h @@ -19,9 +19,9 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/reduce_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/reduce_cpu_kernel.cc index a975d687bf..6a5637e372 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/reduce_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/reduce_cpu_kernel.h" +#include "plugin/device/cpu/kernel/reduce_cpu_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/reduce_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/reduce_cpu_kernel.h index 7745642b00..8f6ea8abad 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/reduce_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/reduce_scatter_cpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/reduce_scatter_cpu_kernel.cc index 4061eefa98..b78c0ae16b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/reduce_scatter_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" -#include "runtime/device/cpu/mpi/mpi_interface.h" +#include "plugin/device/cpu/kernel/reduce_scatter_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/mpi/mpi_interface.h" #include "ir/primitive.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/reduce_scatter_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/reduce_scatter_cpu_kernel.h index 38c292fa05..6d53826034 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/reduce_scatter_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/reduce_scatter_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/reshape_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/reshape_cpu_kernel.cc index a8004c54b1..b7d97390a5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/reshape_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/reshape_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/reshape_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/reshape_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/reshape_cpu_kernel.h index 6497db6787..0a42aae212 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/reshape_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/reshape_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_cpu_kernel.cc index e5bdcec943..7e739163b5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/resize_bilinear_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/cpu/kernel/resize_bilinear_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_cpu_kernel.h index 01479aa0d0..16a4d72129 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_grad_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_grad_cpu_kernel.cc index 40af15164d..332a843b32 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/resize_bilinear_grad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/cpu/kernel/resize_bilinear_grad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_grad_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_grad_cpu_kernel.h index 8245869b79..87f915a820 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_bilinear_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_bilinear_grad_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_cpu_kernel.cc index 362be107ac..19fddba2db 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/resize_nearest_neighbor_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/cpu/kernel/resize_nearest_neighbor_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_cpu_kernel.h index 184685d035..2a0e98f166 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_grad_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_grad_cpu_kernel.cc index 445c1a8674..4a55ee577d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_grad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/resize_nearest_neighbor_grad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/cpu/kernel/resize_nearest_neighbor_grad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_grad_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_grad_cpu_kernel.h index 5dca1a3940..3551766516 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/resize_nearest_neighbor_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/resize_nearest_neighbor_grad_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_append_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_append_cpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_append_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_append_cpu_kernel.cc index 7487a774e6..7002fff61b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_append_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_append_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rl/buffer_append_cpu_kernel.h" +#include "plugin/device/cpu/kernel/rl/buffer_append_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_append_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_append_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_append_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_append_cpu_kernel.h index f751d137f3..9ce1c5e39e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_append_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_append_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_get_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_get_cpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_get_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_get_cpu_kernel.cc index 1fb36790d1..597eedd4b3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_get_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_get_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rl/buffer_get_cpu_kernel.h" +#include "plugin/device/cpu/kernel/rl/buffer_get_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_get_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_get_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_get_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_get_cpu_kernel.h index 3840d35620..850da512ac 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_get_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_get_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_sample_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_sample_cpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_sample_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_sample_cpu_kernel.cc index 001bc0430a..435fbad81c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_sample_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_sample_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rl/buffer_sample_cpu_kernel.h" +#include "plugin/device/cpu/kernel/rl/buffer_sample_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_sample_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_sample_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_sample_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_sample_cpu_kernel.h index b375a9ea66..e15b6b037a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/buffer_sample_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/buffer_sample_cpu_kernel.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_clear_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_clear_kernel.cc similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_clear_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_clear_kernel.cc index ad5dc14129..4c6061e4ed 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_clear_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_clear_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rl/tensor_array_clear_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_tensor_array.h" +#include "plugin/device/cpu/kernel/rl/tensor_array_clear_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_clear_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_clear_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_clear_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_clear_kernel.h index 94a3a7d1a7..cca477780a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_clear_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_clear_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_close_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_close_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_close_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_close_kernel.cc index 72c07c6ef7..62d55c265f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_close_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_close_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rl/tensor_array_close_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_tensor_array.h" +#include "plugin/device/cpu/kernel/rl/tensor_array_close_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_close_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_close_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_close_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_close_kernel.h index 2a53fd9d54..b032a05cb0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_close_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_close_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_create_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_create_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_create_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_create_kernel.cc index 3b1346958b..2ccba5c7c9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_create_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_create_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ #include -#include "backend/kernel_compiler/cpu/rl/tensor_array_create_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_tensor_array.h" +#include "plugin/device/cpu/kernel/rl/tensor_array_create_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_create_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_create_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_create_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_create_kernel.h index f264061341..640c7b7933 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_create_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_create_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_read_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_read_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_read_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_read_kernel.cc index f9f18d7582..da77db85e8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_read_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_read_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rl/tensor_array_read_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_tensor_array.h" +#include "plugin/device/cpu/kernel/rl/tensor_array_read_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_read_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_read_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_read_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_read_kernel.h index a6f3bed5bb..f221c03d39 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_read_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_read_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_size_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_size_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_size_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_size_kernel.cc index da318dfa67..f8845c0c55 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_size_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_size_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rl/tensor_array_size_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_tensor_array.h" +#include "plugin/device/cpu/kernel/rl/tensor_array_size_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_size_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_size_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_size_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_size_kernel.h index f7f44ce9e0..ab8e2f7276 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_size_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_size_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_stack_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_stack_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_stack_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_stack_kernel.cc index e525c59e8d..1feee8ad3c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_stack_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_stack_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rl/tensor_array_stack_kernel.h" +#include "plugin/device/cpu/kernel/rl/tensor_array_stack_kernel.h" #include -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_tensor_array.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_stack_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_stack_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_stack_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_stack_kernel.h index 9e531a1736..432911869f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_stack_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_stack_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_write_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_write_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_write_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_write_kernel.cc index 9ed568ac09..aa1627507e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_write_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_write_kernel.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rl/tensor_array_write_kernel.h" +#include "plugin/device/cpu/kernel/rl/tensor_array_write_kernel.h" #include -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_tensor_array.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" -#include "runtime/hardware/cpu/cpu_memory_pool.h" +#include "plugin/device/cpu/hal/hardware/cpu_memory_pool.h" namespace mindspore { namespace kernel { constexpr size_t kSecondInputIndex = 2; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_write_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_write_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_write_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_write_kernel.h index 64cd3a3c72..3d039eb296 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rl/tensor_array_write_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rl/tensor_array_write_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rmsprop_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rmsprop_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rmsprop_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rmsprop_cpu_kernel.cc index 189354c13a..8a77d1410a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rmsprop_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rmsprop_cpu_kernel.cc @@ -17,7 +17,7 @@ #include "nnacl/errorcode.h" #include "nnacl/fp32/rmsprop_fp32.h" #include "utils/ms_utils.h" -#include "backend/kernel_compiler/cpu/rmsprop_cpu_kernel.h" +#include "plugin/device/cpu/kernel/rmsprop_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rmsprop_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rmsprop_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rmsprop_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rmsprop_cpu_kernel.h index 873efbd6d6..61ab131e07 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rmsprop_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rmsprop_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_RMSPROP_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_cpu_kernel.cc index 346bfe46fe..0993b4bd1e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/roi_align_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/roi_align_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_cpu_kernel.h index bdeeec5060..76f77c13d7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_cpu_kernel.h @@ -16,8 +16,8 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_ROI_ALIGN_CPU_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_ROI_ALIGN_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_grad_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_grad_cpu_kernel.cc index a6985bad7c..9ae4b58f21 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_grad_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/roi_align_grad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/roi_align_grad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_grad_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_grad_cpu_kernel.h index aef0089843..868e52acfa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/roi_align_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/roi_align_grad_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_ROI_ALIGN_CPU_KERNEL_H_ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rolling_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/rolling_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rolling_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/rolling_cpu_kernel.cc index 2cd81df69b..c46060b487 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rolling_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rolling_cpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/rolling_cpu_kernel.h" +#include "plugin/device/cpu/kernel/rolling_cpu_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/rolling_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/rolling_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/rolling_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/rolling_cpu_kernel.h index fb76705f84..a6501a27f7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/rolling_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/rolling_cpu_kernel.h @@ -18,9 +18,9 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_arithmetic_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_arithmetic_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_arithmetic_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/scatter_arithmetic_cpu_kernel.cc index 1e54040c7e..2f56005149 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_arithmetic_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_arithmetic_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/scatter_arithmetic_cpu_kernel.h" +#include "plugin/device/cpu/kernel/scatter_arithmetic_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_arithmetic_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_arithmetic_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_arithmetic_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/scatter_arithmetic_cpu_kernel.h index db40fec5d5..48099e3fd5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_arithmetic_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_arithmetic_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_cpu_kernel.cc index 5a77dd7c24..5c233d29b0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/scatter_nd_cpu_kernel.h" +#include "plugin/device/cpu/kernel/scatter_nd_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_cpu_kernel.h index e1b8ec276e..8aa1a560e9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_update_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_update_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_update_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_update_cpu_kernel.cc index 821e205834..0cf665af7a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_update_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_update_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/scatter_nd_update_cpu_kernel.h" +#include "plugin/device/cpu/kernel/scatter_nd_update_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_update_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_update_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_update_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_update_cpu_kernel.h index db0f4b8d57..a3e6abef96 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/scatter_nd_update_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/scatter_nd_update_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/searchsorted_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/searchsorted_cpu_kernel.cc index d021e05625..e2cbfe5f6f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/searchsorted_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/searchsorted_cpu_kernel.h" +#include "plugin/device/cpu/kernel/searchsorted_cpu_kernel.h" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/searchsorted_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/searchsorted_cpu_kernel.h index 3face108e8..67f525cf1e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/searchsorted_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/searchsorted_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SEARCHSORTED_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/select_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/select_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/select_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/select_cpu_kernel.cc index c02d075951..5b74d3d9ac 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/select_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/select_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/select_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/select_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/select_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/select_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/select_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/select_cpu_kernel.h index 1689bf41b0..f70a9f7ac7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/select_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/select_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SELECT_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sgd_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sgd_cpu_kernel.cc index 533c1ef459..a9d813d697 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sgd_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/sgd_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sgd_cpu_kernel.h" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sgd_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sgd_cpu_kernel.h index fa76a01f4a..0cf4971672 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sgd_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sgd_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/shift_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/shift_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/shift_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/shift_cpu_kernel.cc index edd4f03af6..c4ee4c2abe 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/shift_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/shift_cpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/shift_cpu_kernel.h" +#include "plugin/device/cpu/kernel/shift_cpu_kernel.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/shift_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/shift_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/shift_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/shift_cpu_kernel.h index c24f4b282c..1df9cb78b7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/shift_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/shift_cpu_kernel.h @@ -17,9 +17,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SORT_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_cpu_kernel.cc index 2e122d2f9f..117fda55b2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_cpu_kernel.h index 485365d7cd..7ba681cc92 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.cc index f2cd24f4a9..cde1b6b855 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.h index fd3dd0d71e..83058ea771 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sigmoid_cross_entropy_with_logits_grad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/slice_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/slice_cpu_kernel.cc index 4c0d21f7f2..83488e6e24 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/slice_cpu_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/slice_cpu_kernel.h" +#include "plugin/device/cpu/kernel/slice_cpu_kernel.h" #include #include #include "common/thread_pool.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/slice_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/slice_cpu_kernel.h index ae751eaa47..f0b4cc3752 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/slice_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "nnacl/base/slice_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/slice_grad_cpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/slice_grad_cpu_kernel.cc index d362552da7..b1bebd22cd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/slice_grad_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/slice_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/slice_grad_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "ir/primitive.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/slice_grad_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/slice_grad_cpu_kernel.h index d398e78172..6cce3c0cf8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/slice_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/slice_grad_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_cpu_kernel.cc index 6f304a6215..6984bbad3f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/smooth_l1_loss_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/smooth_l1_loss_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_cpu_kernel.h index 13a9c7aa96..f0b709601f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_grad_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_grad_cpu_kernel.cc index 20c7940297..ea974c4c3e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_grad_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/smooth_l1_loss_grad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/smooth_l1_loss_grad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_grad_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_grad_cpu_kernel.h index 98d05ddc11..3335004fb7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/smooth_l1_loss_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/smooth_l1_loss_grad_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sort_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sort_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sort_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sort_cpu_kernel.cc index 9700e3b10d..738ab64e5b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sort_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sort_cpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/sort_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sort_cpu_kernel.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sort_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sort_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sort_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sort_cpu_kernel.h index 7063f62672..510d799712 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sort_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sort_cpu_kernel.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SORT_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/spacetodepth_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/spacetodepth_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/spacetodepth_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/spacetodepth_cpu_kernel.cc index fe9549c3a7..aa58345aea 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/spacetodepth_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/spacetodepth_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/spacetodepth_cpu_kernel.h" +#include "plugin/device/cpu/kernel/spacetodepth_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/spacetodepth_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/spacetodepth_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/spacetodepth_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/spacetodepth_cpu_kernel.h index 5ba4e1bd9d..c2a55519c5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/spacetodepth_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/spacetodepth_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.cc index 2a6653a0c8..9834bd8d97 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#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" +#include "plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.h index 1bbeaac31e..c700431912 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SPARSE_APPLY_ADAM_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/sparse_optimizer_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sparse_optimizer_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.cc index 1ef4dd4225..6886fdce72 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#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" +#include "plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.h index 6fe7ac92d8..fd582bd37a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SPARSE_APPLY_FTRL_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/sparse_optimizer_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sparse_optimizer_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.cc index b2a767499d..92331f622c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#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" +#include "plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.h index 72ddc93708..1a01f957cd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SPARSE_APPLY_LAZY_ADAM_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/sparse_optimizer_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sparse_optimizer_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.cc index 6f4f9549a6..0cf5d22528 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#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" +#include "plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.h index a2457bc1d8..6a7f95a63d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SPARSE_APPLY_PROXIMAL_ADAGRAD_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/sparse_optimizer_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sparse_optimizer_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_optimizer_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_optimizer_cpu_kernel.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_optimizer_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_optimizer_cpu_kernel.h index b778383a22..8490bb7785 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_optimizer_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_optimizer_cpu_kernel.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "common/thread_pool.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_tensor_dense_matmul_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_tensor_dense_matmul_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_tensor_dense_matmul_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_tensor_dense_matmul_cpu_kernel.cc index bfc9cf611e..feb2d8d267 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_tensor_dense_matmul_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_tensor_dense_matmul_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/sparse_tensor_dense_matmul_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sparse_tensor_dense_matmul_cpu_kernel.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_tensor_dense_matmul_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_tensor_dense_matmul_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_tensor_dense_matmul_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_tensor_dense_matmul_cpu_kernel.h index c6fd55b5f2..ef96f41621 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_tensor_dense_matmul_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_tensor_dense_matmul_cpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_SPARSE_TENSOR_DENSE_MATMUL_CPU_KERNEL_H_ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_to_dense_cpu_kernal.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_to_dense_cpu_kernal.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_to_dense_cpu_kernal.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_to_dense_cpu_kernal.cc index 60b9f5d658..a3e13c0c8f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_to_dense_cpu_kernal.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_to_dense_cpu_kernal.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/sparse_to_dense_cpu_kernal.h" +#include "plugin/device/cpu/kernel/sparse_to_dense_cpu_kernal.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_to_dense_cpu_kernal.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_to_dense_cpu_kernal.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_to_dense_cpu_kernal.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sparse_to_dense_cpu_kernal.h index bf2ea0dd90..9603b038c3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sparse_to_dense_cpu_kernal.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sparse_to_dense_cpu_kernal.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/split_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/split_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/split_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/split_cpu_kernel.cc index d4726a4627..e440dcf4d0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/split_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/split_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/split_cpu_kernel.h" +#include "plugin/device/cpu/kernel/split_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/split_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/split_cpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/split_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/split_cpu_kernel.h index d821f81611..36cdbafe68 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/split_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/split_cpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/nnacl/base/split_base.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/nnacl/base/split_base.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/strided_slice_grad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/strided_slice_grad_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/strided_slice_grad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/strided_slice_grad_cpu_kernel.cc index d36ffb99aa..e2d692594b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/strided_slice_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/strided_slice_grad_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/strided_slice_grad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/strided_slice_grad_cpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "nnacl/fp32_grad/strided_slice_grad.h" #include "ir/primitive.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/strided_slice_grad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/strided_slice_grad_cpu_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/strided_slice_grad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/strided_slice_grad_cpu_kernel.h index 23cf34662a..b643648394 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/strided_slice_grad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/strided_slice_grad_cpu_kernel.h @@ -17,9 +17,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_CPU_STRIDED_SLICE_GRAD_CPU_KERNEL_H_ #include #include -#include "backend/kernel_compiler/cpu/nnacl/fp32_grad/strided_slice_grad.h" -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/nnacl/fp32_grad/strided_slice_grad.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/stridedslice_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/stridedslice_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/stridedslice_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/stridedslice_cpu_kernel.cc index b2b7a5d1b8..2793b3a965 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/stridedslice_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/stridedslice_cpu_kernel.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/stridedslice_cpu_kernel.h" +#include "plugin/device/cpu/kernel/stridedslice_cpu_kernel.h" #include #include #include #include #include "common/thread_pool.h" -#include "runtime/device/cpu/cpu_device_address.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/stridedslice_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/stridedslice_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/stridedslice_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/stridedslice_cpu_kernel.h index 00df50159e..1fe529204f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/stridedslice_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/stridedslice_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "nnacl/fp32/strided_slice_fp32.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sub_and_filter_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/sub_and_filter_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sub_and_filter_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/sub_and_filter_cpu_kernel.cc index 245a858a0e..f1d09663df 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sub_and_filter_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sub_and_filter_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/sub_and_filter_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sub_and_filter_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/sub_and_filter_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/sub_and_filter_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/sub_and_filter_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/sub_and_filter_cpu_kernel.h index c9b04b624e..88c39fd667 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/sub_and_filter_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/sub_and_filter_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_cpu_kernel.cc index 1f5683ba3a..24c7cc3bd2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_cpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/tensor_copy_cpu_kernel.h" +#include "plugin/device/cpu/kernel/tensor_copy_cpu_kernel.h" #include #include -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_cpu_kernel.h index af574335c1..1dd69512a4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_slices_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_slices_cpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_slices_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_slices_cpu_kernel.cc index 074fde83e8..083f297e8c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_slices_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_slices_cpu_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/tensor_copy_slices_cpu_kernel.h" +#include "plugin/device/cpu/kernel/tensor_copy_slices_cpu_kernel.h" #include #include #include "abstract/utils.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_slices_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_slices_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_slices_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_slices_cpu_kernel.h index 20721ac4c1..3b455ccba9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensor_copy_slices_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/tensor_copy_slices_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "nnacl/fp32/strided_slice_fp32.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/tensoradd_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/tensoradd_cpu_kernel.cc index df30f7b52b..a01d7a5482 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/tensoradd_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/tensoradd_cpu_kernel.h" +#include "plugin/device/cpu/kernel/tensoradd_cpu_kernel.h" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/tensoradd_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/tensoradd_cpu_kernel.h index b8990f33e9..e3dd79cefa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/tensoradd_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/tensoradd_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/tile_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/tile_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/tile_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/tile_cpu_kernel.cc index 6ce029ec60..fa65f407c8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/tile_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/tile_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/tile_cpu_kernel.h" +#include "plugin/device/cpu/kernel/tile_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/tile_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/tile_cpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/tile_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/tile_cpu_kernel.h index c656bd26e3..3ce1150fa3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/tile_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/tile_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "nnacl/base/tile_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/topk_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/topk_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/topk_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/topk_cpu_kernel.cc index 3af7925c8f..802871dabc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/topk_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/topk_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/topk_cpu_kernel.h" +#include "plugin/device/cpu/kernel/topk_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/topk_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/topk_cpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/topk_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/topk_cpu_kernel.h index a447a5d296..e8125f7963 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/topk_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/topk_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/transpose_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/transpose_cpu_kernel.cc index a6c984105d..f70edb1533 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/transpose_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/transpose_cpu_kernel.h" +#include "plugin/device/cpu/kernel/transpose_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" #include "nnacl/fp32/transpose_fp32.h" #include "nnacl/int8/transpose_int8.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/transpose_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/transpose_cpu_kernel.h index 838fcc54a6..538e3d93e4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/transpose_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/transpose_cpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "nnacl/base/transpose_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unary_op_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/unary_op_cpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unary_op_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/unary_op_cpu_kernel.cc index 3112b97588..59c1045228 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unary_op_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unary_op_cpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/unary_op_cpu_kernel.h" +#include "plugin/device/cpu/kernel/unary_op_cpu_kernel.h" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unary_op_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/unary_op_cpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unary_op_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/unary_op_cpu_kernel.h index f4105ca9c8..ff65d56b18 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unary_op_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unary_op_cpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" using complex64 = std::complex; using complex128 = std::complex; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unique_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/unique_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unique_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/unique_cpu_kernel.cc index 21036d7879..7fc8fd0572 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unique_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unique_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/unique_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/unique_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unique_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/unique_cpu_kernel.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unique_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/unique_cpu_kernel.h index b34847596c..759b894f16 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unique_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unique_cpu_kernel.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/unique_with_pad_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/unique_with_pad_cpu_kernel.cc index d88f326f94..6c1d5e2518 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unique_with_pad_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/unique_with_pad_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/unique_with_pad_cpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/unique_with_pad_cpu_kernel.h index c7bb5e0ed3..7b0420d9a1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unique_with_pad_cpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/unique_cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/unique_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unpack_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/unpack_cpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unpack_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/unpack_cpu_kernel.cc index a4d37684c9..a7ebfd485f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unpack_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unpack_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/unpack_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/unpack_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unpack_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/unpack_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unpack_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/unpack_cpu_kernel.h index 25fcd3fb31..c3027c287e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unpack_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unpack_cpu_kernel.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "nnacl/base/unstack_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unsorted_segment_sum_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/unsorted_segment_sum_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unsorted_segment_sum_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/unsorted_segment_sum_cpu_kernel.cc index 937f80795f..307488ed76 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unsorted_segment_sum_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unsorted_segment_sum_cpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/unsorted_segment_sum_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/unsorted_segment_sum_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/unsorted_segment_sum_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/unsorted_segment_sum_cpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/unsorted_segment_sum_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/unsorted_segment_sum_cpu_kernel.h index a2ea8fea74..292c54a589 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/unsorted_segment_sum_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/unsorted_segment_sum_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" #include "nnacl/base/unsorted_segment_sum_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/update_cache_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/update_cache_cpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/update_cache_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/update_cache_cpu_kernel.cc index 3e9e2d7c69..7d9f677a1f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/update_cache_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/update_cache_cpu_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/cpu/update_cache_cpu_kernel.h" +#include "plugin/device/cpu/kernel/update_cache_cpu_kernel.h" #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/update_cache_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/update_cache_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/update_cache_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/update_cache_cpu_kernel.h index 59a139dba7..8777046acf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/update_cache_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/update_cache_cpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/upper_bound_cpu_kernel.cc b/mindspore/ccsrc/plugin/device/cpu/kernel/upper_bound_cpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/upper_bound_cpu_kernel.cc rename to mindspore/ccsrc/plugin/device/cpu/kernel/upper_bound_cpu_kernel.cc index e8aa081aa1..a084e7f90a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/upper_bound_cpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/upper_bound_cpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/cpu/upper_bound_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/kernel/upper_bound_cpu_kernel.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" namespace { size_t kDataSizeThreshold_ = 4 * 1024; diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/upper_bound_cpu_kernel.h b/mindspore/ccsrc/plugin/device/cpu/kernel/upper_bound_cpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/cpu/upper_bound_cpu_kernel.h rename to mindspore/ccsrc/plugin/device/cpu/kernel/upper_bound_cpu_kernel.h index 955692544e..6820ec7463 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/upper_bound_cpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/cpu/kernel/upper_bound_cpu_kernel.h @@ -18,8 +18,8 @@ #include -#include "backend/kernel_compiler/cpu/cpu_kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/cpu_kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/plugin/device/cpu/optimizer/CMakeLists.txt b/mindspore/ccsrc/plugin/device/cpu/optimizer/CMakeLists.txt new file mode 100644 index 0000000000..105f8eb7ee --- /dev/null +++ b/mindspore/ccsrc/plugin/device/cpu/optimizer/CMakeLists.txt @@ -0,0 +1,18 @@ +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -Wno-user-defined-warnings -Wno-inconsistent-missing-override \ + -Wno-overloaded-virtual -Wno-unused-const-variable -Wno-pessimizing-move") +endif() + +file(GLOB_RECURSE _CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") +list(APPEND _CPU_SRC_LIST ${_CPU_SRC_LIST}) + +set_property(SOURCE ${_CPU_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT) +if(ENABLE_CPU) + add_library(_mindspore_plugin_device_cpu_optimizer_obj OBJECT ${_CPU_SRC_LIST}) +endif() diff --git a/mindspore/ccsrc/backend/optimizer/cpu/insert_cast_cpu.cc b/mindspore/ccsrc/plugin/device/cpu/optimizer/insert_cast_cpu.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/cpu/insert_cast_cpu.cc rename to mindspore/ccsrc/plugin/device/cpu/optimizer/insert_cast_cpu.cc index f5c74be16f..29509adf35 100644 --- a/mindspore/ccsrc/backend/optimizer/cpu/insert_cast_cpu.cc +++ b/mindspore/ccsrc/plugin/device/cpu/optimizer/insert_cast_cpu.cc @@ -14,21 +14,21 @@ * limitations under the License. */ -#include "backend/optimizer/cpu/insert_cast_cpu.h" +#include "plugin/device/cpu/optimizer/insert_cast_cpu.h" #include #include #include #include #include -#include "backend/optimizer/common/helper.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/optimizer/helper.h" +#include "kernel/kernel_build_info.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" #include "utils/utils.h" #include "utils/ms_context.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" #include "base/core_ops.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/cpu/insert_cast_cpu.h b/mindspore/ccsrc/plugin/device/cpu/optimizer/insert_cast_cpu.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/cpu/insert_cast_cpu.h rename to mindspore/ccsrc/plugin/device/cpu/optimizer/insert_cast_cpu.h index a04fcb1337..29f964ca80 100644 --- a/mindspore/ccsrc/backend/optimizer/cpu/insert_cast_cpu.h +++ b/mindspore/ccsrc/plugin/device/cpu/optimizer/insert_cast_cpu.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_CPU_INSERT_CAST_CPU_H #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "ir/anf.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/cpu/insert_format_transform_op.cc b/mindspore/ccsrc/plugin/device/cpu/optimizer/insert_format_transform_op.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/cpu/insert_format_transform_op.cc rename to mindspore/ccsrc/plugin/device/cpu/optimizer/insert_format_transform_op.cc index 3c60e4047f..3329cbb1b5 100644 --- a/mindspore/ccsrc/backend/optimizer/cpu/insert_format_transform_op.cc +++ b/mindspore/ccsrc/plugin/device/cpu/optimizer/insert_format_transform_op.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/cpu/insert_format_transform_op.h" +#include "plugin/device/cpu/optimizer/insert_format_transform_op.h" #include #include @@ -22,9 +22,9 @@ #include #include #include "utils/hash_set.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/cpu/insert_format_transform_op.h b/mindspore/ccsrc/plugin/device/cpu/optimizer/insert_format_transform_op.h similarity index 93% rename from mindspore/ccsrc/backend/optimizer/cpu/insert_format_transform_op.h rename to mindspore/ccsrc/plugin/device/cpu/optimizer/insert_format_transform_op.h index 90152272a9..e835d0e882 100644 --- a/mindspore/ccsrc/backend/optimizer/cpu/insert_format_transform_op.h +++ b/mindspore/ccsrc/plugin/device/cpu/optimizer/insert_format_transform_op.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_CPU_INSERT_FORMAT_TRANSFORM_OP_H #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "ir/anf.h" namespace mindspore { diff --git a/mindspore/ccsrc/plugin/device/gpu/hal/device/CMakeLists.txt b/mindspore/ccsrc/plugin/device/gpu/hal/device/CMakeLists.txt new file mode 100644 index 0000000000..2c198d6fc3 --- /dev/null +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/CMakeLists.txt @@ -0,0 +1,50 @@ +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +if(ENABLE_GPU) + list(APPEND DEVICE_SRC_LIST "distribution/collective_init.cc") +else() + list(APPEND DEVICE_SRC_LIST "distribution/collective_fake_init.cc") +endif() + +if(ENABLE_GPU) + if(ENABLE_MPI) + set_property(SOURCE "mpi/mpi_initializer.cc" + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + pybind11_add_module(_ms_mpi NO_EXTRAS "mpi/mpi_initializer.cc") + target_link_libraries(_ms_mpi PRIVATE mindspore::pybind11_module mindspore::ompi) + endif() + + file(GLOB_RECURSE CUDA_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc" "*.cu") + + set(GPU_QUEUE_SRCS "blocking_queue.cc" "gpu_buffer_mgr.cc") + set(GPU_COLLECTIVE_SRCS "distribution/collective_wrapper.cc" + "distribution/mpi_wrapper.cc" + "distribution/nccl_wrapper.cc") + + # gpu_queue + list(REMOVE_ITEM CUDA_SRC_LIST ${GPU_QUEUE_SRCS}) + set_property(SOURCE ${GPU_QUEUE_SRCS} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + add_library(gpu_queue SHARED ${GPU_QUEUE_SRCS}) + target_link_libraries(gpu_queue ${CMAKE_THREAD_LIBS_INIT} ${CUDA_PATH}/lib64/libcudart.so) + + list(REMOVE_ITEM CUDA_SRC_LIST "mpi/mpi_initializer.cc" ${GPU_COLLECTIVE_SRCS}) + + if(ENABLE_MPI) + include(ExternalProject) + # gpu_collective + set_property(SOURCE ${GPU_COLLECTIVE_SRCS} + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + add_library(gpu_collective SHARED ${GPU_COLLECTIVE_SRCS}) + target_link_libraries(gpu_collective PRIVATE mindspore::ompi mindspore::nccl) + target_link_libraries(_ms_mpi PRIVATE gpu_collective) + endif() + + # add_library(_mindspore_device_cuda_obj OBJECT ${CUDA_SRC_LIST}) +endif() + +set_property(SOURCE ${DEVICE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) +add_library(_mindspore_plugin_device_gpu_hal_device_obj OBJECT ${DEVICE_SRC_LIST}) + diff --git a/mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/blocking_queue.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/blocking_queue.cc index a23b83f7d9..596a99d486 100644 --- a/mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/blocking_queue.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/device/gpu/blocking_queue.h" +#include "plugin/device/gpu/hal/device/blocking_queue.h" #include -#include "runtime/device/gpu/queue_common.h" +#include "plugin/device/gpu/hal/device/queue_common.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/gpu/blocking_queue.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/blocking_queue.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/blocking_queue.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/blocking_queue.h diff --git a/mindspore/ccsrc/runtime/device/gpu/cuda_common.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_common.h similarity index 98% rename from mindspore/ccsrc/runtime/device/gpu/cuda_common.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_common.h index 69161da223..e0a172fdbd 100644 --- a/mindspore/ccsrc/runtime/device/gpu/cuda_common.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_common.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_GPU_CUDA_COMMON_H_ #include -#include "runtime/device/gpu/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" #define CUDA_KERNEL_ASSERT(cond) \ if (!(cond)) { \ diff --git a/mindspore/ccsrc/runtime/device/gpu/cuda_driver.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_driver.cc similarity index 99% rename from mindspore/ccsrc/runtime/device/gpu/cuda_driver.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_driver.cc index 357339176d..5bd4cfeb3b 100644 --- a/mindspore/ccsrc/runtime/device/gpu/cuda_driver.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_driver.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/gpu/cuda_driver.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" #include #include "utils/log_adapter.h" #include "utils/convert_utils.h" diff --git a/mindspore/ccsrc/runtime/device/gpu/cuda_driver.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_driver.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/cuda_driver.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_driver.h diff --git a/mindspore/ccsrc/runtime/device/gpu/cuda_env_checker.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_env_checker.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/gpu/cuda_env_checker.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_env_checker.cc index e162ffd157..e7be3c81f0 100644 --- a/mindspore/ccsrc/runtime/device/gpu/cuda_env_checker.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_env_checker.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/gpu/cuda_env_checker.h" +#include "plugin/device/gpu/hal/device/cuda_env_checker.h" #include #include #include diff --git a/mindspore/ccsrc/runtime/device/gpu/cuda_env_checker.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_env_checker.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/cuda_env_checker.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/cuda_env_checker.h diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_common.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_common.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/distribution/collective_common.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_common.h diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_fake_init.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_fake_init.cc index 3b98685260..e339df34c6 100644 --- a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_fake_init.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/gpu/distribution/collective_fake_init.h" +#include "plugin/device/gpu/hal/device/distribution/collective_fake_init.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_fake_init.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/distribution/collective_fake_init.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_fake_init.h diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_init.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_init.cc index d9147f6389..3f1a1c1a56 100644 --- a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_init.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/gpu/distribution/collective_init.h" +#include "plugin/device/gpu/hal/device/distribution/collective_init.h" #include "utils/log_adapter.h" #include "utils/ms_utils.h" #include "distributed/init.h" diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_init.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/distribution/collective_init.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_init.h diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_wrapper.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_wrapper.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/gpu/distribution/collective_wrapper.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_wrapper.cc index 2e1b61bddd..767fb23b49 100644 --- a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_wrapper.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_wrapper.cc @@ -16,7 +16,7 @@ #include #include -#include "runtime/device/gpu/distribution/collective_wrapper.h" +#include "plugin/device/gpu/hal/device/distribution/collective_wrapper.h" void InitMPI() { MPIWrapper::instance(); } diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_wrapper.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_wrapper.h similarity index 96% rename from mindspore/ccsrc/runtime/device/gpu/distribution/collective_wrapper.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_wrapper.h index fef1eb3179..48acf32970 100644 --- a/mindspore/ccsrc/runtime/device/gpu/distribution/collective_wrapper.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/collective_wrapper.h @@ -19,8 +19,8 @@ #include #include #include -#include "runtime/device/gpu/distribution/mpi_wrapper.h" -#include "runtime/device/gpu/distribution/nccl_wrapper.h" +#include "plugin/device/gpu/hal/device/distribution/mpi_wrapper.h" +#include "plugin/device/gpu/hal/device/distribution/nccl_wrapper.h" #ifndef EXPORT_WRAPPER #define EXPORT_WRAPPER __attribute__((visibility("default"))) diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/mpi_wrapper.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/mpi_wrapper.cc index 3bc0b4533d..fb5b67878c 100644 --- a/mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/mpi_wrapper.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "runtime/device/gpu/distribution/mpi_wrapper.h" +#include "plugin/device/gpu/hal/device/distribution/mpi_wrapper.h" #include #include #include -#include "runtime/device/gpu/distribution/nccl_wrapper.h" +#include "plugin/device/gpu/hal/device/distribution/nccl_wrapper.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/mpi_wrapper.h similarity index 96% rename from mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/mpi_wrapper.h index dde200aafb..83156af983 100644 --- a/mindspore/ccsrc/runtime/device/gpu/distribution/mpi_wrapper.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/mpi_wrapper.h @@ -25,7 +25,7 @@ #include #include #include -#include "runtime/device/gpu/distribution/collective_common.h" +#include "plugin/device/gpu/hal/device/distribution/collective_common.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/nccl_wrapper.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/nccl_wrapper.cc index 8591ea37c6..a94335faf9 100644 --- a/mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/nccl_wrapper.cc @@ -15,7 +15,7 @@ */ #include -#include "runtime/device/gpu/distribution/nccl_wrapper.h" +#include "plugin/device/gpu/hal/device/distribution/nccl_wrapper.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/nccl_wrapper.h similarity index 97% rename from mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/nccl_wrapper.h index d654b85738..ebfc58c20e 100644 --- a/mindspore/ccsrc/runtime/device/gpu/distribution/nccl_wrapper.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/distribution/nccl_wrapper.h @@ -23,7 +23,7 @@ #include #include #include -#include "runtime/device/gpu/distribution/collective_common.h" +#include "plugin/device/gpu/hal/device/distribution/collective_common.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_bucket.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_bucket.cc similarity index 91% rename from mindspore/ccsrc/runtime/device/gpu/gpu_bucket.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_bucket.cc index 6eb6ce8e29..9e03fc44bb 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_bucket.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_bucket.cc @@ -14,22 +14,22 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_bucket.h" +#include "plugin/device/gpu/hal/device/gpu_bucket.h" #include #include #include #include #include "abstract/utils.h" -#include "runtime/device/gpu/gpu_event.h" -#include "runtime/device/gpu/gpu_device_address.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" -#include "runtime/device/gpu/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/gpu_event.h" +#include "plugin/device/gpu/hal/device/gpu_device_address.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" #include "runtime/device/kernel_runtime_manager.h" -#include "runtime/device/gpu/distribution/collective_init.h" -#include "runtime/device/gpu/gpu_launch_mul.h" -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" -#include "runtime/device/gpu/gpu_common.h" +#include "plugin/device/gpu/hal/device/distribution/collective_init.h" +#include "plugin/device/gpu/hal/device/gpu_launch_mul.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" #include "runtime/hardware/device_context_manager.h" namespace { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_bucket.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_bucket.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/gpu_bucket.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_bucket.h diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_buffer_mgr.cc similarity index 99% rename from mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_buffer_mgr.cc index f59b0f61ab..fb7ad1851f 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_buffer_mgr.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_buffer_mgr.h" +#include "plugin/device/gpu/hal/device/gpu_buffer_mgr.h" #include #include #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_buffer_mgr.h similarity index 98% rename from mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_buffer_mgr.h index d426aea135..006948eb50 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_buffer_mgr.h @@ -25,7 +25,7 @@ #include #include #include -#include "runtime/device/gpu/blocking_queue.h" +#include "plugin/device/gpu/hal/device/blocking_queue.h" #define EXPORT __attribute__((visibility("default"))) diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_common.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_common.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/gpu_common.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_common.h diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_device_address.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_address.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/gpu/gpu_device_address.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_address.cc index 8641736778..7d8d9128b3 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_device_address.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_address.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_device_address.h" +#include "plugin/device/gpu/hal/device/gpu_device_address.h" #include #include #include "utils/log_adapter.h" #include "utils/ms_context.h" #include "ir/tensor.h" -#include "runtime/device/gpu/gpu_device_manager.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" -#include "runtime/hardware/gpu/gpu_device_context.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/hardware/gpu_device_context.h" #ifdef ENABLE_DEBUGGER #include "debug/debug_services.h" #include "debug/tensor_load.h" diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_device_address.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_address.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/gpu_device_address.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_address.h diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_manager.cc similarity index 94% rename from mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_manager.cc index b95ea082c8..f3231f8df3 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_manager.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_device_manager.h" -#include "runtime/device/gpu/gpu_common.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" #include "utils/log_adapter.h" #include "utils/convert_utils.h" -#include "runtime/device/gpu/gpu_buffer_mgr.h" +#include "plugin/device/gpu/hal/device/gpu_buffer_mgr.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_manager.h similarity index 93% rename from mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_manager.h index 283c230044..c710ce8556 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_device_manager.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_device_manager.h @@ -22,8 +22,8 @@ #include #include #include -#include "runtime/device/gpu/cuda_driver.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_event.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_event.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/gpu/gpu_event.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_event.cc index 8dfdf29f92..6ddb131def 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_event.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_event.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_event.h" -#include "runtime/device/gpu/gpu_common.h" +#include "plugin/device/gpu/hal/device/gpu_event.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" namespace mindspore::device::gpu { GpuEvent::GpuEvent() { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_event.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_event.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/gpu_event.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_event.h diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_build.cc similarity index 87% rename from mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_build.cc index 75cd8c9774..3c542e2cfe 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_build.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/gpu/gpu_kernel_build.h" +#include "plugin/device/gpu/hal/device/gpu_kernel_build.h" #include -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/kernel.h" +#include "plugin/device/gpu/kernel/akg/akg_gpu_kernel_build.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "kernel/common_utils.h" #include "frontend/operator/ops.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_build_client.h" -#include "runtime/device/gpu/cuda_env_checker.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_build_client.h" +#include "plugin/device/gpu/hal/device/cuda_env_checker.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_build.h similarity index 95% rename from mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_build.h index 182ef0fd5e..c514ac39e7 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_build.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_build.h @@ -18,7 +18,7 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace device { namespace gpu { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_runtime.cc similarity index 98% rename from mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_runtime.cc index c9a2648ca7..5e7e8e7f41 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_runtime.cc @@ -13,26 +13,26 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/gpu/gpu_kernel_runtime.h" +#include "plugin/device/gpu/hal/device/gpu_kernel_runtime.h" #include #include #include "debug/anf_ir_utils.h" -#include "runtime/device/gpu/gpu_device_address.h" -#include "runtime/device/gpu/cuda_driver.h" -#include "runtime/device/gpu/gpu_event.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 "plugin/device/gpu/hal/device/gpu_device_address.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" +#include "plugin/device/gpu/hal/device/gpu_event.h" +#include "plugin/device/gpu/hal/device/gpu_buffer_mgr.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/distribution/collective_init.h" #include "utils/convert_utils.h" #include "utils/ms_context.h" #include "utils/context/graph_kernel_flags.h" #include "runtime/device/kernel_runtime_manager.h" -#include "runtime/device/gpu/gpu_common.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" #include "utils/ms_utils.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" +#include "plugin/device/gpu/hal/device/gpu_memory_manager.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_memory_copy_manager.h" #include "utils/ms_device_shape_transfer.h" #include "ir/dtype.h" #ifndef ENABLE_SECURITY @@ -43,7 +43,7 @@ #ifndef ENABLE_SECURITY #include "debug/data_dump/dump_json_parser.h" #endif -#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" #ifdef ENABLE_DEBUGGER #include "debug/debug_services.h" #endif diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_runtime.h similarity index 97% rename from mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_runtime.h index 872b9d3ea6..1c85d18e1c 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_kernel_runtime.h @@ -25,11 +25,11 @@ #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_runtime.h" #include "runtime/device/kernel_runtime_manager.h" -#include "backend/optimizer/mem_reuse/mem_swap_manager.h" -#include "backend/optimizer/mem_reuse/mem_reuse.h" +#include "common/mem_reuse/mem_swap_manager.h" +#include "common/mem_reuse/mem_reuse.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_launch_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_kernel.cc similarity index 86% rename from mindspore/ccsrc/runtime/device/gpu/gpu_launch_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_kernel.cc index ee1ea8717f..136acc3d1d 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_launch_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_kernel.cc @@ -14,14 +14,14 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_launch_kernel.h" +#include "plugin/device/gpu/hal/device/gpu_launch_kernel.h" #include #include -#include "runtime/device/gpu/gpu_memory_allocator.h" -#include "runtime/device/gpu/gpu_device_manager.h" -#include "runtime/device/gpu/kernel_info_setter.h" -#include "runtime/device/gpu/gpu_kernel_build.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" +#include "plugin/device/gpu/hal/device/gpu_kernel_build.h" #include "abstract/utils.h" namespace { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_launch_kernel.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_kernel.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/gpu_launch_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_kernel.h diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_launch_mul.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_mul.cc similarity index 89% rename from mindspore/ccsrc/runtime/device/gpu/gpu_launch_mul.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_mul.cc index 306e0c0437..a48da4008c 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_launch_mul.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_mul.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_launch_mul.h" +#include "plugin/device/gpu/hal/device/gpu_launch_mul.h" #include "abstract/utils.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" -#include "runtime/device/gpu/gpu_device_manager.h" -#include "backend/session/single_kernel_graph.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" +#include "backend/common/session/single_kernel_graph.h" #include "frontend/parallel/context.h" namespace mindspore::device::gpu { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_launch_mul.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_mul.h similarity index 96% rename from mindspore/ccsrc/runtime/device/gpu/gpu_launch_mul.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_mul.h index 75762c8893..124ad1c616 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_launch_mul.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_launch_mul.h @@ -20,7 +20,7 @@ #include #include #include "runtime/device/launch_mul.h" -#include "runtime/device/gpu/gpu_launch_kernel.h" +#include "plugin/device/gpu/hal/device/gpu_launch_kernel.h" namespace mindspore::device::gpu { class GPULaunchMul : public GPULaunchkernel, public LaunchMul { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_allocator.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_allocator.cc index 0e7ceae60e..c5de95c7be 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_allocator.cc @@ -15,8 +15,8 @@ */ #include -#include "runtime/device/gpu/gpu_memory_allocator.h" -#include "runtime/device/gpu/cuda_driver.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" #include "utils/log_adapter.h" #include "utils/ms_context.h" #include "utils/convert_utils_base.h" diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_allocator.h similarity index 91% rename from mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_allocator.h index a562521394..7d4739e92a 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_allocator.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_GPU_GPU_MEMORY_ALLOCATOR_H_ #include -#include "runtime/device/gpu/cuda_driver.h" -#include "backend/optimizer/mem_reuse/mem_dynamic_allocator.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" +#include "common/mem_reuse/mem_dynamic_allocator.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_copy_manager.cc similarity index 96% rename from mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_copy_manager.cc index a36f27fbe1..5042ddc120 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_copy_manager.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#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" +#include "plugin/device/gpu/hal/device/gpu_memory_copy_manager.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_copy_manager.h similarity index 94% rename from mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_copy_manager.h index 1de04f8438..9d9ef26430 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_copy_manager.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_copy_manager.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/optimizer/mem_reuse/mem_copy_manager.h" +#include "common/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" +#include "plugin/device/gpu/hal/device/cuda_driver.h" +#include "kernel/kernel.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_manager.cc similarity index 93% rename from mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_manager.cc index 78727b9aea..bb8e126ccb 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_manager.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_memory_manager.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/gpu_memory_manager.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" #include "utils/ms_context.h" #include "utils/convert_utils.h" #include "ps/ps_cache/ps_cache_manager.h" -#include "runtime/device/gpu/gpu_device_manager.h" -#include "runtime/device/gpu/gpu_common.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" namespace mindspore { namespace device { namespace gpu { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_manager.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_memory_manager.h diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_stream_assign.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_stream_assign.cc index 60f06c5733..f26e77533c 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_stream_assign.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_stream_assign.h" +#include "plugin/device/gpu/hal/device/gpu_stream_assign.h" #include #include #include #include #include -#include "runtime/device/gpu/gpu_common.h" -#include "runtime/device/gpu/kernel_info_setter.h" -#include "runtime/device/gpu/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_stream_assign.h similarity index 97% rename from mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_stream_assign.h index 663ac403d9..333576f449 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_stream_assign.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_stream_assign.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_tensor_array.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_tensor_array.cc similarity index 88% rename from mindspore/ccsrc/runtime/device/gpu/gpu_tensor_array.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_tensor_array.cc index 7cdf11538a..0b9248de00 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_tensor_array.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_tensor_array.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "runtime/device/gpu/gpu_tensor_array.h" +#include "plugin/device/gpu/hal/device/gpu_tensor_array.h" #include #include #include #include -#include "runtime/device/gpu/gpu_common.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_tensor_array.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_tensor_array.h similarity index 96% rename from mindspore/ccsrc/runtime/device/gpu/gpu_tensor_array.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_tensor_array.h index 2e1f35ef76..0e679737c8 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_tensor_array.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/gpu_tensor_array.h @@ -20,7 +20,7 @@ #include #include #include -#include "runtime/device/gpu/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" #include "runtime/device/tensor_array.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/kernel_info_setter.cc similarity index 97% rename from mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/kernel_info_setter.cc index 55dd81bfa8..1b4f2f5f27 100644 --- a/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/kernel_info_setter.cc @@ -14,19 +14,19 @@ * limitations under the License. */ -#include "runtime/device/gpu/kernel_info_setter.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/kernel_compiler/oplib/opinfo.h" -#include "backend/kernel_compiler/oplib/oplib.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/gpu/custom/custom_aot_gpu_kernel.h" -#include "runtime/device/gpu/cuda_common.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "kernel/kernel.h" +#include "kernel/kernel_build_info.h" +#include "kernel/oplib/opinfo.h" +#include "kernel/oplib/oplib.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/kernel/custom/custom_aot_gpu_kernel.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "utils/ms_context.h" #include "utils/ms_utils.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/kernel_info_setter.h similarity index 98% rename from mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/kernel_info_setter.h index c7d46578b1..3fbec88456 100644 --- a/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/kernel_info_setter.h @@ -25,8 +25,8 @@ #include "ir/anf.h" #include "ir/dtype.h" #include "utils/utils.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/kernel_graph.h" +#include "kernel/kernel.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/mpi/mpi_initializer.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/mpi/mpi_initializer.cc index d4046477ab..c235984e7c 100644 --- a/mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/mpi/mpi_initializer.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/gpu/mpi/mpi_initializer.h" +#include "plugin/device/gpu/hal/device/mpi/mpi_initializer.h" #include #include #include diff --git a/mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/mpi/mpi_initializer.h similarity index 94% rename from mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/mpi/mpi_initializer.h index 20b0a4fba8..eea1123fa3 100644 --- a/mindspore/ccsrc/runtime/device/gpu/mpi/mpi_initializer.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/mpi/mpi_initializer.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_GPU_MPI_MPI_INITIALIZER_H_ #include -#include "runtime/device/gpu/distribution/collective_wrapper.h" +#include "plugin/device/gpu/hal/device/distribution/collective_wrapper.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/queue_common.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/queue_common.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/queue_common.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/queue_common.h diff --git a/mindspore/ccsrc/runtime/device/gpu/readme.md b/mindspore/ccsrc/plugin/device/gpu/hal/device/readme.md similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/readme.md rename to mindspore/ccsrc/plugin/device/gpu/hal/device/readme.md diff --git a/mindspore/ccsrc/runtime/device/gpu/trt_loader.cc b/mindspore/ccsrc/plugin/device/gpu/hal/device/trt_loader.cc similarity index 95% rename from mindspore/ccsrc/runtime/device/gpu/trt_loader.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/device/trt_loader.cc index aab2ef17e4..82941535a6 100644 --- a/mindspore/ccsrc/runtime/device/gpu/trt_loader.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/device/trt_loader.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "runtime/device/gpu/trt_loader.h" +#include "plugin/device/gpu/hal/device/trt_loader.h" #include #include #include -#include "backend/kernel_compiler/gpu/trt/trt_utils.h" +#include "plugin/device/gpu/kernel/trt/trt_utils.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/trt_loader.h b/mindspore/ccsrc/plugin/device/gpu/hal/device/trt_loader.h similarity index 100% rename from mindspore/ccsrc/runtime/device/gpu/trt_loader.h rename to mindspore/ccsrc/plugin/device/gpu/hal/device/trt_loader.h diff --git a/mindspore/ccsrc/plugin/device/gpu/hal/hardware/CMakeLists.txt b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/CMakeLists.txt new file mode 100644 index 0000000000..d8f0373c3f --- /dev/null +++ b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/CMakeLists.txt @@ -0,0 +1,23 @@ +if(ENABLE_GPU) + file(GLOB_RECURSE HARDWARE_GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + list(REMOVE_ITEM HARDWARE_GPU_SRC_LIST "nvidia_collective_comm_lib.cc" "nvidia_communication_group.cc") + if(ENABLE_MPI) + set(NVIDIA_COLLECTIVE_SRCS "nvidia_collective_comm_lib.cc" + "nvidia_communication_group.cc" + ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/runtime/collective/collective_communication_lib.cc + ${CMAKE_SOURCE_DIR}/mindspore/ccsrc/runtime/collective/communication_group.cc) + set_property(SOURCE ${NVIDIA_COLLECTIVE_SRCS} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + add_library(nvidia_collective SHARED ${NVIDIA_COLLECTIVE_SRCS}) + target_link_libraries(nvidia_collective PRIVATE mindspore::nccl) + endif() + + if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-abstract-non-virtual-dtor") + endif() + + set_property(SOURCE ${HARDWARE_GPU_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) + + add_library(_mindspore_plugin_device_gpu_hal_hardware_obj OBJECT ${HARDWARE_GPU_SRC_LIST}) +endif() \ No newline at end of file diff --git a/mindspore/ccsrc/runtime/hardware/gpu/gpu_device_context.cc b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/gpu_device_context.cc similarity index 95% rename from mindspore/ccsrc/runtime/hardware/gpu/gpu_device_context.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/hardware/gpu_device_context.cc index 2a11831dae..98d00fdd66 100644 --- a/mindspore/ccsrc/runtime/hardware/gpu/gpu_device_context.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/gpu_device_context.cc @@ -14,29 +14,29 @@ * limitations under the License. */ -#include "runtime/hardware/gpu/gpu_device_context.h" +#include "plugin/device/gpu/hal/hardware/gpu_device_context.h" #include #include -#include "runtime/device/gpu/kernel_info_setter.h" -#include "runtime/device/gpu/gpu_kernel_build.h" -#include "runtime/device/gpu/gpu_device_address.h" -#include "runtime/device/gpu/gpu_memory_manager.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" -#include "runtime/device/gpu/gpu_stream_assign.h" -#include "runtime/device/gpu/distribution/collective_init.h" -#include "runtime/device/gpu/gpu_device_manager.h" -#include "runtime/device/gpu/gpu_buffer_mgr.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_common.h" -#include "runtime/device/gpu/cuda_common.h" -#include "runtime/hardware/gpu/optimizer.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" +#include "plugin/device/gpu/hal/device/gpu_kernel_build.h" +#include "plugin/device/gpu/hal/device/gpu_device_address.h" +#include "plugin/device/gpu/hal/device/gpu_memory_manager.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" +#include "plugin/device/gpu/hal/device/gpu_stream_assign.h" +#include "plugin/device/gpu/hal/device/distribution/collective_init.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/gpu_buffer_mgr.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/hal/hardware/optimizer.h" #include "utils/ms_device_shape_transfer.h" #include "utils/context/graph_kernel_flags.h" -#include "runtime/device/gpu/gpu_bucket.h" +#include "plugin/device/gpu/hal/device/gpu_bucket.h" #include "profiler/device/gpu/gpu_profiling.h" #include "profiler/device/gpu/gpu_profiling_utils.h" -#include "backend/session/kernel_graph.h" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "backend/common/session/kernel_graph.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" #ifdef ENABLE_DUMP_IR #include "debug/rdr/running_data_recorder.h" #endif @@ -44,7 +44,7 @@ #ifdef ENABLE_DEBUGGER #include "debug/debugger/debugger.h" #endif -#include "backend/optimizer/pass/optimize_updatestate.h" +#include "backend/common/pass/optimize_updatestate.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/gpu/gpu_device_context.h b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/gpu_device_context.h similarity index 100% rename from mindspore/ccsrc/runtime/hardware/gpu/gpu_device_context.h rename to mindspore/ccsrc/plugin/device/gpu/hal/hardware/gpu_device_context.h diff --git a/mindspore/ccsrc/runtime/hardware/gpu/nvidia_collective_comm_lib.cc b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_collective_comm_lib.cc similarity index 99% rename from mindspore/ccsrc/runtime/hardware/gpu/nvidia_collective_comm_lib.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_collective_comm_lib.cc index 9a4aab5d65..6c26b9e257 100644 --- a/mindspore/ccsrc/runtime/hardware/gpu/nvidia_collective_comm_lib.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_collective_comm_lib.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware/gpu/nvidia_collective_comm_lib.h" +#include "plugin/device/gpu/hal/hardware/nvidia_collective_comm_lib.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/gpu/nvidia_collective_comm_lib.h b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_collective_comm_lib.h similarity index 98% rename from mindspore/ccsrc/runtime/hardware/gpu/nvidia_collective_comm_lib.h rename to mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_collective_comm_lib.h index a005b14251..8b57e8aa20 100644 --- a/mindspore/ccsrc/runtime/hardware/gpu/nvidia_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_collective_comm_lib.h @@ -22,8 +22,8 @@ #include #include #include -#include "runtime/hardware/collective/collective_communication_lib.h" -#include "runtime/hardware/gpu/nvidia_communication_group.h" +#include "runtime/collective/collective_communication_lib.h" +#include "plugin/device/gpu/hal/hardware/nvidia_communication_group.h" #ifndef EXPORT_NCCL_WRAPPER #define EXPORT_NCCL_WRAPPER __attribute__((visibility("default"))) diff --git a/mindspore/ccsrc/runtime/hardware/gpu/nvidia_communication_group.cc b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_communication_group.cc similarity index 97% rename from mindspore/ccsrc/runtime/hardware/gpu/nvidia_communication_group.cc rename to mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_communication_group.cc index b0679bfe4b..4a05e390e9 100644 --- a/mindspore/ccsrc/runtime/hardware/gpu/nvidia_communication_group.cc +++ b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_communication_group.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware/gpu/nvidia_communication_group.h" +#include "plugin/device/gpu/hal/hardware/nvidia_communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/gpu/nvidia_communication_group.h b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_communication_group.h similarity index 96% rename from mindspore/ccsrc/runtime/hardware/gpu/nvidia_communication_group.h rename to mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_communication_group.h index fa82b0f9c2..b3e0f04605 100644 --- a/mindspore/ccsrc/runtime/hardware/gpu/nvidia_communication_group.h +++ b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/nvidia_communication_group.h @@ -21,7 +21,7 @@ #include #include #include -#include "runtime/hardware/collective/communication_group.h" +#include "runtime/collective/communication_group.h" #include "utils/dlopen_macro.h" namespace mindspore { diff --git a/mindspore/ccsrc/plugin/device/gpu/hal/hardware/optimizer.h b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/optimizer.h new file mode 100644 index 0000000000..227db13906 --- /dev/null +++ b/mindspore/ccsrc/plugin/device/gpu/hal/hardware/optimizer.h @@ -0,0 +1,58 @@ +/** + * Copyright 2021 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_RUNTIME_HARDWARE_GPU_OPTIMIZER_H_ +#define MINDSPORE_CCSRC_RUNTIME_HARDWARE_GPU_OPTIMIZER_H_ + +#include "backend/common/optimizer/helper.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/optimizer/common_backend_optimization.h" +#include "backend/common/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h" +#include "plugin/device/gpu/optimizer/adam_weight_decay_fusion.h" +#include "plugin/device/gpu/optimizer/adam_fusion.h" +#include "plugin/device/gpu/optimizer/alltoall_fusion.h" +#include "plugin/device/gpu/optimizer/apply_momentum_weight_scale_fusion.h" +#include "plugin/device/gpu/optimizer/apply_momentum_scale_fusion.h" +#include "plugin/device/gpu/optimizer/apply_momentum_weight_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_relu_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.h" +#include "plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.h" +#include "plugin/device/gpu/optimizer/combine_momentum_fusion.h" +#include "plugin/device/gpu/optimizer/combine_cast_fusion.h" +#include "plugin/device/gpu/optimizer/cudnn_inplace_fusion.h" +#include "plugin/device/gpu/optimizer/insert_format_transform_op.h" +#include "plugin/device/gpu/optimizer/replace_momentum_cast_fusion.h" +#include "plugin/device/gpu/optimizer/replace_addn_fusion.h" +#include "plugin/device/gpu/optimizer/print_reduce_fusion.h" +#include "plugin/device/gpu/optimizer/remove_format_transform_pair.h" +#include "plugin/device/gpu/optimizer/remove_redundant_format_transform.h" +#include "plugin/device/gpu/optimizer/reduce_precision_fusion.h" +#include "plugin/device/gpu/optimizer/relu_v2_pass.h" +#include "plugin/device/gpu/optimizer/add_relu_v2_fusion.h" +#include "plugin/device/gpu/optimizer/add_relu_grad_v2_fusion.h" +#include "common/graph_kernel/adapter/graph_kernel_optimization.h" +#include "backend/common/pass/communication_op_fusion.h" +#include "plugin/device/gpu/optimizer/concat_outputs_for_all_gather.h" +#include "backend/common/pass/getitem_tuple.h" +#include "plugin/device/gpu/optimizer/matmul_biasadd_fusion.h" +#include "plugin/device/gpu/optimizer/bce_with_logits_loss_fusion.h" +#include "plugin/device/gpu/optimizer/insert_cast_gpu.h" +#include "plugin/device/gpu/optimizer/neighbor_exchange_v2_fusion.h" + +#endif // MINDSPORE_CCSRC_RUNTIME_HARDWARE_GPU_OPTIMIZER_H_ diff --git a/mindspore/ccsrc/plugin/device/gpu/kernel/CMakeLists.txt b/mindspore/ccsrc/plugin/device/gpu/kernel/CMakeLists.txt new file mode 100644 index 0000000000..e95c5ed071 --- /dev/null +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/CMakeLists.txt @@ -0,0 +1,39 @@ +if(CMAKE_SYSTEM_NAME MATCHES "Darwin") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-non-abstract-non-virtual-dtor -Wno-overloaded-virtual") +endif() + +if(ENABLE_GPU) + file(GLOB_RECURSE CUDA_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cu") + + file(GLOB_RECURSE GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + file(GLOB_RECURSE _AKG_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "akg/*.cc") + list(REMOVE_ITEM GPU_SRC_LIST ${_AKG_SRC_LIST}) + list(REMOVE_ITEM GPU_SRC_LIST "nccl/nccl_collective_gpu_kernel.cc") + list(REMOVE_ITEM GPU_SRC_LIST "nccl/nccl_p2p_gpu_kernel.cc") + list(REMOVE_ITEM GPU_SRC_LIST "nccl/nccl_send_gpu_kernel.cc") + list(REMOVE_ITEM GPU_SRC_LIST "nccl/nccl_recv_gpu_kernel.cc") + list(REMOVE_ITEM GPU_SRC_LIST "trt/trt_kernel.cc") + + if(ENABLE_MPI) + include(ExternalProject) + file(GLOB_RECURSE GPU_NCCL_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "nccl/*.cc") + list(APPEND GPU_SRC_LIST ${GPU_NCCL_LIST}) + endif() + + if(ENABLE_GPU_INFER) + file(GLOB_RECURSE GPU_TRT_KERNEL_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "trt/*.cc") + list(APPEND GPU_SRC_LIST ${GPU_TRT_KERNEL_LIST}) + endif() +endif() + +if(ENABLE_AKG AND ${CMAKE_SYSTEM_NAME} MATCHES "Linux" AND ENABLE_GPU) + file(GLOB_RECURSE AKG_GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} + "akg/*.cc" + ) +endif() + +set_property(SOURCE ${GPU_SRC_LIST} ${AKG_GPU_SRC_LIST} + PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_KERNEL) +if(ENABLE_GPU) + add_library(_mindspore_plugin_device_gpu_kernel_obj OBJECT ${GPU_SRC_LIST} ${AKG_GPU_SRC_LIST}) +endif() diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_build.cc similarity index 87% rename from mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_build.cc index 9f3e86540d..93834d875a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_build.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h" +#include "plugin/device/gpu/kernel/akg/akg_gpu_kernel_build.h" #include #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/akg/akg_gpu_kernel_mod.h" #include "utils/ms_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h b/mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_build.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_build.h index 1ea1fcb40d..52d8ecddff 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_build.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_AKG_GPU_AKG_GPU_KERNEL_BUILD_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_AKG_GPU_AKG_GPU_KERNEL_BUILD_H_ #include -#include "backend/kernel_compiler/akg/akg_kernel_build.h" +#include "kernel/akg/akg_kernel_build.h" #include "base/base.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_mod.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_mod.cc index 37901f1f25..6d404a10ea 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_mod.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h" +#include "plugin/device/gpu/kernel/akg/akg_gpu_kernel_mod.h" #include #include "nlohmann/json.hpp" diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h b/mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_mod.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_mod.h index 803e78bcfb..444de058c3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/akg/akg_gpu_kernel_mod.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_mod.h" +#include "kernel/kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_mod.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmax_gpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmax_gpu_kernel.cc index 9ab70d9686..ce4383b937 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmax_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/argmax_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmax_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmax_gpu_kernel.h index 8b1ebb1d5c..1dc20713dc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmax_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmax_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/argmax_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxandminwithvalue_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmaxandminwithvalue_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxandminwithvalue_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmaxandminwithvalue_gpu_kernel.cc index cccf4162ef..ed609c2edc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxandminwithvalue_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmaxandminwithvalue_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/argmaxandminwithvalue_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/argmaxandminwithvalue_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxandminwithvalue_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmaxandminwithvalue_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxandminwithvalue_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmaxandminwithvalue_gpu_kernel.h index 165b71a03f..8644187a16 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/argmaxandminwithvalue_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/argmaxandminwithvalue_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/general_reduction_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/general_reduction_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/array_reduce_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/array_reduce_gpu_kernel.cc index 031c55c967..96f3e2a7ec 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/array_reduce_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/array_reduce_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/array_reduce_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/array_reduce_gpu_kernel.h index 05072c25bf..309df27b84 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/array_reduce_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/array_reduce_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { const std::map kReduceTypeMap = { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/batchtospace_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/batchtospace_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/batchtospace_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/batchtospace_gpu_kernel.cc index 7e4be5ec49..77890b92ee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/batchtospace_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/batchtospace_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/batchtospace_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/batchtospace_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/batchtospace_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/batchtospace_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/batchtospace_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/batchtospace_gpu_kernel.h index 1f2ea5d983..56ab101e24 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/batchtospace_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/batchtospace_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/batchtospace_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/batchtospace_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/broadcast_to_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/broadcast_to_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/broadcast_to_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/broadcast_to_gpu_kernel.cc index f65f2df073..f68840c9d5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/broadcast_to_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/broadcast_to_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/broadcast_to_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/broadcast_to_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/broadcast_to_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/broadcast_to_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/broadcast_to_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/broadcast_to_gpu_kernel.h index b5cac4be1f..ca70b19484 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/broadcast_to_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/broadcast_to_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/cast_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/cast_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/cast_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/cast_gpu_kernel.cc index 32012b1bf4..7713d075b2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/cast_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/cast_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/cast_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/cast_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/cast_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/cast_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/cast_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/cast_gpu_kernel.h index 7f95fa8788..73ed597142 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/cast_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/cast_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/cast_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/cast_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/concatv2_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/concatv2_gpu_kernel.cc index e76e395341..364217a866 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/concatv2_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/concatv2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/concatv2_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/concatv2_gpu_kernel.h index 8cd9c710aa..b79dd91891 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/concatv2_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/concatv2_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/concatv2_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/crop_and_resize_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/crop_and_resize_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/crop_and_resize_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/crop_and_resize_gpu_kernel.cc index 4ebaba9a3d..37d02c8711 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/crop_and_resize_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/crop_and_resize_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/crop_and_resize_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/crop_and_resize_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/crop_and_resize_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/crop_and_resize_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/crop_and_resize_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/crop_and_resize_gpu_kernel.h index b24f24f005..5e00ba8095 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/crop_and_resize_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/crop_and_resize_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/crop_and_resize_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/crop_and_resize_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/depthtospace_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/depthtospace_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/depthtospace_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/depthtospace_gpu_kernel.cc index 1a51e446c1..050b25385b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/depthtospace_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/depthtospace_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/depthtospace_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/depthtospace_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(DepthToSpace, KernelAttr().AddInputAttr(kNumberTypeFloat32).AddOutputAttr(kNumberTypeFloat32), diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/depthtospace_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/depthtospace_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/depthtospace_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/depthtospace_gpu_kernel.h index 42ab44617e..02e33795e7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/depthtospace_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/depthtospace_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_DEPTHTOSPACE_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/depthtospace_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/depthtospace_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_range_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_range_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_range_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_range_gpu_kernel.cc index 77487740a8..903ea71900 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_range_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_range_gpu_kernel.cc @@ -15,7 +15,7 @@ */ #include -#include "backend/kernel_compiler/gpu/arrays/dynamic_range_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/dynamic_range_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_range_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_range_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_range_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_range_gpu_kernel.h index f1ee483ed3..7ef4a9889a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_range_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_range_gpu_kernel.h @@ -21,9 +21,9 @@ #include -#include "backend/kernel_compiler/gpu/cuda_impl/dynamic_range_impl.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/dynamic_range_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_shape_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_shape_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_shape_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_shape_gpu_kernel.cc index 3caadaaad9..29a158bdd1 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_shape_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_shape_gpu_kernel.cc @@ -15,7 +15,7 @@ */ #include -#include "backend/kernel_compiler/gpu/arrays/dynamic_shape_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/dynamic_shape_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_shape_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_shape_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_shape_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_shape_gpu_kernel.h index ba5ec2a0fe..1f895b07a6 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/dynamic_shape_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/dynamic_shape_gpu_kernel.h @@ -21,8 +21,8 @@ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/embedding_lookup_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/embedding_lookup_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/embedding_lookup_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/embedding_lookup_gpu_kernel.cc index 43dc0b4735..5b834bf80a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/embedding_lookup_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/embedding_lookup_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/embedding_lookup_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/embedding_lookup_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/embedding_lookup_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/embedding_lookup_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/embedding_lookup_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/embedding_lookup_gpu_kernel.h index 9e185e8302..f810210357 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/embedding_lookup_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/embedding_lookup_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/embedding_lookup_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/embedding_lookup_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/extract_image_patches_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/extract_image_patches_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/extract_image_patches_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/extract_image_patches_gpu_kernel.cc index bc5257d923..7ef50a21ff 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/extract_image_patches_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/extract_image_patches_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/extract_image_patches_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/extract_image_patches_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/extract_image_patches_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/extract_image_patches_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/extract_image_patches_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/extract_image_patches_gpu_kernel.h index b6ccc3b7d0..7355325d27 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/extract_image_patches_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/extract_image_patches_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#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_opt.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/extract_image_patches_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl_opt.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/extract_image_patches_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_gpu_kernel.cc index 07e6d90e7c..f5ed46d5e6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/gather_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_gpu_kernel.h index e53f331e4b..4de4011a5d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_ARRAYS_GATHER_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/gather.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_grad_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_grad_gpu_kernel.cc index 99f1597bbf..4d250e561a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/gather_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/gather_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_grad_gpu_kernel.h index 0cb310e490..045d0ee49c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gather_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gather_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_GATHER_GRAD_GPU_KERNEL_H #include -#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_grad.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/gather_grad.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gathernd_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gathernd_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gathernd_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gathernd_gpu_kernel.cc index 2dce60a3c1..f8569d24da 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gathernd_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gathernd_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/gathernd_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/gathernd_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gathernd_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gathernd_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gathernd_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gathernd_gpu_kernel.h index 50df95d873..32022f027a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gathernd_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gathernd_gpu_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_ARRAYS_GATHERND_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/gathernd.cuh" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/gathernd.cuh" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gatherv2_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gatherv2_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gatherv2_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gatherv2_gpu_kernel.cc index 66f3888f7a..6cb3a0da13 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gatherv2_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gatherv2_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/gatherv2_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/gatherv2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gatherv2_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gatherv2_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gatherv2_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gatherv2_gpu_kernel.h index 34cd42a349..04a786f545 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/gatherv2_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/gatherv2_gpu_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/gatherv2.cuh" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/gatherv2.cuh" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/in_top_k_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/in_top_k_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/in_top_k_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/in_top_k_gpu_kernel.cc index ecdf9cfb40..0a7b53fcdf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/in_top_k_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/in_top_k_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/in_top_k_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/in_top_k_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/in_top_k_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/in_top_k_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/in_top_k_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/in_top_k_gpu_kernel.h index ca03e69955..d460e34db0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/in_top_k_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/in_top_k_gpu_kernel.h @@ -20,11 +20,11 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/cast_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/in_top_k_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/topk_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/cast_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/in_top_k_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/topk_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/matrix_set_diag_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/matrix_set_diag_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/matrix_set_diag_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/matrix_set_diag_gpu_kernel.cc index a7557996e8..2b9e541e59 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/matrix_set_diag_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/matrix_set_diag_gpu_kernel.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/matrix_set_diag_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/matrix_set_diag_gpu_kernel.h" #include #include -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "common/thread_pool.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/matrix_set_diag_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/matrix_set_diag_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/matrix_set_diag_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/matrix_set_diag_gpu_kernel.h index 03e993183b..658eb66673 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/matrix_set_diag_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/matrix_set_diag_gpu_kernel.h @@ -22,11 +22,11 @@ #include #include #include -#include "backend/kernel_compiler/gpu//gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/gpu/kernel_constants.h" -#include "backend/kernel_compiler/gpu/cuda_impl/matrix_set_diag_impl.cuh" +#include "plugin/device/gpu/kernel//gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/matrix_set_diag_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/meshgrid_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/meshgrid_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/meshgrid_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/meshgrid_gpu_kernel.cc index 28203a47bd..9a3eb71f26 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/meshgrid_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/meshgrid_gpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/meshgrid_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/meshgrid_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/meshgrid_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/meshgrid_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/meshgrid_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/meshgrid_gpu_kernel.h index 09425f6bcd..52ba3e02d3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/meshgrid_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/meshgrid_gpu_kernel.h @@ -22,11 +22,11 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/oneslike_impl.cuh" -#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 "plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/oneslike_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/math/broadcast_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/one_hot_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/one_hot_gpu_kernel.cc index b3f44de92b..969cb7bb04 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/one_hot_gpu_kernel.cc @@ -15,7 +15,7 @@ */ #include -#include "backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/one_hot_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/one_hot_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/one_hot_gpu_kernel.h index e15765736e..b1f2b2b4fe 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/one_hot_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/one_hot_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_ONEHOT_GPU_KERNEL_H #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/one_hot_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/oneslike_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/oneslike_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/oneslike_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/oneslike_gpu_kernel.cc index 3e59c407fa..780fffbada 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/oneslike_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/oneslike_gpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/oneslike_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/oneslike_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(OnesLike, KernelAttr().AddInputAttr(kNumberTypeFloat64).AddOutputAttr(kNumberTypeFloat64), diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/oneslike_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/oneslike_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/oneslike_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/oneslike_gpu_kernel.h index e69311144c..fad533cf79 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/oneslike_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/oneslike_gpu_kernel.h @@ -17,9 +17,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_ARRAYS_ONESLIKE_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/oneslike_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/oneslike_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/pack_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/pack_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/pack_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/pack_gpu_kernel.cc index 4b090b9376..8adeec8d8b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/pack_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/pack_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/pack_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/pack_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/pack_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/pack_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/pack_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/pack_gpu_kernel.h index 10d6b91991..d945d1f92a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/pack_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/pack_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/pack.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/pack.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/range_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/range_gpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/range_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/range_gpu_kernel.cc index b21bfd2ba4..fbbd97e692 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/range_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/range_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/range_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/range_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/range_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/range_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/range_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/range_gpu_kernel.h index 82a3ca56bd..13da852502 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/range_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/range_gpu_kernel.h @@ -17,9 +17,9 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_RANGE_GPU_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_RANGE_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/range_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/range_impl.cuh" namespace mindspore { namespace kernel { constexpr float kStartDefault = 0.; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_gpu_kernel.cc index 393ecaec8a..128ca904a3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_gpu_kernel.h index 61183e74dd..fe3c9617f5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_ARRAYS_RESIZE_NEAREST_NEIGHBOR_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_grad_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_grad_gpu_kernel.cc index ba5c099952..60f8c264ee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_grad_gpu_kernel.h index 04f975e70f..06921785fa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/resize_nearest_neighbor_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/resize_nearest_neighbor_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_ARRAYS_RESIZE_NEAREST_NEIGHBOR_GRAD_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_grad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_sequence_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_sequence_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_sequence_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_sequence_gpu_kernel.cc index b125a9c9d2..0cb4851dfa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_sequence_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_sequence_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/reverse_sequence_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/reverse_sequence_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_sequence_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_sequence_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_sequence_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_sequence_gpu_kernel.h index 73ed7bc3fd..bc46f767c8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_sequence_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_sequence_gpu_kernel.h @@ -20,11 +20,11 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/reverse_sequence_impl.cuh" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/reverse_sequence_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_v2_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_v2_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_v2_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_v2_gpu_kernel.cc index 6545183c63..3b341998ca 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_v2_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_v2_gpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/reverse_v2_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/reverse_v2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_v2_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_v2_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_v2_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_v2_gpu_kernel.h index cb4ab5464c..dbcbaef910 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/reverse_v2_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/reverse_v2_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/reverse_v2_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/reverse_v2_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_functor_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_functor_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_functor_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_functor_gpu_kernel.cc index 3d678f9eb5..9ec8caf394 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_functor_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_functor_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/scatter_functor_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/scatter_functor_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_functor_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_functor_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_functor_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_functor_gpu_kernel.h index 6a8d10e5cd..0acacb8208 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_functor_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_functor_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/scatter_functor_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/scatter_functor_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_functor_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_functor_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_functor_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_functor_gpu_kernel.cc index db31e32771..9eb75922e5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_functor_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_functor_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/scatter_nd_functor_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/scatter_nd_functor_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_functor_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_functor_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_functor_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_functor_gpu_kernel.h index 14cc7e233e..c52a96b63b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_functor_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_functor_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/scatter_nd_functor_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/scatter_nd_functor_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_gpu_kernel.cc index 199679d8c7..469ddbb877 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/scatter_nd_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/scatter_nd_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_gpu_kernel.h index 115a71bb94..9b04283842 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/scatter_nd_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/scatter_nd_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/scatter_nd.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/scatter_nd.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/select_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/select_gpu_kernel.cc index 1c2b0c34f9..04ced8311e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/select_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/select_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/select_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/select_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/select_gpu_kernel.h index 84a358a0ca..b3da2563db 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/select_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/select_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/select_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_gpu_kernel.cc index 65a09fb4df..1968e9924a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/slice_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_gpu_kernel.h index cae21f659c..192cf9af97 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_grad_gpu_kernel.cc index a301f3cd41..023caef658 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/slice_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_grad_gpu_kernel.h index a716522d48..e2b3f1ba47 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/slice_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/slice_grad_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/sort_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/sort_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/sort_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/sort_gpu_kernel.cc index 2a83b1eacb..f579f7047b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/sort_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/sort_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/sort_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/sort_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/sort_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/sort_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/sort_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/sort_gpu_kernel.h index a73768d3a5..3b9ea35551 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/sort_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/sort_gpu_kernel.h @@ -22,11 +22,11 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/topk_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/topk_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/unary_op_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetobatch_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetobatch_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetobatch_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetobatch_gpu_kernel.cc index df477e89e9..ef37a623a6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetobatch_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetobatch_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/spacetobatch_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/spacetobatch_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetobatch_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetobatch_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetobatch_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetobatch_gpu_kernel.h index bbcd61f097..e37838dfe2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetobatch_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetobatch_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/spacetobatch_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/spacetobatch_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetodepth_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetodepth_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetodepth_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetodepth_gpu_kernel.cc index 321cabef6d..bba185e5f4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetodepth_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetodepth_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/spacetodepth_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/spacetodepth_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(SpaceToDepth, KernelAttr().AddInputAttr(kNumberTypeFloat32).AddOutputAttr(kNumberTypeFloat32), diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetodepth_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetodepth_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetodepth_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetodepth_gpu_kernel.h index e1ccbe2e56..f090ed396b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/spacetodepth_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/spacetodepth_gpu_kernel.h @@ -19,9 +19,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPACETODEPTH_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/spacetodepth_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/spacetodepth_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/split_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/split_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/split_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/split_gpu_kernel.cc index 0eea32e9a2..e1578e5453 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/split_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/split_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/split_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/split_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/split_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/split_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/split_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/split_gpu_kernel.h index 385c1067b7..3e92763552 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/split_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/split_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/split_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/split_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/squeeze_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/squeeze_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/squeeze_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/squeeze_gpu_kernel.cc index 28c62acd4e..2b8ecc3d91 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/squeeze_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/squeeze_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/squeeze_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/squeeze_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/squeeze_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/squeeze_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/squeeze_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/squeeze_gpu_kernel.h index 3a9a49be9d..1a33b22617 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/squeeze_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/squeeze_gpu_kernel.h @@ -21,8 +21,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_gpu_common.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_gpu_common.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_gpu_common.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_gpu_common.h index 6dd0ba01ae..f7088a87d4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_gpu_common.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_gpu_common.h @@ -19,8 +19,8 @@ #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_gpu_kernel.cc index c265b52b3f..89cd559e29 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/strided_slice_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/strided_slice_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_gpu_kernel.h index 90a7057ffa..f73e80dd79 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/arrays/strided_slice_gpu_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/arrays/strided_slice_gpu_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_grad_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_grad_gpu_kernel.cc index d1ecb24a08..36104634aa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/strided_slice_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/strided_slice_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_grad_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_grad_gpu_kernel.h index bdf3f14d15..31a1a5b963 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/strided_slice_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/strided_slice_grad_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/arrays/strided_slice_gpu_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/arrays/strided_slice_gpu_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_gpu_kernel.cc index 4deb9f5644..a176461316 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_gpu_kernel.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/tensor_copy_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/tensor_copy_gpu_kernel.h" #include #include -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_gpu_kernel.h index ba53bd3209..271672d53b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_gpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_slices_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_slices_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_slices_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_slices_gpu_kernel.cc index c0fea49889..800a9f2ebd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_slices_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_slices_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/tensor_copy_slices_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/tensor_copy_slices_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_slices_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_slices_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_slices_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_slices_gpu_kernel.h index bb6b1a9c10..4b79e3873b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_copy_slices_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_copy_slices_gpu_kernel.h @@ -22,10 +22,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/slice_copy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/cuda_impl/slice_copy_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_add_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_add_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_add_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_add_gpu_kernel.cc index 2ecb6e8eb1..0223b53fef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_add_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_add_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/tensor_scatter_add_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/tensor_scatter_add_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_add_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_add_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_add_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_add_gpu_kernel.h index 3e8d2b6953..3492382674 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_add_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_add_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_add.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_add.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_max_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_max_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_max_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_max_gpu_kernel.cc index 8928a0a9d8..1a55368984 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_max_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_max_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/tensor_scatter_max_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/tensor_scatter_max_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_max_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_max_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_max_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_max_gpu_kernel.h index 0c8f4ae498..57f15c53a3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_max_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_max_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_max.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_max.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_min_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_min_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_min_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_min_gpu_kernel.cc index 6760af8c57..fa74c5184e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_min_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_min_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/tensor_scatter_min_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/tensor_scatter_min_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_min_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_min_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_min_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_min_gpu_kernel.h index 3386caf568..d16e3c31e1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_min_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_min_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_min.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_min.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_sub_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_sub_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_sub_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_sub_gpu_kernel.cc index fae6c7329f..022b0a7cbe 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_sub_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_sub_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/tensor_scatter_sub_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/tensor_scatter_sub_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_sub_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_sub_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_sub_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_sub_gpu_kernel.h index 05c58fcb70..9cc4e01841 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_sub_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_sub_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_sub.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_sub.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_update_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_update_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_update_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_update_gpu_kernel.cc index 774dac9563..1648094635 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_update_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_update_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/tensor_scatter_update_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/tensor_scatter_update_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_update_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_update_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_update_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_update_gpu_kernel.h index 9843e2d9df..afc25e0822 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tensor_scatter_update_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tensor_scatter_update_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_update.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_update.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tile_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tile_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tile_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tile_gpu_kernel.cc index fe8f1b3a4e..dd589917d3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tile_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tile_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/tile_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/tile_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tile_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tile_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tile_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tile_gpu_kernel.h index f89db574c9..b27e0747d2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/tile_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/tile_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_ARRAYS_TILE_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/tile_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/tile_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/topk_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/topk_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/topk_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/topk_gpu_kernel.cc index bbd63f7b4e..4cf0dadae8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/topk_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/topk_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/topk_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/topk_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/topk_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/topk_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/topk_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/topk_gpu_kernel.h index f43bbf2a0f..d0a1ed551e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/topk_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/topk_gpu_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/cast_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/topk_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/cast_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/topk_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/transpose_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/transpose_gpu_kernel.cc index bb19fbe073..c8461494e5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/transpose_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/transpose_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(Transpose, KernelAttr().AddInputAttr(kNumberTypeFloat64).AddOutputAttr(kNumberTypeFloat64), diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/transpose_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/transpose_gpu_kernel.h index e921c256ce..7ed3f305b0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/transpose_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/transpose_gpu_kernel.h @@ -19,10 +19,10 @@ #include #include -#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" -#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl_opt.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl_opt.cuh" namespace mindspore { namespace kernel { constexpr size_t kDimSize4 = 4; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unique_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unique_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unique_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unique_gpu_kernel.cc index f3cbcb4298..580080f7cf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unique_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unique_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/unique_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/unique_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unique_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unique_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unique_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unique_gpu_kernel.h index c2517461b5..1970d2ff4d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unique_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unique_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_ARRAYS_UNIQUE_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/unique_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/unique_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unpack_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unpack_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unpack_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unpack_gpu_kernel.cc index 388f85888e..af9e163f7b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unpack_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unpack_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/unpack_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/unpack_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unpack_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unpack_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unpack_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unpack_gpu_kernel.h index fca2dfea29..563a27c9f9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unpack_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unpack_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/unpack.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/unpack.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_max_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_max_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_max_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_max_gpu_kernel.cc index eb646d7edd..3e7dbe5323 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_max_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_max_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/unsorted_segment_max_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/unsorted_segment_max_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_max_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_max_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_max_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_max_gpu_kernel.h index 1145209d5f..70d03c1327 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_max_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_max_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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_max.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/unsorted_segment_max.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_min_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_min_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_min_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_min_gpu_kernel.cc index 7f17a5ea4c..f445925a5f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_min_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_min_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/unsorted_segment_min_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/unsorted_segment_min_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_min_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_min_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_min_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_min_gpu_kernel.h index 2c0ce1f203..6c7ca40378 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_min_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_min_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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_min.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/unsorted_segment_min.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_sum_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_sum_gpu_kernel.cc index e861641120..cd94350791 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_sum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/unsorted_segment_sum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_sum_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_sum_gpu_kernel.h index 06167cd387..c4b0462971 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/unsorted_segment_sum_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/unsorted_segment_sum_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_ARRAYS_UNSORTED_SEGMENT_SUM_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/unsorted_segment_sum.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/zeroslike_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/zeroslike_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/zeroslike_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/zeroslike_gpu_kernel.cc index c5bbe17dc5..474c5fc723 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/zeroslike_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/zeroslike_gpu_kernel.cc @@ -15,7 +15,7 @@ */ #include -#include "backend/kernel_compiler/gpu/arrays/zeroslike_gpu_kernel.h" +#include "plugin/device/gpu/kernel/arrays/zeroslike_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/zeroslike_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/zeroslike_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/zeroslike_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/arrays/zeroslike_gpu_kernel.h index 2990570352..0770cc6d34 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/arrays/zeroslike_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/arrays/zeroslike_gpu_kernel.h @@ -19,8 +19,8 @@ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/control/recv_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/control/recv_gpu_kernel.cc index bf5ad4c846..d1fe6c82d9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/control/recv_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/control/recv_gpu_kernel.h" +#include "plugin/device/gpu/kernel/control/recv_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/control/recv_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/control/recv_gpu_kernel.h index 9c3347647e..5325432591 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/control/recv_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/control/recv_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CONTROL_RECV_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/control/send_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/control/send_gpu_kernel.cc index 90965475c3..2cf105f8d9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/control/send_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/control/send_gpu_kernel.h" +#include "plugin/device/gpu/kernel/control/send_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/control/send_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/control/send_gpu_kernel.h index 9037970650..ac6c0894e4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/control/send_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/control/send_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CONTROL_SEND_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adagrad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adagrad_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adagrad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adagrad_impl.cu index 53fa79f024..0680867b72 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adagrad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adagrad_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/adagrad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/adagrad_impl.cuh" template __device__ __forceinline__ T SqrtFunc(T input) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adagrad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adagrad_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adagrad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adagrad_impl.cuh index 79819a7cfe..8f76c51e01 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adagrad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adagrad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADAGRAD_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADAGRAD_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void ApplyAdagrad(const size_t size, const bool update_slots, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_impl.cu index ad73438807..8c3859dbef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/adam_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/adam_impl.cuh" template __device__ __forceinline__ T SqrtFunc(T input) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_impl.cuh index a88d54e517..65a388b1fb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_weight_decay_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_weight_decay_impl.cu index 3bad9a61e1..7eae29a155 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_weight_decay_impl.cu @@ -15,7 +15,7 @@ */ #include "adam_weight_decay_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void AdamWeightDecayKernel(const int element_num_, const bool need_decay, const float *beta1, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_weight_decay_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adam_weight_decay_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adam_weight_decay_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_grad_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_grad_impl.cu index 31da420850..0b3c3f9264 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_grad_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh" __device__ inline uint start_index(uint a, uint b, uint c) { return floorf(__uint2float_rn(a * c) / __uint2float_rn(b)); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh index 8b7690cb52..b8c12da977 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADAPTIVE_AVGPOOL2D_GRAD_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADAPTIVE_AVGPOOL2D_GRAD_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void ApplyAdaptiveAvgPool2DGrad(const uint size, const uint input_height, const uint input_width, const uint output_height, const uint output_width, T *input_data, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_impl.cu index 92ac1de446..e93af42a28 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_impl.cuh" __device__ inline uint start_index(uint a, uint b, uint c) { return floorf(__uint2float_rn(a * c) / __uint2float_rn(b)); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_impl.cuh index 88dda5cf5e..caa0418ed3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADAPTIVEAVGPOOL2D_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADAPTIVEAVGPOOL2D_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void ApplyAdaptiveAvgPool2D(const uint size, const uint input_height, const uint input_width, const uint output_height, const uint output_width, T *input_data, T *output_data, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/add_relu_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/add_relu_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/add_relu_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/add_relu_impl.cuh index 6eef4e0863..81e10d1d49 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/add_relu_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/add_relu_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADD_RELU_V2_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADD_RELU_V2_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void AddReluV2(const size_t num, const T *x1, const T *x2, T *y, uint32_t *mask, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/add_relu_v2_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/add_relu_v2_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/add_relu_v2_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/add_relu_v2_impl.cu index 65ddef09ed..e55e15ea6c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/add_relu_v2_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/add_relu_v2_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/add_relu_v2_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/add_relu_v2_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" template __global__ void AddReluV2Kernel(const size_t num, const T *x1, const T *x2, T *y, uint32_t *mask) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/add_relu_v2_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/add_relu_v2_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/add_relu_v2_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/add_relu_v2_impl.cuh index 6eef4e0863..81e10d1d49 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/add_relu_v2_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/add_relu_v2_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADD_RELU_V2_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_ADD_RELU_V2_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void AddReluV2(const size_t num, const T *x1, const T *x2, T *y, uint32_t *mask, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/apply_gradient_descent_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/apply_gradient_descent_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/apply_gradient_descent_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/apply_gradient_descent_impl.cu index 1921307115..4f3489bf2e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/apply_gradient_descent_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/apply_gradient_descent_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/apply_gradient_descent_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/apply_gradient_descent_impl.cuh" template __global__ void ApplyGradientDescent(const size_t size, T *var, const T *alpha, const T *delta, T *output) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/apply_gradient_descent_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/apply_gradient_descent_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/apply_gradient_descent_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/apply_gradient_descent_impl.cuh index 6a96a898a5..3709254aaf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/apply_gradient_descent_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/apply_gradient_descent_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_APPLY_GRADIENT_DESCENT_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalApplyGradientDescent(const size_t &size, T *var, const T *alpha, const T *delta, T *output, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/argmax_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/argmax_impl.cu index 2bf80aab52..7f7eb415bd 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/argmax_impl.cu @@ -15,7 +15,7 @@ */ #include "argmax_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" template __global__ void Argmax(const T *input, const S bound, const size_t outer_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/argmax_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/argmax_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/argmax_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/assign_add_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/assign_add_impl.cu index 61e8d84ba8..0be7e20137 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/assign_add_impl.cu @@ -15,7 +15,7 @@ */ #include "assign_add_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/assign_add_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/assign_add_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/assign_add_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_fold2_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_fold2_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_fold2_impl.cuh similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_fold2_impl.cuh index 3a895405b1..f60b061b3d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold2_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_fold_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_fold_impl.cu index dae9a7d629..54f1c11ab9 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_fold_impl.cu @@ -18,7 +18,7 @@ #include #include #include "batchnorm_fold_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void UpdateRunningStd(int channel_size, const double epsilon, T* running_std) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_fold_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_fold_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_fold_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_grad_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_grad_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_grad_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_grad_impl.cuh index 351d70a31e..d0fdbc5948 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchnorm_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchnorm_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BATCHNORMGRAD_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BATCHNORMGRAD_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalBatchNormGrad(T *x, T *dy, float *scale, float *save_mean, float *save_variance, T *dx, float *bn_scale, float *bn_bias, double epsilon, int N, int C, int H, int W, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchtospace_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchtospace_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchtospace_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchtospace_impl.cu index fc5bf8b596..4ff5c230f4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchtospace_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchtospace_impl.cu @@ -15,7 +15,7 @@ */ #include #include "batchtospace_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void BatchToSpace(const size_t size, const T *input, const size_t in, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchtospace_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchtospace_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/batchtospace_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/batchtospace_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bce_with_logits_loss_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bce_with_logits_loss_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bce_with_logits_loss_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bce_with_logits_loss_impl.cu index 7dc2528eeb..8a2d6b0edc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bce_with_logits_loss_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bce_with_logits_loss_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/bce_with_logits_loss_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/bce_with_logits_loss_impl.cuh" __device__ __forceinline__ size_t Index(const size_t &index, const size_t &dim) { return dim == 1 ? 0 : index; } diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bce_with_logits_loss_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bce_with_logits_loss_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bce_with_logits_loss_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bce_with_logits_loss_impl.cuh index ddaaea72c7..7654f11103 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bce_with_logits_loss_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bce_with_logits_loss_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_BCE_WITH_LOGITS_LOSS_IMPL_CUH_ #define MAX_LOGITS_DIMENSION 8 -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalBCEWithLogitsLoss(const size_t input_size, const T *predict, const T *target, const size_t *input_shape, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bias_add_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bias_add_grad_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bias_add_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bias_add_grad_impl.cu index 05b18d6295..5ae02f0198 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bias_add_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bias_add_grad_impl.cu @@ -17,9 +17,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/bias_add_grad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/bias_add_grad_impl.cuh" const int kWarpSize = 32; // tuning param, for those nhw >= kLargeSize, launch more blocks to solve diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bias_add_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bias_add_grad_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bias_add_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bias_add_grad_impl.cuh index 1b0532955a..40dd509964 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/bias_add_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/bias_add_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BIASADDGRAD_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BIASADDGRAD_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalBiasAddGradNHWC(const size_t size, const size_t bias_size, const T* dy, T* db, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_decode_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_decode_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_decode_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_decode_impl.cu index 38f84dc618..ef6e4575d0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_decode_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_decode_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/boundingbox_decode_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/boundingbox_decode_impl.cuh" template __global__ void BoundingBoxDecodeKernel(const size_t size, const T *rois, const T *deltas, T *bboxes, const float m1, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_decode_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_decode_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_decode_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_decode_impl.cuh index ccd3914a1c..ed459c57f1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_decode_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_decode_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_BOUNDINGBOX_DECODE_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_BOUNDINGBOX_DECODE_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void BoundingBoxDecode(const size_t size, const T *rois, const T *deltas, T *bboxes, const float &m1, const float &m2, const float &m3, const float &m4, const float &s1, const float &s2, const float &s3, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_encode_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_encode_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_encode_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_encode_impl.cu index cf0ee68ae0..155c7fe693 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_encode_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_encode_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/boundingbox_encode_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/boundingbox_encode_impl.cuh" template __global__ void BoundingBoxEncodeKernel(const size_t size, const T *anchor_box, const T *groundtruth_box, T *deltas, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_encode_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_encode_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_encode_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_encode_impl.cuh index 8ab810d7b9..f3345090b9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/boundingbox_encode_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/boundingbox_encode_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_BOUNDINGBOX_ENCODE_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_BOUNDINGBOX_ENCODE_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void BoundingBoxEncode(const size_t size, const T *anchor_box, const T *groundtruth_box, T *deltas, const float &m1, const float &m2, const float &m3, const float &m4, const float &s1, const float &s2, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_grad_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_grad_impl.cu index b1e54d0772..2c751d7f43 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_grad_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_grad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template struct MinimumGradFunc { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_grad_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_grad_impl.cuh index 05fbaf747f..7fbc486ace 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" enum BroadcastGradOpType { BROADCAST_GRAD_TYPE_MAXIMUM = 0, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cu index d877238cab..d7b7314161 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cu @@ -17,8 +17,8 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" // Basic function template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh index 6689538076..6d17c2a5c8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/broadcast_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_BROADCAST_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "utils/complex.h" const float kFloatEplison = 1e-37; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_all_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_all_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_all_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_all_impl.cu index e7037ef6de..c4a759a5be 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_all_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_all_impl.cu @@ -17,7 +17,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/cast_all_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/cast_all_impl.cuh" template __global__ void CastAll(T** inputs, S** output, const size_t num, const size_t *size) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_all_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_all_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_all_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_all_impl.cuh index f1bbdc5671..fd2ccc188a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_all_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_all_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_CAST_ALL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CastAllKernel(T **inputs, S **output, const size_t max, const size_t num, const size_t *size, cudaStream_t stream); #endif // MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_CAST_ALL_H_ diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_impl.cu index 88a8e9dbbe..63e48c0fc0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_impl.cu @@ -17,8 +17,8 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/cast_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/cast_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" // Generic cast template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_impl.cuh index 2ebe6ea585..b4ef646dbe 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cast_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cast_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_CAST_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "utils/complex.h" template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/check_valid_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/check_valid_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/check_valid_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/check_valid_impl.cu index 1698a0f142..339929581b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/check_valid_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/check_valid_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/check_valid_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/check_valid_impl.cuh" template __global__ void CheckValidKernel(const size_t size, const T *box, const T *img_metas, S *valid) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/check_valid_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/check_valid_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/check_valid_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/check_valid_impl.cuh index fa82f10960..8870ae5a2b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/check_valid_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/check_valid_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_CHECK_VALID_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_CHECK_VALID_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CheckValid(const size_t &size, const T *box, const T *img_metas, S *valid, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/clip_grad_norm_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/clip_grad_norm_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/clip_grad_norm_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/clip_grad_norm_impl.cu index aac3b85a4d..c1974341ad 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/clip_grad_norm_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/clip_grad_norm_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/clip_grad_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/clip_grad_norm_impl.cuh" // The implement of ScalingGradOp template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/clip_grad_norm_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/clip_grad_norm_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/clip_grad_norm_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/clip_grad_norm_impl.cuh index ac63755564..c7eab4b0a8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/clip_grad_norm_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/clip_grad_norm_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_CLIP_GRAD_NORM_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_CLIP_GRAD_NORM_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void ScalingGradOp(const size_t size, const T *x, const float *scaling_factor, float *scaling_out_addr, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/concatv2_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/concatv2_impl.cu index 37e03f2e33..ca409ec126 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/concatv2_impl.cu @@ -17,7 +17,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/concatv2_impl.cuh" template __global__ void Concat(const size_t size, const int input_num, const int all_size_before_axis, const int all_size_axis, int *len_axis, T **inputs, T *output) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/concatv2_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/concatv2_impl.cuh index a37de1c454..8b65d14467 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/concatv2_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/concatv2_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_CONCATV2_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_CONCATV2_IMPL_CUH_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void ConcatKernel(const size_t size, const int input_num, const int all_size_before_axis, const int all_size_axis, int *len_axis, T **inputs, T *output, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/convert_gradient_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/convert_gradient_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/convert_gradient_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/convert_gradient_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/convert_gradient_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/convert_gradient_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/convert_gradient_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/convert_gradient_impl.cuh index 354ffe3965..17d8ba8272 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/convert_gradient_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/convert_gradient_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_CONVERTGRADIENT_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_CONVERTGRADIENT_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void ConvertGradient(const size_t size, const size_t height_h, const size_t height_w, const size_t batchwidth, const size_t width, T *input_addr, T *outt_addr, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/correction_mul_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/correction_mul_impl.cu index 87aaf1351c..b7a22dab73 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/correction_mul_impl.cu @@ -16,7 +16,7 @@ #include #include "correction_mul_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/correction_mul_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/correction_mul_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/crop_and_resize_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/crop_and_resize_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/crop_and_resize_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/crop_and_resize_impl.cu index 07de1a21f3..c1b605c063 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/crop_and_resize_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/crop_and_resize_impl.cu @@ -16,7 +16,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/crop_and_resize_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/crop_and_resize_impl.cuh" // for every position, first calculate position it mirrors from in the new padded array // adjust calculated position to origin dx array dimensions and copy value diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/crop_and_resize_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/crop_and_resize_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/crop_and_resize_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/crop_and_resize_impl.cuh index 21a83f7712..c3f31f2994 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/crop_and_resize_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/crop_and_resize_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_CROP_AND_RESIZE_IMPL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_CROP_AND_RESIZE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalCropAndResize(const size_t size, const T *input_image, float *input_boxes, int *input_box_index, int batch, int input_height, int input_width, int final_height, int final_width, int channel, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cross_entropy_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cross_entropy_impl.cu index cc81803964..6fcbec1d54 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cross_entropy_impl.cu @@ -18,7 +18,7 @@ #include #include #include "cross_entropy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" template __global__ void CrossEntropyWithSparseKernel(const T *logits, const S *labels, const size_t batch_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cross_entropy_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cross_entropy_impl.cuh index e88d98a90a..2440135fe4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cross_entropy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" // The batch size limit to judge whether to use multiple threads. constexpr int kLargeBatchLowLimit = 32768; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ctcloss_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ctcloss_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ctcloss_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ctcloss_impl.cu index 2de65bbf85..e41030a789 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ctcloss_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ctcloss_impl.cu @@ -16,7 +16,7 @@ #include #include "ctcloss_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __device__ T LogSumExp(const T logprob1, const T logprob2) { if (logprob1 == logprob2 && logprob1 == -std::numeric_limits::infinity()) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ctcloss_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ctcloss_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ctcloss_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ctcloss_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumprod_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumprod_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumprod_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumprod_impl.cu index 2836c781f6..a31fd2234b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumprod_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumprod_impl.cu @@ -15,7 +15,7 @@ */ #include "cumprod_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void Copy(T *input, T *output, size_t size) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumprod_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumprod_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumprod_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumprod_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumsum_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumsum_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumsum_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumsum_impl.cu index 63019fc927..84f148cf6b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumsum_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumsum_impl.cu @@ -15,7 +15,7 @@ */ #include "cumsum_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void Copy(T *input, T *output, size_t size) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumsum_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumsum_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/cumsum_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/cumsum_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/depthtospace_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/depthtospace_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/depthtospace_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/depthtospace_impl.cu index 19260c64f7..47f2fe73d8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/depthtospace_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/depthtospace_impl.cu @@ -15,7 +15,7 @@ */ #include #include "depthtospace_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void DepthToSpace(const size_t size, const T *input, const size_t in, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/depthtospace_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/depthtospace_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/depthtospace_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/depthtospace_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/determinant_triangle_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/determinant_triangle_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/determinant_triangle_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/determinant_triangle_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/determinant_triangle_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/determinant_triangle_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/determinant_triangle_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/determinant_triangle_impl.cuh index b017fe602f..a1a4cc0803 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/determinant_triangle_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/determinant_triangle_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_DETERMINANT_TRIANGLE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void DetTriangle(T *input, T *output, size_t matrix_n_, size_t count, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout3d_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dropout3d_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout3d_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dropout3d_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout3d_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dropout3d_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout3d_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dropout3d_impl.cuh index f5749b20b2..f1a50ce2ab 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout3d_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dropout3d_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_CUDA_IMPL_DROPOUT3D_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_CUDA_IMPL_DROPOUT3D_IMPL_CUH_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void Dropout3DForward(const T *input, bool *mask, T *output, float *rand_f, const size_t num_count, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dropout_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dropout_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dropout_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dropout_impl.cuh index 3ba27eeeea..57d5ce552f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dropout_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/dynamic_range_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_range_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dynamic_range_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_range_impl.cu index 253908082a..b292abe035 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dynamic_range_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_range_impl.cu @@ -17,7 +17,7 @@ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void ValidateInputAndInferShape(const T *range_start, const T *range_end, const T *range_delta, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dynamic_range_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_range_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dynamic_range_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_range_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dynamic_stitch_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_stitch_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dynamic_stitch_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_stitch_impl.cu index ed30fc7aab..0586500f10 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dynamic_stitch_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_stitch_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ #include "dynamic_stitch_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" __global__ void StitchKernel(const int *index_addr, const unsigned char *data_addr, unsigned char *output_addr, const size_t index_num, const size_t data_size, int *max_index_dev) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dynamic_stitch_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_stitch_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/dynamic_stitch_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/dynamic_stitch_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/einsum_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/einsum_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/einsum_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/einsum_impl.cu index c05394f67d..3a8abf6528 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/einsum_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/einsum_impl.cu @@ -15,8 +15,8 @@ */ #include #include "einsum_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" template __global__ void Diagonal(const size_t out_size, const T *input, const size_t *inp_shape, const size_t shape_size, const size_t left_dim, const size_t right_dim, T *output) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/einsum_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/einsum_impl.cuh similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/einsum_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/einsum_impl.cuh index e135214430..f0876f283e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/einsum_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/einsum_impl.cuh @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_EINSUM_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_EINSUM_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #define EINSUM_MAX_DIMENSION 20 template struct DynamicSharedMem; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/embedding_lookup_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/embedding_lookup_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/embedding_lookup_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/embedding_lookup_impl.cu index 8aaa5c83c6..740716adcb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/embedding_lookup_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/embedding_lookup_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/gatherv2.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/embedding_lookup_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/gatherv2.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/embedding_lookup_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void SubOffset(T *indices, size_t size, int64_t offset) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/embedding_lookup_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/embedding_lookup_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/embedding_lookup_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/embedding_lookup_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/equalcount_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/equalcount_impl.cu index e6f424c661..080ac397ba 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/equalcount_impl.cu @@ -15,7 +15,7 @@ */ #include "equalcount_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/equalcount_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/equalcount_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/equalcount_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/extract_image_patches_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/extract_image_patches_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/extract_image_patches_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/extract_image_patches_impl.cu index 9a9ae88737..ae84342030 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/extract_image_patches_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/extract_image_patches_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/extract_image_patches_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/extract_image_patches_impl.cuh" template __global__ void ExtractImagePatches(size_t output_size, int64_t stride_row, int64_t stride_col, int64_t rate_row, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/extract_image_patches_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/extract_image_patches_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/extract_image_patches_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/extract_image_patches_impl.cuh index 4cab8f09bd..baaf80b611 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/extract_image_patches_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/extract_image_patches_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_EXTRACT_IMAGE_PATCHES_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalExtractImagePatchesNHWC(size_t output_size, int64_t stride_row, int64_t stride_col, int64_t rate_row, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/eye_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/eye_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/eye_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/eye_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/eye_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/eye_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/eye_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/eye_impl.cuh index e76635ba7e..bca33c388a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/eye_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/eye_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_EYE_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_EYE_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void Eye(const size_t size, const size_t dim, T *output_addr, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perchannel_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perchannel_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perchannel_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perchannel_impl.cu index 9e196785b3..621f9a4666 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perchannel_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perchannel_impl.cu @@ -21,7 +21,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void FakeLearnedScaleQuantPerChannel(float *output, const int size, float *input_alpha, float *input_quant, const int channel_num) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh index a835c96224..432456116a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FAKE_LEARNED_SCALE_QUANT_PERCHANNEL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FAKE_LEARNED_SCALE_QUANT_PERCHANNEL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void CalLSQNudgePerChannel(const float *input, const int size, float *input_alpha, float *input_quant_max, float *input_div_alpha, float *input_quant, const bool neg_trunc, const int channel_num, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perlayer_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perlayer_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perlayer_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perlayer_impl.cu index e86b47d55b..a2fc40e3d6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perlayer_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perlayer_impl.cu @@ -19,7 +19,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void FakeLearnedScaleQuantPerLayer(float *output, const int size, float *input_alpha, float *input_quant) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh index 9667766367..26ca59bdde 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FAKE_LEARNED_SCALE_QUANT_PERLAYER_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_FAKE_LEARNED_SCALE_QUANT_PERLAYER_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void CalLSQNudgePerLayer(const float *input, const int size, float *input_alpha, float *input_quant_max, float *input_div_alpha, float *input_quant, const bool neg_trunc, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_quant_perchannel_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_quant_perchannel_impl.cu index 0e762b7dc4..748a69e684 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_quant_perchannel_impl.cu @@ -73,10 +73,10 @@ void CalNudgePerChannel(float *input_min, float *input_max, const float quant_mi } /** - * Calulate fake quant output accroding by nudge min, nudge max, nudge scale. + * Calculate fake quant output according by nudge min, nudge max, nudge scale. * @param input - array * @param output - array - * @param total_size - int, purpose for cal the per chanel number in filters + * @param total_size - int, purpose for cal the per channel number in filters * @param channel_size - int, purpose for cal the per channel number in filters * @param nudge_min - array * @param nudge_max - array diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_quant_perchannel_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_quant_perchannel_impl.cuh index e17615db67..36ca41adc9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perchannel_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_quant_perlayer_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_quant_perlayer_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_quant_perlayer_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fake_quant_perlayer_impl.cuh index 5f6675b2d7..7884c3130b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fake_quant_perlayer_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/fill_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fill_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fill_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fill_impl.cu index b4446ed8ea..58995dee4c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fill_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fill_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/fill_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/fill_impl.cuh" #include "include/cuda_runtime.h" template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fill_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fill_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fill_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fill_impl.cuh index 559d5f1311..acdcc191d5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/fill_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/fill_impl.cuh @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_FILL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_FILL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void Fill(const size_t &m, const size_t &n, const T *input, T *output, cudaStream_t stream); #endif // MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_FILL_H_ diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/float_status_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/float_status_impl.cu index 6667c05cd9..a27fe35e19 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/float_status_impl.cu @@ -15,7 +15,7 @@ */ #include "include/cuda_runtime.h" -#include "backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/float_status_impl.cuh" template __global__ void IsNan(const size_t size, const T* input, bool* out) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/float_status_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/float_status_impl.cuh index dbf0cff316..bc078cbc68 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/float_status_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalFloatStatus(const size_t size, const T *input, float *output, cudaStream_t stream); template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ftrl_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ftrl_impl.cu index be4415d509..dada21003b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ftrl_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/ftrl_impl.cuh" template __device__ __forceinline__ T PowFunc(T x, T y) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ftrl_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/ftrl_impl.cuh index b5f0f82afe..87add534c2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/ftrl_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/gather.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather.cu index 5feb28deb2..3b6e5dd163 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather.cu @@ -15,8 +15,8 @@ */ #include -#include "backend/kernel_compiler/gpu/cuda_impl/gather.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/gather.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void GatherKernel(const T *input, const S *index, T *output, const size_t dim_before_axis, const size_t dim_at_axis_input, const size_t dim_at_axis_output, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather_grad.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather_grad.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather_grad.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather_grad.cu index 7e09af2ad4..7e0136caa4 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather_grad.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather_grad.cu @@ -15,9 +15,9 @@ */ #include -#include "backend/kernel_compiler/gpu/cuda_impl/gather_grad.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/gather_grad.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void GatherGradKernel(const size_t num, const T *index, const S *grad, S *output, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather_grad.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather_grad.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gather_grad.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gather_grad.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gathernd.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gathernd.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gathernd.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gathernd.cu index 35d4ab3111..ff9f703356 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gathernd.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gathernd.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/gathernd.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/gathernd.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void GatherNdKernel(T *input, S *indices, T *output, const size_t output_dim0, const size_t output_dim1, const size_t indices_dim1, S *batch_indices, S *batch_strides) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gathernd.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gathernd.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gathernd.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gathernd.cuh index b8693b8b4e..127a45f1a2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gathernd.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gathernd.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_GATHERND_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_GATHERND_CUH_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void GatherNd(T *input, S *indices, T *output, const size_t &output_dim0, const size_t &output_dim1, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gatherv2.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gatherv2.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gatherv2.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gatherv2.cu index 5f07e744c3..6e895d5f0f 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gatherv2.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gatherv2.cu @@ -15,8 +15,8 @@ */ #include -#include "backend/kernel_compiler/gpu/cuda_impl/gatherv2.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/gatherv2.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void GatherV2Kernel(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/backend/kernel_compiler/gpu/cuda_impl/gatherv2.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gatherv2.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gatherv2.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gatherv2.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gelu_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gelu_impl.cu index 16a183811d..0d6b5614b4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gelu_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/gelu_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void GeluKernel(size_t size, T *input_addr, T *output_addr) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gelu_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/gelu_impl.cuh index 1e69f26d57..4b8fad7944 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/gelu_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/general_reduction_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/general_reduction_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/general_reduction_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/general_reduction_impl.cu index 05da5996ad..195f5f5ea0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/general_reduction_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/general_reduction_impl.cu @@ -16,9 +16,9 @@ #include #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" -#include "backend/kernel_compiler/gpu/cuda_impl/general_reduction_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/general_reduction_impl.cuh" const int kWarpSize = 32; const int kBlockSize = 512; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/general_reduction_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/general_reduction_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/general_reduction_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/general_reduction_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hash_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hash_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hash_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hash_impl.cu index 0a20616c58..fa7550e228 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hash_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hash_impl.cu @@ -15,7 +15,7 @@ */ #include "hash_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void HashSwapOut(const T *hash_table, T *swap_out_value, const int *swap_out_index, const int index_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hash_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hash_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hash_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hash_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hsigmoid_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hsigmoid_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hsigmoid_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hsigmoid_impl.cu index 18bd527ce3..6558715cad 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hsigmoid_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hsigmoid_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/hsigmoid_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/hsigmoid_impl.cuh" template __global__ void HsigmoidKernel(size_t size, const T *input, T *output) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hsigmoid_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hsigmoid_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hsigmoid_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hsigmoid_impl.cuh index f596b9cfb2..48d61d63b8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hsigmoid_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hsigmoid_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_HSIGMOID_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalHSigmoid(const size_t &size, const T *input, T *output, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hswish_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hswish_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hswish_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hswish_impl.cu index 0382f73966..982e0eba2f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hswish_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hswish_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/hswish_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/hswish_impl.cuh" template __global__ void HSwishKernel(size_t size, const T *input, T *output) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hswish_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hswish_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hswish_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hswish_impl.cuh index 8209bed0bb..416f40f52d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/hswish_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/hswish_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_HSWISH_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalHSwish(const size_t &size, const T *input, T *output, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/in_top_k_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/in_top_k_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/in_top_k_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/in_top_k_impl.cu index d56307e947..8a10e34099 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/in_top_k_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/in_top_k_impl.cu @@ -17,7 +17,7 @@ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void InTopK(const T *predictions, const int32_t *targets, bool *output, const T *top_k_output, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/in_top_k_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/in_top_k_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/in_top_k_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/in_top_k_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/index_add_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/index_add_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/index_add_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/index_add_impl.cu index e57d9666c2..d5743543d2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/index_add_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/index_add_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ #include -#include "backend/kernel_compiler/gpu/cuda_impl/index_add_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/index_add_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" template __global__ void IndexAddAtomic(T *dst, const int *index, const T *src, const size_t src_size, const size_t outer_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/index_add_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/index_add_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/index_add_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/index_add_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/instance_norm_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/instance_norm_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/instance_norm_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/instance_norm_impl.cu index 92bec446f5..3698c08234 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/instance_norm_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/instance_norm_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/instance_norm_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/instance_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void CopyMemKernel(const size_t thread_num, const size_t N, const size_t C, float *gamma_addr, float *beta_addr, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/instance_norm_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/instance_norm_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/instance_norm_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/instance_norm_impl.cuh index adb0d5895b..22791f91f7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/instance_norm_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/instance_norm_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_INSTANCE_NORM_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_INSTANCE_NORM_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void CopyMemDevice2Device(const size_t N, const size_t C, float *gamma_addr, float *beta_addr, float *runing_mean_addr, float *runnig_variance_addr, float *ws_gamma, float *ws_beta, float *ws_mean, float *ws_var, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/iou_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/iou_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/iou_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/iou_impl.cu index 3b785e2655..ca8c51e54e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/iou_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/iou_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/iou_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/iou_impl.cuh" __device__ float CoordinateMax(const float a, const float b) { return (a > b ? a : b); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/iou_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/iou_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/iou_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/iou_impl.cuh index f8e7d98a24..c9d0de6238 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/iou_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/iou_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_IOU_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_IOU_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #define IOU_LOCATION_NUM 2 #define IOU_DIMENSION 4 diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2_loss.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2_loss.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2_loss.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2_loss.cu index e12054f0ec..6c303594cf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2_loss.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2_loss.cu @@ -15,8 +15,8 @@ */ #include "l2_loss.cuh" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" template __global__ void L2LossKernel(const size_t input_size, const T *input , T *output) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2_loss.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2_loss.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2_loss.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2_loss.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2normalize_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2normalize_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2normalize_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2normalize_impl.cu index 808776a014..25603f5087 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2normalize_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2normalize_impl.cu @@ -15,7 +15,7 @@ */ #include "l2normalize_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" template __global__ void AssignEps(const size_t size, const float eps, T* value) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2normalize_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2normalize_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/l2normalize_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/l2normalize_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_grad_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_grad_impl.cu index 6a4f3c776b..3cf14c491e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_grad_impl.cu @@ -17,8 +17,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_grad_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_grad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/layer_norm_impl.cuh" constexpr int THREAD_PER_BLOCK = 256; constexpr int NUM_PER_THREAD_REDUCE = 4; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_grad_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_grad_impl.cuh index 7ffc93ca36..1f11270e58 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LAYER_NORM_GRAD_GRAD_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LAYER_NORM_GRAD_GRAD_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void LayerNormGradGrad(const int& row_dim, const int& col_dim, const int& param_dim, T* global_sum1, T* global_sum2, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_impl.cu index 35d200b92a..9133d4f35e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_impl.cu @@ -17,8 +17,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/layer_norm_impl.cuh" constexpr int NUM_PER_THREAD_REDUCE = 4; constexpr int WARP_SIZE = 32; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_impl.cuh index 13d7a58614..0b292600b6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_impl.cu index 5797a3d711..91bc971027 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_impl.cu @@ -17,7 +17,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/layer_norm_impl.cuh" constexpr int NUM_PER_THREAD_REDUCE = 4; constexpr int WARP_SIZE = 32; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/layer_norm_impl.cuh index 9548b30d44..cb1674bbc2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/layer_norm_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template struct DynamicSharedMem; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/linspace.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/linspace.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/linspace.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/linspace.cu index 2fa18bf647..30bd353b6a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/linspace.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/linspace.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/linspace.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/linspace.cuh" #include template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/linspace.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/linspace.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/linspace.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/linspace.cuh index 59b232d7ad..c0d3474b18 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/linspace.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/linspace.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_LINSPACE_IMPL_CU_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_LINSPACE_IMPL_CU_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void calLinSpace(const T *start, const T *stop, const size_t value_count, T *output, cudaStream_t cuda_stream); #endif // MINDSPORE_CCSRC_KERNEL_GPU_CUDA_LINSPACE_IMPL_CU_H_ diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/local_response_norm_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/local_response_norm_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/local_response_norm_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/local_response_norm_impl.cu index 3ed4e796cc..1d8b4c3340 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/local_response_norm_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/local_response_norm_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/local_response_norm_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/local_response_norm_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/local_response_norm_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/local_response_norm_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/local_response_norm_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/local_response_norm_impl.cuh index f4999fe57a..7493f70d24 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/local_response_norm_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/local_response_norm_impl.cuh @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LOCAL_RESPONSE_NORM_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LOCAL_RESPONSE_NORM_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalLocalResponseNormNHWC(const T *input, const int depth_radius, const float bias, const float alpha, const float beta, const size_t channels, const size_t num_elements, float *scale, T *output, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/logical_not_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/logical_not_impl.cu similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/logical_not_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/logical_not_impl.cu index f544813750..592300196a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/logical_not_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/logical_not_impl.cu @@ -17,8 +17,8 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/logical_not_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/logical_not_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template struct LogicalNotFunc { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/logical_not_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/logical_not_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/logical_not_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/logical_not_impl.cuh index 344fe3e79c..dbf8185b67 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/logical_not_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/logical_not_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LOGICAL_NOT_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void LogicalNotImpl(const int &nums, const T *x, bool *y, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cu index cbdd81f114..96b99c5de8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cu @@ -16,7 +16,7 @@ #include #include "loss_with_reduction_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "util.cuh" inline __device__ float logT(float x) { return logf(x); } diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_band_part_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_band_part_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_band_part_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_band_part_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_band_part_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_band_part_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_band_part_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_band_part_impl.cuh index 1860b540aa..c8f11f340c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_band_part_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_band_part_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_MATRIX_BAND_PART_IMPL_CUH #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_MATRIX_BAND_PART_IMPL_CUH -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void MatrixBandPart(const size_t size, const T *input_matrix_addr, const size_t m, const size_t n, const int64_t l, const int64_t u, T *output_addr, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_combine_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_combine_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_combine_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_combine_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_combine_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_combine_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_combine_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_combine_impl.cuh index 737ec13383..f7056fc188 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_combine_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_combine_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_MATRIXCOMBINE_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_MATRIXCOMBINE_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void MatrixCombine(const size_t size, const size_t src_height, const size_t src_width, const size_t dst_width, const size_t residual, const size_t res_width, const size_t batch, T *input_addr, T *output_addr, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_diag_part_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_diag_part_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_diag_part_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_diag_part_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_diag_part_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_diag_part_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_diag_part_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_diag_part_impl.cuh index ee3e2740f6..ea49f67e7b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_diag_part_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_diag_part_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_MATRIX_DIAG_PART_IMPL_CUH #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_MATRIX_DIAG_PART_IMPL_CUH -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void MatrixDiagPart(const size_t size, const T *input_matrix_addr, const size_t m, const size_t n, const int64_t l, const int64_t u, const size_t num_diags, const size_t max_diag_len, const int64_t la, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_set_diag_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_set_diag_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_set_diag_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_set_diag_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_set_diag_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_set_diag_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_set_diag_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_set_diag_impl.cuh index 1f5e7529a9..19c4257901 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_set_diag_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_set_diag_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_MATRIX_SET_DIAG_IMPL_CUH_ #define MINDSPORE_MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_MATRIX_SET_DIAG_IMPL_CUH_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void MatrixSetDiag(const int outer_batch, const int inner_row, const int inner_col, const int num_diags, const int max_diag_len, const int lower_index, const int upper_index, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_split_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_split_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_split_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_split_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_split_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_split_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_split_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_split_impl.cuh index edae55c14d..3e2a808e08 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/matrix_split_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/matrix_split_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_MATRIXSPLIT_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_MATRIXSPLIT_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void MatrixSplit(const size_t size, const size_t split_dim, const size_t dim, T *input_addr, T *output_addr, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_grad_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_grad_impl.cu index 80c8fde1ec..3f1489f3c7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_grad_impl.cu @@ -16,9 +16,9 @@ #include #include "maxpool_with_argmax_grad_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" template __global__ void MaxPoolWithArgmaxGrad(const T* dy, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_grad_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_grad_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_impl.cu index 16da469d59..b4dd206b2a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_impl.cu @@ -16,7 +16,7 @@ #include #include "maxpool_with_argmax_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" template __global__ void MaxPoolWithArgmax(const T* input, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/minmax_update_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/minmax_update_impl.cu index 97b9a051ca..fb62fb413c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/minmax_update_impl.cu @@ -20,7 +20,7 @@ #include #include #include "minmax_update_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/minmax_update_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/minmax_update_impl.cuh index b4b4d582ee..bdbc7654c5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/mirror_pad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/mirror_pad_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/mirror_pad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/mirror_pad_impl.cu index e1913ef746..65e88876fe 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/mirror_pad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/mirror_pad_impl.cu @@ -16,7 +16,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/mirror_pad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/mirror_pad_impl.cuh" // check for existence in current padded array on X and Y dims __inline__ __device__ bool range_check(int x, int y, int padded_width, int padded_height) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/mirror_pad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/mirror_pad_impl.cuh similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/mirror_pad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/mirror_pad_impl.cuh index a536faab16..d85f49fcd9 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/mirror_pad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/mirror_pad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_MIRROR_PAD_IMPL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_MIRROR_PAD_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" // preset size of paddings #define MAX_PADDINGS 4 diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/momentum_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/momentum_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/momentum_impl.cuh similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/momentum_impl.cuh index 57b271e9d1..aec380a6c9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/momentum_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void MomentumUpdateVariable(const size_t size, T *variable, T *accumulation, const S *learning_rate, const G *gradient, const S *momentum, bool use_nesterov, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/multinomial_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/multinomial_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/multinomial_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/multinomial_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/multinomial_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/multinomial_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/multinomial_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/multinomial_impl.cuh index f692fa606a..b30b5b43c6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/multinomial_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/multinomial_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MULTINOMIAL_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MULTINOMIAL_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void InitRandState(int seed, int num, curandState *state, cudaStream_t stream); template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/nms_with_mask_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/nms_with_mask_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/nms_with_mask_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/nms_with_mask_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/nms_with_mask_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/nms_with_mask_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/nms_with_mask_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/nms_with_mask_impl.cuh index c1f89b0461..d3e380b3d3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/nms_with_mask_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/nms_with_mask_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_NMS_WITH_MASK_IMPL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_NMS_WITH_MASK_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalSort(const int &inner, T *data_in, T *data_out, int *index_buff, T *data_buff, int box_size_, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/one_hot_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/one_hot_impl.cu index 9447e6e0e6..9aada57e6c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/one_hot_impl.cu @@ -15,7 +15,7 @@ */ #include "one_hot_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/one_hot_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/one_hot_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/one_hot_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/oneslike_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/oneslike_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/oneslike_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/oneslike_impl.cu index 7b1e3227b5..1c2fe95ce1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/oneslike_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/oneslike_impl.cu @@ -16,7 +16,7 @@ #include #include "oneslike_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void OnesLike(const size_t size, const T* input, T* output) { int one = 1; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/oneslike_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/oneslike_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/oneslike_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/oneslike_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pack.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pack.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pack.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pack.cu index d3563756a8..d9df908bfd 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pack.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pack.cu @@ -17,7 +17,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pack.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/pack.cuh" template __global__ void Pack(const size_t size, const size_t input_num, const size_t dims_behind_axis, T** inputs, T* output) { for (size_t pos = blockIdx.x * blockDim.x + threadIdx.x; pos < (size); pos += blockDim.x * gridDim.x) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pack.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pack.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pack.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pack.cuh index 80fdb9a4d2..a74c125d6a 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pack.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pack.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_PACK_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_PACK_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void PackKernel(const size_t size, const size_t input_num, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pad_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pad_impl.cu index 916b981488..e6ac41ea9c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pad_impl.cu @@ -16,7 +16,7 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" // For internal OP use, not user facing template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh index fac9483359..647f353013 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_PAD_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_PAD_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/prelu_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_grad_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_grad_impl.cu index f151aea026..9cfb1948b7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_grad_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/prelu_grad_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/prelu_grad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void CalPReLUGradKernel(size_t size, size_t weight_size, size_t per_channel_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_grad_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_grad_impl.cuh index b71fcf36db..90bbda6bc0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_PRELU_GRAD_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_PRELU_GRAD_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalPReLUGrad(size_t input_size, size_t weight_size, size_t per_channel_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_impl.cu index 23759d3276..2b1f687bbf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/prelu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/prelu_impl.cuh" template __global__ void CalPReLUKernel(size_t size, size_t weight_size, size_t per_channel_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_impl.cuh index 08e31e4d16..eb8c45486f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/prelu_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/prelu_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_PRELU_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_PRELU_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalPReLU(size_t input_size, size_t weight_size, size_t per_channel_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/psroi_pooling_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/psroi_pooling_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/psroi_pooling_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/psroi_pooling_impl.cu index 45e2bdfc5a..77b39e037b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/psroi_pooling_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/psroi_pooling_impl.cu @@ -18,9 +18,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/psroi_pooling_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/psroi_pooling_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void PSROIPoolInitKernel(size_t size_init, T *input) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/psroi_pooling_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/psroi_pooling_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/psroi_pooling_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/psroi_pooling_impl.cuh index 00370352ce..9ca45fcfd8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/psroi_pooling_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/psroi_pooling_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_PS_ROI_POOLING_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_PS_ROI_POOLING_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void PSROIPoolForwardLauncher( diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_categorical.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_categorical.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_categorical.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_categorical.cu index 79d848b658..79dedd603e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_categorical.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_categorical.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/random_categorical.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/random_categorical.cuh" template __global__ void RandomCategorical(const size_t num_samples, double** dev_rand, double** dev_cdf, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_categorical.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_categorical.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_categorical.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_categorical.cuh index 2bfa007b8f..9aaa04e22f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_categorical.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_categorical.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_RANDOM_CATEGORICAL_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_RANDOM_CATEGORICAL_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void GetCdfKernel(const T *logits_addr, double** dev_cdf, const size_t batch_size, const size_t num_classes, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_choice_with_mask_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_choice_with_mask_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_choice_with_mask_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_choice_with_mask_impl.cu index 20478bcb84..da0f65ba42 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_choice_with_mask_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_choice_with_mask_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/random_choice_with_mask_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/random_choice_with_mask_impl.cuh" #include int RcwmRoundUpPower2(int v) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_choice_with_mask_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_choice_with_mask_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_choice_with_mask_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_choice_with_mask_impl.cuh index c3dd10754f..f5b1cfd74c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_choice_with_mask_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_choice_with_mask_impl.cuh @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #define BLOCKSIZE 256 #define MAX_DIMENSION 5 diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_op_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_op_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_op_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_op_impl.cuh index 978b5147eb..0b558dc01b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/random_op_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/random_op_impl.cuh @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void StandardNormal(int seed, int seed2, curandState *globalState, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/range_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/range_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/range_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/range_impl.cu index a2dfb407c3..afc3a50a8a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/range_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/range_impl.cu @@ -16,7 +16,7 @@ #include #include "range_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void Range(const int size, const float start, const float limit, const float delta, const T *input, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/range_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/range_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/range_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/range_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rcwm_small_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rcwm_small_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rcwm_small_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rcwm_small_impl.cu index e8503a0bcb..d992020489 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rcwm_small_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rcwm_small_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/topk_lib.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/random_choice_with_mask_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/topk_lib.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/random_choice_with_mask_impl.cuh" // Kernel started from here #define L2_RCWM_HELPER(BLOCK, NUM_WARP_Q, NUM_THREAD_Q, IS_DESCEND) \ diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/real_to_complex_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/real_to_complex_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/real_to_complex_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/real_to_complex_impl.cu index 6846fb02fd..9fbc8013db 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/real_to_complex_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/real_to_complex_impl.cu @@ -17,7 +17,7 @@ #include #include "real_to_complex_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void ToComplex(const size_t size, const T *input, T *output, cudaStream_t cuda_stream) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/real_to_complex_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/real_to_complex_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/real_to_complex_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/real_to_complex_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_grad_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_grad_impl.cu index 9f9dab7ae3..29084bf0f8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_grad_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/relu_grad_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/relu_grad_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void CalReLUGradKernel(int size, T *dy, T *y, T *dx) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_grad_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_grad_impl.cuh index 91840aa67f..9a392aef20 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_RELU_GRAD_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_RELU_GRAD_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalReLUGrad(int input_size, T *dy, T *y, T *dx, cudaStream_t cuda_stream); #endif // MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_RELU_GRAD_H_ diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_impl.cu index c11271662f..c4092a0b88 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/relu_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/relu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void CalReLUKernel(int size, T *input_addr, T *output_addr) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_impl.cuh index 7918395f6f..134aed477d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/relu_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/relu_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_RELU_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_RELU_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalReLU(int input_size, T *input_addr, T *output_addr, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_bilinear_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_bilinear_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_bilinear_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_bilinear_impl.cu index ee37091cb7..3c508bee83 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_bilinear_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_bilinear_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/resize_bilinear_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/resize_bilinear_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" template __global__ void ResizeBilinear(const T *input, const int n, const int c, const int input_h, const int input_w, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_bilinear_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_bilinear_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_bilinear_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_bilinear_impl.cuh index e175c4f9cd..4d2a435023 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_bilinear_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_bilinear_impl.cuh @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_RESIZE_BILINEAR_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_RESIZE_BILINEAR_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalResizeBilinear(const T *input, const int n_, const int c_, const int input_h_, const int input_w_, const int output_h_, const int output_w_, const float h_scale, const float w_scale, T *output, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_grad_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_grad_impl.cu index 8e61a46ad7..e2b8209d1c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_grad_impl.cu @@ -18,8 +18,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_grad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_grad_impl.cuh" template __global__ void InitZero(T *output, const int output_size) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_grad_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_grad_impl.cuh index c7f85e694a..926b0215f6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_RESIZE_NEAREST_NEIGHBOR_GRAD_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_RESIZE_NEAREST_NEIGHBOR_GRAD_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #define RESIZENEARESTNEIGHBORGRAD_DIMENSION 4 template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_impl.cu index 2cca9bd7a8..3186b1c456 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_impl.cu @@ -18,7 +18,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_impl.cuh" template __global__ void ResizeNearestNeighbor(const int size, const T *input, const int s1, const int s2, const int s3, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_impl.cuh index a9eafe36ce..fc68a67e11 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/resize_nearest_neighbor_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/resize_nearest_neighbor_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_RESIZE_NEAREST_NEIGHBOR_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_RESIZE_NEAREST_NEIGHBOR_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #define RESIZENEARESTNEIGHBOR_DIMENSION 4 template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_sequence_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_sequence_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_sequence_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_sequence_impl.cu index 869c83b6b6..52b98e8c6e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_sequence_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_sequence_impl.cu @@ -16,7 +16,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/reverse_sequence_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/reverse_sequence_impl.cuh" // Util function to convert a 1D input array index to an N-D positional index // Required since GPU iterates over all values in an ND array as a 1D array diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_sequence_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_sequence_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_sequence_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_sequence_impl.cuh index f8e44ea89b..57b940bce2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_sequence_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_sequence_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_REVERSE_SEQUENCE_IMPL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_REVERSE_SEQUENCE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalReverseSequence(const size_t size, const T *input, const S *seq_len, const int64_t batch_dim, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_v2_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_v2_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_v2_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_v2_impl.cu index ecb812408a..81a9e0aa56 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_v2_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_v2_impl.cu @@ -15,7 +15,7 @@ */ #include #include "reverse_v2_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void ReverseV2(const T* input, T* output, const size_t* input_shape, const int64_t* strides, const int64_t* axis, size_t input_size, size_t axis_size) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_v2_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_v2_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/reverse_v2_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/reverse_v2_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/discounted_return_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/discounted_return_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/discounted_return_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/discounted_return_impl.cu index 9e526b46c5..88e621dfdb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/discounted_return_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/discounted_return_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/rl/discounted_return_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/rl/discounted_return_impl.cuh" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/discounted_return_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/discounted_return_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/discounted_return_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/discounted_return_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cu index 147e8cbc32..68a8fe5826 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cuh" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cuh similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cuh index 780d56a8c7..07248a8a7b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_RL_BUFFER_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_RL_BUFFER_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void BufferAppend(const int64_t capacity, const size_t size, const int *index, const int exp_batch, unsigned char *buffer, const unsigned char *exp, cudaStream_t cuda_stream); void IncreaseCount(const int64_t capacity, const int exp_batch, int *count, int *head, int *index, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/tag_env_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/tag_env_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/tag_env_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/tag_env_impl.cu index 5153fe022b..e7030b8b09 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/tag_env_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/tag_env_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/rl/tag_env_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/rl/tag_env_impl.cuh" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/tag_env_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/tag_env_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rl/tag_env_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rl/tag_env_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rmsprop_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rmsprop_impl.cu index 80806b552f..4a2b68e70b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rmsprop_impl.cu @@ -15,8 +15,8 @@ */ #include -#include "backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/rmsprop_impl.cuh" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rmsprop_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/rmsprop_impl.cuh index 16ad611381..40a63ce48d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/rmsprop_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/roi_align_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/roi_align_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/roi_align_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/roi_align_impl.cu index 92013f6547..11b783976a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/roi_align_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/roi_align_impl.cu @@ -16,7 +16,7 @@ #include "roi_align_impl.cuh" #include "util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" inline __device__ int roi_cast_int(float x) { return __float2int_rd(x); } inline __device__ int roi_cast_int(half x) { return __half2int_rd(x); } diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/roi_align_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/roi_align_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/roi_align_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/roi_align_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_functor_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_functor_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_functor_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_functor_impl.cu index 58d31e1fee..efc0a21e83 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_functor_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_functor_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/scatter_functor_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/scatter_functor_impl.cuh" template __global__ void ScatterUpdateKernel(const size_t inner_size, const size_t updates_size, const S *indices, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_functor_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_functor_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_functor_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_functor_impl.cuh index f33da6f7da..8c264d0fbc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_functor_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_functor_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SCATTER_FUNCTOR_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SCATTER_FUNCTOR_IMPL_CUH_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" enum ScatterFunctorType { SCATTER_FUNC_UPDATE = 0, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd.cu index ab706d7739..1780e97447 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/scatter_nd.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/scatter_nd.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void ScatterNdKernel(S *indices, T *update, T *output, const size_t block_size, const size_t input_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd.cuh similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd.cuh index 7573239743..8bf142abaf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_SCATTER_ND_GPU_CU_H #define MINDSPORE_SCATTER_ND_GPU_CU_H -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void ScatterNd(S *indices, T *update, T *output, const size_t &block_size, const size_t &input_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd_functor_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd_functor_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd_functor_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd_functor_impl.cu index 3de39560b1..8aca3518dd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd_functor_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd_functor_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/scatter_nd_functor_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/scatter_nd_functor_impl.cuh" template __global__ void ScatterNdUpdate(const size_t unit_size, const size_t index_depth, const size_t updates_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd_functor_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd_functor_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd_functor_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd_functor_impl.cuh index 03d9f5b5fb..faf08587d4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/scatter_nd_functor_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/scatter_nd_functor_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SCATTER_ND_FUNCTOR_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SCATTER_ND_FUNCTOR_IMPL_CUH_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" enum ScatterNdFunctorType { SCATTER_ND_FUNC_UPDATE = 0, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/select_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/select_impl.cu index e8ebe7e30f..4f11a9682e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/select_impl.cu @@ -17,7 +17,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/select_impl.cuh" +#include "plugin/device/gpu/kernel/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/backend/kernel_compiler/gpu/cuda_impl/select_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/select_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/select_impl.cuh index 300ed281f7..3ee876061b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/select_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/select_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SELECT_IMPL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SELECT_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/sgd_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sgd_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sgd_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sgd_impl.cu index 66451c2390..6677c2676d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sgd_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sgd_impl.cu @@ -15,7 +15,7 @@ */ #include -#include "backend/kernel_compiler/gpu/cuda_impl/sgd_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sgd_impl.cuh" template __global__ void SGDKernel(const int size, const T dampening, const T weight_decay, const bool nesterov, const T *grad, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sgd_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sgd_impl.cuh similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sgd_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sgd_impl.cuh index bc2fa3304d..487f88c128 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sgd_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sgd_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SGD_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SGD_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void SGD(const int size, const T dampening, const T weight_decay, const bool nesterov, const T *lr, const T *momentum, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu index ee08eb9a58..1119bb138b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh" +#include "plugin/device/gpu/kernel/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/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh index d9a1c6f1df..dbae8bc4b5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void SigmoidCrossEntropyWithLogitsGrad(const size_t size, const T *logits, const S *labels, const T *dout_addr, T *outputs, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu index 22ed2c4514..73b16c6a12 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh" +#include "plugin/device/gpu/kernel/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/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh index 7e9130857f..a01a40443b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/slice_copy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_copy_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_copy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_copy_impl.cu index a3d2498ed2..f63cf62786 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_copy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_copy_impl.cu @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/slice_copy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/slice_copy_impl.cuh" namespace { constexpr size_t kMaxDim = 8; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_copy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_copy_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_copy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_copy_impl.cuh index e45e6dd971..f3c2b1725e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_copy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_copy_impl.cuh @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CopySlices(const std::vector &update_shape, const std::vector &begin, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_impl.cu index 127f62225a..f9b2e1dabb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_impl.cu @@ -18,7 +18,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh" template __global__ void Slice1D(const size_t s1, const size_t l1, const size_t d1, const T *input, T *output) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh index f73e0c0b4e..d1780d54f7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh @@ -19,7 +19,7 @@ #include #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void SliceKernel(const T *input, T *output, const size_t output_size, cudaStream_t cuda_stream, S...pack); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/smooth_l1_loss_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/smooth_l1_loss_impl.cu index 562078f986..028511192c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/smooth_l1_loss_impl.cu @@ -15,7 +15,7 @@ */ #include "smooth_l1_loss_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void SmoothL1LossKernel(const int input_size, const float beta, const T *prediction, const T *target, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/smooth_l1_loss_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/smooth_l1_loss_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/smooth_l1_loss_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/softplus_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/softplus_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/softplus_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/softplus_impl.cu index 3aa2d1e8a5..17a120c95b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/softplus_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/softplus_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/softplus_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/softplus_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void SoftplusKernel(const size_t size, const T *input_addr, T *output_addr) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/softplus_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/softplus_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/softplus_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/softplus_impl.cuh index 639f71f87f..43992e3d26 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/softplus_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/softplus_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_SOFTPLUS_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_SOFTPLUS_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void Softplus(const size_t input_size, const T* input_addr, T* output_addr, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetobatch_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetobatch_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetobatch_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetobatch_impl.cu index c770726f2b..0c1c4b67b2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetobatch_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetobatch_impl.cu @@ -15,7 +15,7 @@ */ #include #include "spacetobatch_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void SpaceToBatch(const size_t size, const T *input, const size_t in, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetobatch_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetobatch_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetobatch_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetobatch_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetodepth_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetodepth_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetodepth_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetodepth_impl.cu index 4eefede95f..16905e9bbf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetodepth_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetodepth_impl.cu @@ -16,7 +16,7 @@ #include #include "spacetodepth_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void SpaceToDepth(const size_t size, const T *input, const size_t in, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetodepth_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetodepth_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/spacetodepth_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/spacetodepth_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_apply_proximal_adagrad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_apply_proximal_adagrad_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_apply_proximal_adagrad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_apply_proximal_adagrad_impl.cu index daff5f5a4b..41a3342750 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_apply_proximal_adagrad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_apply_proximal_adagrad_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh" template __device__ __forceinline__ bool CompareFunc(T x, T y) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh index e11a277cb6..fc133b00b7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMP_SPARSE_APPLY_PROXIMAL_ADAGRAD_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMP_SPARSE_APPLY_PROXIMAL_ADAGRAD_IMPL_CUH_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalSparseApplyProximalAdagrad(const size_t size, const size_t indices_size, const T *learning_rate, const T *l1_regularization, const T *l2_regularization, const T *gradient, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_cross_entropy_cuda_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_cross_entropy_cuda_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_cross_entropy_cuda_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_cross_entropy_cuda_impl.cuh index fa32260381..3a32c6e36a 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_cross_entropy_cuda_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/sparse_ftrl_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_ftrl_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_ftrl_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_ftrl_impl.cu index 3d9b73e003..19172b4802 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_ftrl_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_ftrl_impl.cu @@ -15,7 +15,7 @@ */ #include "sparse_ftrl_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_ftrl_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_ftrl_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sparse_ftrl_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sparse_ftrl_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/split_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/split_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/split_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/split_impl.cu index 07b981a948..359a64b4cd 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/split_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/split_impl.cu @@ -17,7 +17,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/split_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/split_impl.cuh" template __global__ void Split(const size_t size, const int axis_step, const int all_size_before_axis, const int all_size_axis, const T* input, T** outputs) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/split_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/split_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/split_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/split_impl.cuh index b8abce290d..7ca1593be6 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/split_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/split_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPLIT_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPLIT_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void SplitKernel(const size_t size, const int axis_step, const int all_size_before_axis, const int all_size_axis, const T* input, T** outputs, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_atom_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_atom_energy_impl.cu similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_atom_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_atom_energy_impl.cu index 0d9ea99fb7..3400326d01 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_atom_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_atom_energy_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void AngleAtomEnergyKernel(int angle_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, const int *atom_c, const float *angle_k, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh index d42e61ab4e..e21047e456 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_ANGLE_ANGLE_ATOM_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void AngleAtomEnergy(int angle_numbers, int atom_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const int *atom_c, const float *angle_k, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_energy_impl.cu similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_energy_impl.cu index d76372c47f..717125297d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_energy_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void AngleEnergyKernel(int angle_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, const int *atom_c, const float *angle_k, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_energy_impl.cuh similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_energy_impl.cuh index 2dedc967c6..0a82465805 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_ANGLE_ANGLE_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void AngleEnergy(int angle_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const int *atom_c, const float *angle_k, const float *angle_theta0, float *ene, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_impl.cu index 3eb87afad3..f441c9a54d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void AngleForceKernel(int angle_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, const int *atom_c, const float *angle_k, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_impl.cuh index 56027d51bd..b150c2e8d1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_ANGLE_ANGLE_FORCE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void AngleForce(int angle_numbers, int atom_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const int *atom_c, const float *angle_k, const float *angle_theta0, float *frc_f, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cu index 1ce1cff543..d9d2f2da60 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void AngleForceWithAtomEnergyKernel(int angle_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh index e0524b4dfb..d4f11819e4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_ANGLE_ANGLE_FORCE_WITH_ATOM_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void AngleForceWithAtomEnergy(int angle_numbers, int atom_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const int *atom_c, const float *angle_k, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cu similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cu index c38acc3571..96f71952d9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void BondAtomEnergyCudaKernel(const int bond_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh index d456700843..edeb4e881c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_BOND_BOND_ATOM_ENERGY_GPU_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void BondAtomEnergy(int bond_numbers, int atom_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const float *bond_k, const float *bond_r0, float *atom_ene, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cu index 161a647f90..34143947e2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void BondEnergyCudaKernel(const int bond_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, const float *bond_k, const float *bond_r0, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh index 2296984e9a..5cd6514b4e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_BOND_BOND_ENERGY_CUDA_GPU_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void BondEnergy(int bond_numbers, int atom_numbers, const unsigned int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const float *bond_k, const float *bond_r0, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cu index 5d4e53a2a9..c2a074f0b7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void BondForceCudaKernel(int bond_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, const float *bond_k, const float *bond_r0, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh index 1a595c84d3..b72a408fda 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_BOND_BOND_FORCE_CUDA_GPU_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void BondForce(int bond_numbers, int atom_numbers, const unsigned int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const float *bond_k, const float *bond_r0, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cu index 1bf3a51fa9..2161f2b422 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void BondForceWithAtomEnergyAndVirialKernel(const int bond_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh index a6b41f57a5..1e1438c843 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_BOND_BOND_FORCE_WITH_ATOM_VIRIAL_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void BondForceWithAtomEnergyAndVirial(int bond_numbers, int atom_numbers, const unsigned int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const float *bond_k, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cu index 2dd19acc73..353fa4da59 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void BondForceWithAtomEnergyKernel(int bond_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh index 3bb66c85e1..06fe324769 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_BOND_BOND_FORCE_WITH_ATOM_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void BondForceWithAtomEnergy(int bond_numbers, int atom_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const float *bond_k, const float *bond_r0, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cu index bf04be130f..83f9a0f3c1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void BondForceWithAtomVirialKernel(int bond_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh index cadf08885c..33b498dc4d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_BOND_BOND_FORCE_WITH_ATOM_VIRIAL_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void BondForceWithAtomVirial(int bond_numbers, int atom_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const float *bond_k, const float *bond_r0, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/atomcrdtocv_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/atomcrdtocv_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/atomcrdtocv_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/atomcrdtocv_impl.cu index a3c4ae5ec6..bf887ada53 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/atomcrdtocv_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/atomcrdtocv_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/atomcrdtocv_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/atomcrdtocv_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __device__ __host__ float fc(float Rij) { const float PI = 3.141592654; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/atomcrdtocv_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/atomcrdtocv_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/atomcrdtocv_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/atomcrdtocv_impl.cuh index f7edf8d795..e3ee3e875d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/atomcrdtocv_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/atomcrdtocv_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_COMMON_ATOMCRDTOCV_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_COMMON_ATOMCRDTOCV_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void AtomCrdToCV(int atom_numbers, int start_serial, int end_serial, int number, const float *crd_f, const float *old_crd, float *nowarp_crd, int *box_map_times, float *box, float *g_radial, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_impl.cu index 59f92f702c..83dd52f542 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh" __global__ void Crd_To_Uint_Crd(const int atom_numbers, const VECTOR *scale_factor, const VECTOR *crd, UNSIGNED_INT_VECTOR *uint_crd) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh index 8cb5b4a12e..0b3197810e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_CRD_TO_UINT_CRD_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void CrdToUintCrd(const int atom_numbers, const float *crd_to_uint_crd_cof_f, const float *crd_f, unsigned int *uint_crd_f, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cu index c669ef3962..9f7aa28489 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cu @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Crd_To_Uint_Crd_Quarter(const int atom_numbers, const VECTOR *scale_factor, const VECTOR *crd, UNSIGNED_INT_VECTOR *uint_crd) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh index 1bbbb44cef..f26cb13e5a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_CRD_TO_UINT_CRD_QUARTER_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void CrdToUintCrdQuarter(const int atom_numbers, const float *crd_to_uint_crd_cof_f, const float *crd_f, unsigned int *uint_crd_f, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/get_center_of_mass_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/get_center_of_mass_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/get_center_of_mass_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/get_center_of_mass_impl.cu index 2c22313e8d..b581bac9d1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/get_center_of_mass_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/get_center_of_mass_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/get_center_of_mass_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/get_center_of_mass_impl.cuh" __global__ void Get_Center_Of_Mass(int residue_numbers, int *start, int *end, VECTOR *crd, float *atom_mass, float *residue_mass_inverse, VECTOR *center_of_mass) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/get_center_of_mass_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/get_center_of_mass_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/get_center_of_mass_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/get_center_of_mass_impl.cuh index 484f104470..becb653f48 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/get_center_of_mass_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/get_center_of_mass_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_COMMON_GETCENTEROFMASS_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void GetCenterOfMass(int residue_numbers, int *start, int *end, float *crd_f, float *atom_mass, float *residue_mass_inverse, float *center_of_mass_f, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/getcenter_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/getcenter_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/getcenter_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/getcenter_impl.cu index 1373076bba..9e93f160a0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/getcenter_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/getcenter_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/getcenter_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/getcenter_impl.cuh" __global__ void GetCenterOfGeometryKernel(const int center_numbers, float center_numbers_inverse, const int *center_atoms, const VECTOR *crd, VECTOR *center_of_geometry) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/getcenter_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/getcenter_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/getcenter_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/getcenter_impl.cuh index 57a9dce898..4b168216dd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/getcenter_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/getcenter_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_COMMON_GETCENTER_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void GetCenterOfGeometry(const int center_numbers, float center_numbers_inverse, const int *center_atoms, const float *crd_f, float *center_of_geometry_f, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/map_center_of_mass_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/map_center_of_mass_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/map_center_of_mass_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/map_center_of_mass_impl.cu index 5d0f9b70e3..01807f2e34 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/map_center_of_mass_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/map_center_of_mass_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/map_center_of_mass_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/map_center_of_mass_impl.cuh" __global__ void Map_Center_Of_Mass(int residue_numbers, int *start, int *end, float *scaler, VECTOR *center_of_mass, VECTOR *box_length, VECTOR *no_wrap_crd, VECTOR *crd) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/map_center_of_mass_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/map_center_of_mass_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/map_center_of_mass_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/map_center_of_mass_impl.cuh index a47f0b1955..fad2d93c90 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/map_center_of_mass_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/map_center_of_mass_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_COMMON_MAPCENTEROFMASS_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void MapCenterOfMass(int residue_numbers, int *start, int *end, float *center_of_mass_f, float *box_length_f, float *no_wrap_crd_f, float *crd_f, float* scaler, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/mdtemperature_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/mdtemperature_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/mdtemperature_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/mdtemperature_impl.cu index 551b88d072..39ee4f6761 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/mdtemperature_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/mdtemperature_impl.cu @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/mdtemperature_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/mdtemperature_impl.cuh" __global__ void MDTemperatureKernel(const int residue_numbers, const int *start, const int *end, const VECTOR *atom_vel, const float *atom_mass, float *ek) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/mdtemperature_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/mdtemperature_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/mdtemperature_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/mdtemperature_impl.cuh index 93eb79d57f..4fd44c8567 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/mdtemperature_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/mdtemperature_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_COMMON_MDTEMPERATURE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void MDTemperature(const int residue_numbers, const int *start, const int *end, const float *atom_vel_f, const float *atom_mass, float *ek, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/total_c6_get_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/total_c6_get_impl.cu similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/total_c6_get_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/total_c6_get_impl.cu index 27f42b02d8..efe5c96689 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/total_c6_get_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/total_c6_get_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/total_c6_get_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/total_c6_get_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Total_C6_Get(int atom_numbers, int *atom_lj_type, float *d_lj_b, float *d_factor) { int i, j; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/total_c6_get_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/total_c6_get_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/total_c6_get_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/total_c6_get_impl.cuh index f2891be436..ed25644816 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common/total_c6_get_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common/total_c6_get_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_COMMON_TOTAL_C6_GET_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_COMMON_TOTAL_C6_GET_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void total_c6_get(int atom_numbers, int *atom_lj_type, float *d_lj_b, float *d_factor, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh index bcedd2183d..270427d31c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh @@ -27,7 +27,7 @@ #include #include #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #define TWO_DIVIDED_BY_SQRT_PI 1.1283791670218446 #define CONSTANT_kB 0.00198716 diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cu similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cu index 1ac9bc9f86..ba87498ab3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cu @@ -15,9 +15,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void Calculate_No_Wrap_Crd(int atom_numbers, INT_VECTOR *box_map_times, VECTOR *box, VECTOR *crd, VECTOR *nowrap_crd) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh index 40f3415606..fce32ed57e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh @@ -19,7 +19,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_CRDMCMAP_CAL_NO_WRAP_CRD_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void calculatenowrapcrd(int atom_numbers, int *box_map_times_f, float *box_f, float *crd_f, float *nowrap_crd_f, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cu index 70d2a6416f..c4adee2a76 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cu @@ -15,8 +15,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Refresh_BoxMapTimes_CUDA(int atom_numbers, VECTOR *box_length_inverse, VECTOR *crd, INT_VECTOR *box_map_times, VECTOR *old_crd) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh index 53f48f6c10..953b0e2013 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh @@ -19,7 +19,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_CRDMCMAP_REFRESH_BOXMAPTIMES_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void refresh_boxmaptimes(int atom_numbers, float *box_length_inverse, float *crd_f, float *old_crd_f, int *box_map_times_f, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cu index b313b3b78a..76d92f18bd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void DihedralAtomEnergyKernel(int dihedral_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, const int *atom_c, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh index 6b9f44e097..e421de8f79 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_DIHEDRAL_DIHEDRAL_ATOM_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void DihedralAtomEnergy(int dihedral_numbers, int atom_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const int *atom_c, const int *atom_d, const int *ipn, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_energy_impl.cu similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_energy_impl.cu index 4bf4127248..c08b888f07 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_energy_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void DihedralEnergyKernel(int dihedral_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, const int *atom_c, const int *atom_d, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh index 86947deca1..fb485172d0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_DIHEDRAL_DIHEDRAL_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void DihedralEnergy(int dihedral_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const int *atom_c, const int *atom_d, const int *ipn, const float *pk, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_impl.cu index 40abe15ade..089679b075 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void DihedralForceKernel(int dihedral_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, const int *atom_c, const int *atom_d, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh index 1e890c0e73..00e08b5844 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_DIHEDRAL_DIHEDRAL_FORCE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void DihedralForce(int dihedral_numbers, int atom_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const int *atom_c, const int *atom_d, const int *ipn, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cu index a82c080945..dc6936a475 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void DihedralForceWithAtomEnergyKernel(int dihedral_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const int *atom_a, const int *atom_b, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh index 2644b366f7..6841567f4c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_DIHEDRAL_DIHEDRAL_FORCE_WITH_ATOM_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void DihedralForceWithAtomEnergy(int dihedral_numbers, int atom_numbers, const int *uint_crd_f, const float *scaler_f, const int *atom_a, const int *atom_b, const int *atom_c, const int *atom_d, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cu index 1099b6e657..4a77a61bb1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cu @@ -18,8 +18,8 @@ * LJForce. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void LJ_Direct_CF_Force_With_LJ_Virial_Direct_CF_Energy_CUDA( const int atom_numbers, const NEIGHBOR_LIST *nl, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh index b60cf9b373..7e85481ec2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh @@ -22,7 +22,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_LJ_DIRECT_CF_FORCE_WITH_LJ_VIRIAL_DIRECT_CF_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void LJ_Direct_CF_Force_With_LJ_Virial_Direct_CF_Energy( const int atom_numbers, const float cutoff, const float pme_beta, const unsigned int *uint_crd_f, const int *LJtype, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_energy_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_energy_impl.cu index 5538410eb5..5b87d36ea7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_energy_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void LJ_Energy_CUDA(const int atom_numbers, const NEIGHBOR_LIST *nl, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, const float *LJ_type_A, const float *LJ_type_B, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_energy_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_energy_impl.cuh index 4c0b6f1805..19290c90ef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_LJ_LJ_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void LJEnergy(const int atom_numbers, const float cutoff_square, const int *uint_crd_f, const int *LJtype, const float *charge, const float *scaler_f, float *uint_crd_with_LJ, int *nl_atom_numbers, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_impl.cu index 1cb040aff6..38cc77f2b3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void LJ_Force_CUDA(const int atom_numbers, const NEIGHBOR_LIST *nl, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, const float *LJ_type_A, const float *LJ_type_B, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_impl.cuh index 401b5d3362..904a4227ee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_LJ_LJ_FORCE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void LJForce(const int atom_numbers, const float cutoff_square, const int *uint_crd_f, const int *LJtype, const float *charge, const float *scaler_f, float *uint_crd_with_LJ, int *nl_atom_numbers, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cu index e1995d596e..237ddea3e9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void LJ_Force_With_Direct_CF_CUDA(const int atom_numbers, const NEIGHBOR_LIST *nl, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh index 826d4223bb..54711ae355 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_LJ_LJ_FORCE_WITH_PME_DIRECT_FORCE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void LJForceWithPMEDirectForce(const int atom_numbers, const float cutoff, const float pme_beta, const int *uint_crd_f, const int *LJtype, const float *charge, const float *scaler_f, float *uint_crd_with_LJ, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cu index a183bb7432..c94d8888e8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void LJ_Direct_CF_Force_With_Atom_Energy_CUDA(const int atom_numbers, const NEIGHBOR_LIST *nl, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cuh index d8456bbd0c..bdda30249c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_pme_direct_force_with_atom_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_LJ_LJ_PME_DIRECT_FORCE_WITH_ATOM_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void LJDirectCFForceWithAtomEnergy(const int atom_numbers, const float cutoff, const float pme_beta, const int *uint_crd_f, const int *LJtype, const float *charge, const float *scaler_f, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cu index 4ac0b9a26d..723967fda0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Dihedral14CFAtomEnergyKernel(const int dihedral_14_numbers, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, const int *a_14, const int *b_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh index 7d11c10793..7ccc500226 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NB14_DIHEDRAL_14_CF_ATOM_ENERGY_IMPL_H #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Dihedral14CFAtomEnergy(const int dihedral_14_numbers, const int atom_numbers, const int *uint_crd_f, const int *LJtype, const float *charge, const float *boxlength_f, const int *a_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cu index 004365a7ce..5192821e40 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Dihedral14CFEnergyKernel(const int dihedral_14_numbers, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, const int *a_14, const int *b_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh index 117b070c28..52a588b53c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NB14_DIHEDRAL_14_CF_ENERGY_IMPL_H #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Dihedral14CFEnergy(const int dihedral_14_numbers, const int atom_numbers, const int *uint_crd_f, const int *LJtype, const float *charge, float *uint_crd_with_LJ_f, const float *boxlength_f, const int *a_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cu index 3beadecdf0..5dc0093c75 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Dihedral14LJAtomEnergyKernel(const int dihedral_14_numbers, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, const int *a_14, const int *b_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh index d27035a67a..7b443c789a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NB14_DIHEDRAL_14_LJ_ATOM_ENERGY_IMPL_H #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Dihedral14LJAtomEnergy(const int dihedral_14_numbers, const int atom_numbers, const int *uint_crd_f, const int *LJtype, const float *charge, const float *boxlength_f, const int *a_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cu index 29cb529704..8d3ba0585e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Dihedral14LJCFForceWithAtomEnergyAndVirialKernel( const int dihedral_14_numbers, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *scaler, const int *a_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh index 26b5b9420e..74153b6739 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NB14_DIHEDRAL_14_LJ_CF_FORCE_WITH_ATOM_ENERGY_IMPL_H #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Dihedral14LJCFForceWithAtomEnergyAndVirial(const int dihedral_14_numbers, const int atom_numbers, const int *uint_crd_f, const int *LJtype, const float *charge, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cu index d9e9bb8def..6b848960e4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Dihedral14LJCFForceWithAtomEnergyKernel(const int dihedral_14_numbers, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh index c565ea23f8..27208029f3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NB14_DIHEDRAL_14_LJ_CF_FORCE_WITH_ATOM_ENERGY_IMPL_H #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Dihedral14LJCFForceWithAtomEnergy(const int dihedral_14_numbers, const int atom_numbers, const int *uint_crd_f, const int *LJtype, const float *charge, float *uint_crd_with_LJ_f, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cu index ef70d4ccfe..5e90f43e59 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Dihedral14LJEnergyKernel(const int dihedral_14_numbers, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, const int *a_14, const int *b_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh index fbf21d27e1..04cc1a2849 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NB14_DIHEDRAL_14_LJ_ENERGY_IMPL_H #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Dihedral14LJEnergy(const int dihedral_14_numbers, const int atom_numbers, const int *uint_crd_f, const int *LJtype, const float *charge, float *uint_crd_with_LJ_f, const float *boxlength_f, const int *a_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cu index 74f7a06758..4e731c62b2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Dihedral14LJForceKernel(const int dihedral_14_numbers, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, const int *a_14, const int *b_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh index 7ea476ee2c..e107310d5b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NB14_DIHEDRAL_14_LJ_FORCE_IMPL_H #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Dihedral14LJForce(const int dihedral_14_numbers, const int atom_numbers, const int *uint_crd_f, const int *LJtype, const float *charge, const float *boxlength_f, const int *a_14, const int *b_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cu index 88dc3656a7..eef6d6209a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Dihedral14LJForceWithDirectCFKernel(const int dihedral_14_numbers, const UINT_VECTOR_LJ_TYPE *uint_crd, const VECTOR *boxlength, const int *a_14, const int *b_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh index 8e4d95b856..c25dd8d06f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NB14_DIHEDRAL_14_LJ_FORCE_WITH_DIRECT_CF_IMPL_H #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Dihedral14LJForceWithDirectCF(const int dihedral_14_numbers, const int atom_numbers, const int *uint_crd_f, const int *LJtype, const float *charge, const float *boxlength_f, const int *a_14, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cu index da4399d040..c32a73a026 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cu @@ -19,7 +19,7 @@ * NeighborListUpdate. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh" #include // common functions diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh index 11a18d0d28..8f4029f036 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh @@ -21,7 +21,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NEIGHBOR_LIST_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NEIGHBOR_LIST_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" struct VECTOR { float x; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cu similarity index 86% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cu index f3aad0e1ae..b129d9dd95 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void MD_Iteration_Gradient_Descent(const int atom_numbers, VECTOR *crd, VECTOR *frc, const float learning_rate) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh index a2d9b7eef8..f1f829014f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_MD_ITERATION_GRADIENT_DESCENT_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void MDIterationGradientDescent(const int atom_numbers, float *crd, float *frc, const float learning_rate, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cu similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cu index df6729627a..8d00fc222e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cu @@ -18,8 +18,8 @@ * MDIterationLeapFrog. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void MD_Iteration_Leap_Frog(const int atom_numbers, VECTOR *vel, VECTOR *crd, VECTOR *frc, VECTOR *acc, const float *inverse_mass, const float dt) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh index 86563c08d6..e87a9ed85b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh @@ -22,7 +22,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_NVTIT_MD_ITERATION_LEAP_FROG_IMPL_H #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void MDIterationLeapFrog(const int atom_numbers, float *vel, float *crd, float *frc, float *acc, const float *inverse_mass, const float dt, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cu index d0b4e6653e..7c8237112b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void MD_Iteration_Leap_Frog_With_LiuJian_kernel(const int atom_numbers, const float half_dt, const float dt, const float exp_gamma, float *inverse_mass, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh index c321d51310..1595d4f845 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_MD_ITERATION_LEAP_FROG_LIUJIAN_GPU_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void MD_Iteration_Leap_Frog_With_LiuJian(const int atom_numbers, const float half_dt, const float dt, const float exp_gamma, int float4_numbers, float *inverse_mass, float *sqrt_mass_inverse, float *vel, float *crd, float *frc, float *acc, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cu index c41e0a34e7..3e029614c4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void MD_Iteration_Leap_Frog_With_LiuJian_With_Max_Velocity( const int atom_numbers, const float half_dt, const float dt, const float exp_gamma, const float *inverse_mass, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh index 4bc6a25685..6e554f6ae8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_MD_ITERATION_LEAP_FROG_LIUJIAN_WITH_MAX_VEL_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void MD_Iteration_Leap_Frog_With_LiuJian_With_Max_Vel(const int atom_numbers, const float half_dt, const float dt, const float exp_gamma, int float4_numbers, float *inverse_mass, float *sqrt_mass_inverse, float *vel, float *crd, float *frc, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cu similarity index 88% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cu index fabb19f755..3eaad366d8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void MD_Iteration_Leap_Frog_With_Max_Velocity(const int atom_numbers, VECTOR *vel, VECTOR *crd, VECTOR *frc, VECTOR *acc, const float *inverse_mass, const float dt, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh index 477647c01e..047610dcae 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_MD_ITERATION_LEAP_FROG_WITH_MAX_VEL_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void MDIterationLeapFrogWithMaxVelocity(const int atom_numbers, float *vel, float *crd, float *frc, float *acc, const float *inverse_mass, const float dt, const float max_velocity, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cu similarity index 83% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cu index 5a2d487ca5..d125492488 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" void MD_Iteration_Setup_Random_State(int float4_numbers, curandStatePhilox4_32_10_t *rand_state, int seed, cudaStream_t stream) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh index 7dc45c061b..3f8185ca55 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_MD_ITERATION_SETUP_RANDOM_STATE_GPU_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void MD_Iteration_Setup_Random_State(int float4_numbers, curandStatePhilox4_32_10_t *rand_state, int seed, cudaStream_t stream); #endif diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/fft_3d_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/fft_3d_impl.cu similarity index 87% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/fft_3d_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/fft_3d_impl.cu index af31107bcf..dba572d2c3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/fft_3d_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/fft_3d_impl.cu @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/fft_3d_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_common.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/fft_3d_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_common.cuh" template void FFT3D(int Nfft, T *input_tensor, Complex *output_tensor, const cufftHandle &FFT_plan_r2c, cudaStream_t stream) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/fft_3d_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/fft_3d_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/fft_3d_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/fft_3d_impl.cuh index 0cf05ae39e..77a27a1b2b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/fft_3d_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/fft_3d_impl.cuh @@ -18,7 +18,7 @@ #include #include "utils/complex.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void FFT3D(int Nfft, T *input_tensor, Complex *output_tensor, const cufftHandle &FFT_plan_r2c, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/ifft_3d_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/ifft_3d_impl.cu similarity index 87% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/ifft_3d_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/ifft_3d_impl.cu index 0ef724f101..b40941323b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/ifft_3d_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/ifft_3d_impl.cu @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/ifft_3d_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_common.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/ifft_3d_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_common.cuh" template void IFFT3D(int Nfft, Complex *input_tensor, T *output_tensor, const cufftHandle &FFT_plan_c2r, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/ifft_3d_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/ifft_3d_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/ifft_3d_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/ifft_3d_impl.cuh index a1de033256..b184bc1c56 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/ifft_3d_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/ifft_3d_impl.cuh @@ -18,7 +18,7 @@ #include #include "utils/complex.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void IFFT3D(int Nfft, Complex *input_tensor, T *output_tensor, const cufftHandle &FFT_plan_c2r, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_common.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_common.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_common.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_common.cuh index fed5307c13..58e17a73bd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_common.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_common.cuh @@ -20,7 +20,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_PME_PME_COMMON_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_PME_PME_COMMON_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __constant__ float PME_Ma[4] = {1.0 / 6.0, -0.5, 0.5, -1.0 / 6.0}; __constant__ float PME_Mb[4] = {0, 0.5, -1, 0.5}; __constant__ float PME_Mc[4] = {0, 0.5, 0, -0.5}; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_impl.cu index 2525425660..73ab1b89d0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_impl.cu @@ -17,9 +17,9 @@ * Note: * PMEEnergy. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_common.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_common.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void PME_Energy_Reciprocal(const int element_number, const cufftComplex *FQ, const float *BC, float *sum) { if (threadIdx.x == 0) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_impl.cuh index 333d4e125b..8ee149cd9d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_PME_PME_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void PMEEnergy(int fftx, int ffty, int fftz, int atom_numbers, float beta, float *PME_BC, int *pme_uxyz, float *pme_frxyz, float *PME_Q, float *pme_fq, int *PME_atom_near, int *pme_kxyz, const int *uint_crd_f, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_update_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_update_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_update_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_update_impl.cu index 93b671d865..4e9b3fa91d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_update_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_update_impl.cu @@ -17,9 +17,9 @@ * Note: * PMEEnergyUpdate. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_update_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_common.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_update_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_common.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void PME_Energy_Reciprocal_update(const int element_number, const cufftComplex *FQ, const float *BC, float *sum) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_update_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_update_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_update_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_update_impl.cuh index ae258bd52e..d565ae57a6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_update_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_update_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_PME_PME_ENERGY_UPDATE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void PMEEnergyUpdate(int fftx, int ffty, int fftz, int atom_numbers, float beta, float *PME_BC, int *pme_uxyz, float *pme_frxyz, float *PME_Q, float *pme_fq, int *PME_atom_near, int *pme_kxyz, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_excluded_force_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_excluded_force_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_excluded_force_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_excluded_force_impl.cu index 413d1f1998..02885a6777 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_excluded_force_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_excluded_force_impl.cu @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_common.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_common.cuh" __global__ void PME_Excluded_Force_Correction(const int atom_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *sacler, const float *charge, const float pme_beta, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh index b14888962a..12cec6454f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_PME_PME_EXCLUDED_FORCE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void PMEExcludedForce(const int atom_numbers, const float pme_beta, const int *uint_crd_f, const float *sacler_f, const float *charge, const int *excluded_list_start, const int *excluded_list, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cu index 9362f20084..c8971f2fff 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cu @@ -17,8 +17,8 @@ * Note: * PMEReciprocalForce. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_common.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_common.cuh" __global__ void PME_Final(int *PME_atom_near, const float *charge, const float *PME_Q, VECTOR *force, const VECTOR *PME_frxyz, const UNSIGNED_INT_VECTOR *PME_kxyz, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh index 8240f6d5b3..5393743e61 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_PME_PME_RECIPROCAL_FORCE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" struct _VECTOR { float x; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_energy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_energy_impl.cu similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_energy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_energy_impl.cu index 7e76d10acd..b3c65e9bf9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_energy_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_energy_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_energy_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void restrain_energy_kernel(const int restrain_numbers, const int *restrain_list, const VECTOR *crd, const VECTOR *crd_ref, const float weight, const VECTOR boxlength, float *ene) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_energy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_energy_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_energy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_energy_impl.cuh index 2f59aedf59..f7dbfeabb1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_energy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_energy_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_RESTRAIN_RESTRAIN_ENERGY_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void restrainenergy(int restrain_numbers, int atom_numbers, float weight, const int *restrain_list, const float *crd_f, const float *crd_ref, const float *boxlength_f, float *ene, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cu index 96043f41eb..2e7766babc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void restrain_force_with_atom_energy_and_virial(int restrain_numbers, const int *restrain_list, const VECTOR *crd, const VECTOR *crd_ref, const float weight, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh index 34dc01680d..3e175457b5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_RESTRAIN_RESTRAIN_FORCE_ATOM_ENERGY_VIRIAL_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void restrainforcewithatomenergyandvirial(int restrain_numbers, int atom_numbers, const int *restrain_list, const float *crd_f, const float *crd_ref_f, const float weight, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_impl.cu similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_impl.cu index 985694880c..779484179d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_impl.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" __global__ void restrainforcekernel(int restrain_numbers, const int *restrain_list, const UNSIGNED_INT_VECTOR *uint_crd, const UNSIGNED_INT_VECTOR *uint_crd_ref, const float factor, const VECTOR *scaler, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_impl.cuh index 6643d50088..bfc67e8da6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_RESTRAIN_RESTAIN_FORCE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void restrainforce(int restrain_numbers, int atom_numbers, const int *restrain_list, const int *uint_crd_f, const int *uint_crd_ref, const float factor, const float *scaler_f, float *frc_f, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cu index bc2a94f1a3..49445cfe81 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cu @@ -18,8 +18,8 @@ * Constrain_Force_Cycle. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh" __global__ void Constrain_Force_Cycle_Kernel(const int constrain_pair_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, const CONSTRAIN_PAIR *constrain_pair, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh index 5d6ea00bcf..41ffceaff3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh @@ -22,7 +22,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_CYCLE_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Constrain_Force_Cycle(int atom_numbers, int constrain_pair_numbers, const unsigned int *uint_crd_f, const float *scaler_f, float *constrain_pair_f, const float *pair_dr_f, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cu index 9420f6d81b..4530efed91 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cu @@ -18,8 +18,8 @@ * ConstrainForceCycleVirial. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh" __global__ void Constrain_Force_Cycle_With_Virial(int constrain_pair_numbers, const UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *scaler, CONSTRAIN_PAIR *constrain_pair, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh index f9b5624da3..fc96cde5cd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh @@ -22,7 +22,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_CYCLE_WITH_VIRIAL_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void Constrain_Force_Cycle_With_Virial(int atom_numbers, int constrain_pair_numbers, const unsigned int *uint_crd_f, const float *scaler_f, float *constrain_pair_f, const float *pair_dr_f, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cu index 97f7216f37..904270580c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cu @@ -18,8 +18,8 @@ * ConstrainForceCycleVirial. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh" __global__ void constrain_force_cycle_with_virial_update_kernel(int constrain_pair_numbers, const UNSIGNED_INT_VECTOR *uint_crd, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh index f04a2dbff2..e365d0ce76 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh @@ -22,7 +22,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_VIRIAL_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void constrain_force_cycle_update(int atom_numbers, int constrain_pair_numbers, const unsigned int *uint_crd_f, const float *scaler_f, float *constrain_pair_f, const float *pair_dr_f, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cu index 3eb50f59dc..56081c1b87 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Last_Crd_To_dr(const int constarin_pair_numbers, const VECTOR *atom_crd, const VECTOR *quarter_crd_to_uint_crd_cof, const VECTOR *uint_dr_to_dr, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh index c14a0ddc10..6152cab202 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_SIMPLE_CONSTRAIN_LAST_CRD_TO_DR_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void lastcrdtodr(int constrain_pair_numbers, const float *atom_crd_f, const float *quarter_crd_to_uint_crd_cof_f, const float *uint_dr_to_dr_f, float *constrain_pair_f, const int *atom_i_serials, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cu similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cu index 96cae63c59..996381d83b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Refresh_Crd_Vel(int atom_numbers, float dt_inverse, float dt, float exp_gamma, float half_exp_gamma_plus_half, VECTOR *test_frc, float *mass_inverse, VECTOR *crd, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh index e634e71384..f5de7eb46b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_SIMPLE_CONSTRAIN_REFRESH_CRD_VEL_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void refreshcrdvel(int atom_numbers, float dt_inverse, float dt, float exp_gamma, float half_exp_gamma_plus_half, float *test_frc_f, float *mass_inverse, float *crd_f, float *vel_f, cudaStream_t stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cu similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cu index 295d61efd1..43aaf3142a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common_sponge.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common_sponge.cuh" __global__ void Refresh_Uint_Crd(int atom_numbers, const VECTOR *crd, const VECTOR *quarter_crd_to_uint_crd_cof, UNSIGNED_INT_VECTOR *uint_crd, const VECTOR *test_frc, const float *mass_inverse, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh index c45458bfd4..b74aa1edce 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_SPONGE_SIMPLE_CONSTRAIN_REFRESH_UINT_CRD_IMPL_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" void refreshuintcrd(int atom_numbers, float half_exp_gamma_plus_half, const float *crd_f, const float *quarter_crd_to_uint_crd_cof_f, const float *test_frc_f, const float *mass_inverse, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/square_sum_all_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/square_sum_all_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/square_sum_all_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/square_sum_all_impl.cu index 76cdc7204c..7feb03a78b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/square_sum_all_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/square_sum_all_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/square_sum_all_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/square_sum_all_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" template __global__ void SquareSumAllKernel(const size_t size, const T* input_addr_0, const T* input_addr_1, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/square_sum_all_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/square_sum_all_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/square_sum_all_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/square_sum_all_impl.cuh index f950385888..2ae09fc58d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/square_sum_all_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/square_sum_all_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_SQUARE_SUM_ALL_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMP_SQUARE_SUM_ALL_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void SquareSumAll(const size_t input_size_, const T* input_addr_0, const T* input_addr_1, T* output_addr_0, T* output_addr_1, float* ws_addr_0, float* ws_addr_1, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_grad_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_grad_impl.cu index d51f11357b..e9ae27d86d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_grad_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_grad_impl.cu @@ -15,9 +15,9 @@ */ #include -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_grad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_grad_impl.cuh" const int kWarpSize = 32; const int kNumWarps = 32; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_grad_impl.cuh similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_grad_impl.cuh index 78eaa2c1b5..9378cde858 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_grad_impl.cuh @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SYNC_BATCH_NORM_GRAD_IMPL_CUH #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SYNC_BATCH_NORM_GRAD_IMPL_CUH -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalSyncBatchNormGradPre(size_t N, size_t C, size_t H, size_t W, const T *x_input, const T *dy, G *saved_mean, G *invstd_saved, float *dy_sum_local, float *dot_p_local, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_impl.cu index cd15c37105..e4126b8bf8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_impl.cu @@ -15,9 +15,9 @@ */ #include -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_impl.cuh" const int kWarpSize = 32; const int kNumWarps = 32; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_impl.cuh similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_impl.cuh index 708eb8f2f9..4a12e2b3b9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_impl.cuh @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SYNC_BATCH_NORM_IMPL_CUH #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_SYNC_BATCH_NORM_IMPL_CUH -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalSyncBatchNormPre(size_t N, size_t C, size_t H, size_t W, const T *input, int *output_n, float *means_local, float *invstds_local, float epsilon, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_add.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_add.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_add.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_add.cu index 6467e5eca6..7e8154a051 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_add.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_add.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_add.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_add.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void TensorScatterAddKernel(T *input, S *indices, T *update, T *output, const size_t block_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_add.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_add.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_add.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_add.cuh index b51a153090..f92f4e2ad9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_add.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_add.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_ADD_IMPL_CUH #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_ADD_IMPL_CUH -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void TensorScatterAdd(T *input, S *indices, T *update, T *output, const size_t &block_size, const size_t &input_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_max.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_max.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_max.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_max.cu index 61b8f87ccc..0f47a19dd4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_max.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_max.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_max.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_max.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void TensorScatterMaxKernel(T *input, S *indices, T *update, T *output, const size_t block_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_max.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_max.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_max.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_max.cuh index 725574f564..b09b4165a1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_max.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_max.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_MAX_IMPL_CUH #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_MAX_IMPL_CUH -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void TensorScatterMax(T *input, S *indices, T *update, T *output, const size_t &block_size, const size_t &input_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_min.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_min.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_min.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_min.cu index b9949fcad6..f11791c970 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_min.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_min.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_min.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_min.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void TensorScatterMinKernel(T *input, S *indices, T *update, T *output, const size_t block_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_min.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_min.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_min.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_min.cuh index 51b313381d..c1453c9a8b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_min.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_min.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_MIN_IMPL_CUH #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_MIN_IMPL_CUH -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void TensorScatterMin(T *input, S *indices, T *update, T *output, const size_t &block_size, const size_t &input_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_sub.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_sub.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_sub.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_sub.cu index cf95c9736d..5230b844b5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_sub.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_sub.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_sub.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_sub.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void TensorScatterSubKernel(T *input, S *indices, T *update, T *output, const size_t block_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_sub.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_sub.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_sub.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_sub.cuh index e6c966c7ff..6b691c4b19 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_sub.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_sub.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_SUB_IMPL_CUH #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_SUB_IMPL_CUH -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void TensorScatterSub(T *input, S *indices, T *update, T *output, const size_t &block_size, const size_t &input_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_update.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_update.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_update.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_update.cu index f2642c4655..db9ba14121 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_update.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_update.cu @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_update.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/tensor_scatter_update.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" template __global__ void TensorScatterUpdateKernel(T *input, S *indices, T *update, T *output, const size_t block_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_update.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_update.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_update.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_update.cuh index 78f29c3e1e..c5e59b9fee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tensor_scatter_update.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tensor_scatter_update.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_UPDATE_IMPL_CUH #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TENSOR_SCATTER_UPDATE_IMPL_CUH -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void TensorScatterUpdate(T *input, S *indices, T *update, T *output, const size_t &block_size, const size_t &input_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tile_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tile_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tile_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tile_impl.cu index 5f9b4f363a..233259155c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tile_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tile_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/tile_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/tile_impl.cuh" template __global__ void Tile(const size_t output_size, const size_t input_size, const size_t shape_size, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tile_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tile_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tile_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tile_impl.cuh index 6a0daecb9f..97e43f5dcd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/tile_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/tile_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TILE_IMPL_CUH_ #define TILE_MAX_DIMENSION 100 -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalTile(const size_t output_size, const size_t input_size, const size_t shape_size, const size_t *input_shape, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/topk_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/topk_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/topk_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/topk_impl.cu index 2bd92288cc..6e21b3918f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/topk_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/topk_impl.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/topk_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/topk_lib.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/topk_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/topk_lib.cuh" #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/topk_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/topk_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/topk_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/topk_impl.cuh index 46210a0337..a1ca24d09c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/topk_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/topk_impl.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_TOPK_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void FastTopK(const int outer, const int inner, const T *input_addr, S k_cut, T *output, S *indices, const T initK, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/topk_lib.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/topk_lib.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/topk_lib.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/topk_lib.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl.cu index 2486e9e285..9dbe165672 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl.cu @@ -17,7 +17,7 @@ #include #include "transpose_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "utils/complex.h" template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl_opt.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl_opt.cu similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl_opt.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl_opt.cu index 7ce046341b..fd0b1b6203 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl_opt.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl_opt.cu @@ -21,7 +21,7 @@ #include #include #include "transpose_impl_opt.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" // Optimize nchw2nhwc && nhwc2nchw with tiling and shared memory. // Firstly, combined 2 dims hw together, treat input and output as 3D tensor. diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl_opt.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl_opt.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/transpose_impl_opt.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/transpose_impl_opt.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/triangle_matrix_copy_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/triangle_matrix_copy_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/triangle_matrix_copy_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/triangle_matrix_copy_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/triangle_matrix_copy_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/triangle_matrix_copy_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/triangle_matrix_copy_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/triangle_matrix_copy_impl.cuh index 375a278fa2..bdf1478893 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/triangle_matrix_copy_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/triangle_matrix_copy_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_TRIANGLEMATRIXCOPYIMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_TRIANGLEMATRIXCOPYIMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void TriangleMatrixCopy(const T *input, T *output, bool clean, cublasFillMode_t uplo, const size_t count, const size_t ldb, const size_t m, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_grad_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unary_op_grad_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_grad_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unary_op_grad_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_grad_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unary_op_grad_impl.cuh similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_grad_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unary_op_grad_impl.cuh index 63cd9d4673..36c5c7fbe4 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_grad_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unary_op_grad_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNARYOP_GRAD_IMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNARYOP_GRAD_IMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void SqrtGrad(const T *input, const T *dout, T *output, const size_t count, cudaStream_t cuda_stream); template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unary_op_impl.cu similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unary_op_impl.cu diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unary_op_impl.cuh similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unary_op_impl.cuh index a50e3ef126..346f7bcdf5 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unary_op_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/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 "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "utils/complex.h" template void Exponential(const T *input, T *output, const size_t count, cudaStream_t cuda_stream); diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/uniform_candidate_sampler_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/uniform_candidate_sampler_impl.cu similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/uniform_candidate_sampler_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/uniform_candidate_sampler_impl.cu index d1f2c0825f..d020a4fc9f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/uniform_candidate_sampler_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/uniform_candidate_sampler_impl.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/uniform_candidate_sampler_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/uniform_candidate_sampler_impl.cuh" template __global__ void AssignToOutput(const int64_t size, const S prob_val, S *output_array) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/uniform_candidate_sampler_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/uniform_candidate_sampler_impl.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/uniform_candidate_sampler_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/uniform_candidate_sampler_impl.cuh index 14bc7bd458..0432e0ac38 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/uniform_candidate_sampler_impl.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/uniform_candidate_sampler_impl.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_UNIFORM_CANDIDATE_SAMPLER_IMPL_CUH_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CUDA_IMPL_UNIFORM_CANDIDATE_SAMPLER_IMPL_CUH_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void CalUniformCandidateSampler(const int64_t true_size, const int64_t num_sampled, const S prob_val, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unique_impl.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unique_impl.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unique_impl.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unique_impl.cu index e7a151e8f3..1ecffbc9b0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unique_impl.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unique_impl.cu @@ -23,7 +23,7 @@ #include #include #include "unique_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #include "include/cuda_fp16.h" template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unique_impl.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unique_impl.cuh similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unique_impl.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unique_impl.cuh diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unpack.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unpack.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unpack.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unpack.cu index a58413298a..8af5986182 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unpack.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unpack.cu @@ -17,7 +17,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/unpack.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/unpack.cuh" template __global__ void Unpack(const size_t size, const size_t output_num, const size_t dims_after_axis, T** outputs, const T* input) { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unpack.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unpack.cuh similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unpack.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unpack.cuh index e6b43f8610..c4ea6e2102 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unpack.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unpack.cuh @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNPACKIMPL_H_ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNPACKIMPL_H_ -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" template void UnpackKernel(const size_t size, const size_t output_num, const size_t dims_after_axis, T** outputs, const T* input, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_max.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_max.cu similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_max.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_max.cu index 53403e4b5f..e3af209b66 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_max.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_max.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_max.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/unsorted_segment_max.cuh" #include template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_max.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_max.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_max.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_max.cuh index 859f1f5181..4f31f2e382 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_max.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_max.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNSORTED_SEGMENT_MAX_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" // Setting warp size to sync data across threads #define KWARPSIZE 32 diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_min.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_min.cu similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_min.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_min.cu index fe8958cb18..ec3141e039 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_min.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_min.cu @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_min.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/unsorted_segment_min.cuh" #include template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_min.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_min.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_min.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_min.cuh index 45d5de6dff..4d8603a6f8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_min.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_min.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNSORTED_SEGMENT_MIN_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" // Setting warp size to sync data across threads #define KWARPSIZE 32 diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cu b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_sum.cu similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cu rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_sum.cu index e22db67da7..0f37245f60 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cu +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_sum.cu @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/util.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/unsorted_segment_sum.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/util.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/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_sum.cuh similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_sum.cuh index 315677fde4..65a9267ea7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/unsorted_segment_sum.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/unsorted_segment_sum.cuh @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_CUDA_IMPL_UNSORT_SEGMENT_SUM_H_ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/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/backend/kernel_compiler/gpu/cuda_impl/util.cuh b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/util.cuh similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/util.cuh rename to mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/util.cuh index 6a76fd4a98..b5aec5a361 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/cuda_impl/util.cuh +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/cuda_impl/util.cuh @@ -21,7 +21,7 @@ #include -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" #define kThreadsPerBlock (256) #define kBlocksPerGrid(n) ((n + kThreadsPerBlock - 1) / kThreadsPerBlock) diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/custom/custom_aot_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/custom/custom_aot_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/custom/custom_aot_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/custom/custom_aot_gpu_kernel.h index 0922757e32..9a7038a043 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/custom/custom_aot_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/custom/custom_aot_gpu_kernel.h @@ -22,9 +22,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "kernel/common_utils.h" #include "utils/file_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_init_kernel.cc similarity index 89% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_init_kernel.cc index 617d581689..115b8bdba0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_init_kernel.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/data/dataset_init_kernel.h" -#include "backend/kernel_compiler/gpu/data/dataset_utils.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_buffer_mgr.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" +#include "plugin/device/gpu/kernel/data/dataset_init_kernel.h" +#include "plugin/device/gpu/kernel/data/dataset_utils.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_buffer_mgr.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_init_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_init_kernel.h index 4de85c9e13..08f2a14514 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_init_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_init_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_iterator_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_iterator_kernel.cc index 2c779f7dd5..86a55fce66 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_iterator_kernel.cc @@ -13,21 +13,21 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/data/dataset_iterator_kernel.h" +#include "plugin/device/gpu/kernel/data/dataset_iterator_kernel.h" #include #include #include #include #include #include "utils/convert_utils.h" -#include "backend/kernel_compiler/gpu/data/dataset_utils.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/data/dataset_utils.h" +#include "kernel/common_utils.h" #ifndef ENABLE_SECURITY #include "profiler/device/gpu/gpu_profiling.h" #endif -#include "runtime/device/gpu/gpu_buffer_mgr.h" -#include "runtime/device/gpu/gpu_common.h" +#include "plugin/device/gpu/hal/device/gpu_buffer_mgr.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" #ifdef ENABLE_DUMP_IR #include "debug/rdr/running_data_recorder.h" #endif diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_iterator_kernel.h similarity index 89% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_iterator_kernel.h index ee6c26a870..e8fc8626f5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_iterator_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_iterator_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/data/dataset_profiling.h" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/blocking_queue.h" +#include "plugin/device/gpu/kernel/data/dataset_profiling.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/blocking_queue.h" namespace mindspore { namespace kernel { using mindspore::device::DataItemGpu; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_profiling.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_profiling.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_profiling.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_profiling.cc index 98bbd2cead..a06cfc6d29 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_profiling.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_profiling.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/data/dataset_profiling.h" +#include "plugin/device/gpu/kernel/data/dataset_profiling.h" #include #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_profiling.h b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_profiling.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_profiling.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_profiling.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_utils.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_utils.cc index 58422153b3..0aa6143994 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_utils.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/data/dataset_utils.h" +#include "plugin/device/gpu/kernel/data/dataset_utils.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.h b/mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_utils.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/data/dataset_utils.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/data/dataset_utils.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/debug/print_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/debug/print_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/debug/print_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/debug/print_gpu_kernel.cc index 7331baa57b..6f83ea72f0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/debug/print_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/debug/print_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/debug/print_gpu_kernel.h" +#include "plugin/device/gpu/kernel/debug/print_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/debug/print_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/debug/print_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/debug/print_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/debug/print_gpu_kernel.h index 9180429587..eed5fac02c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/debug/print_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/debug/print_gpu_kernel.h @@ -25,9 +25,9 @@ #include #include #include "ir/tensor.h" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "kernel/common_utils.h" using mindspore::tensor::Tensor; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_create.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_create.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_create.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_create.cc index df77db169b..bd3d58af9d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_create.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_create.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/environ/environ_gpu_create.h" -#include "backend/kernel_compiler/environ_manager.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/environ/environ_gpu_create.h" +#include "kernel/environ_manager.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_create.h b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_create.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_create.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_create.h index 2fa487f455..6a5dad0959 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_create.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_create.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_destroy_all.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_destroy_all.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_destroy_all.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_destroy_all.cc index b953e907c9..6af31a5347 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_destroy_all.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_destroy_all.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/environ/environ_gpu_destroy_all.h" -#include "backend/kernel_compiler/environ_manager.h" +#include "plugin/device/gpu/kernel/environ/environ_gpu_destroy_all.h" +#include "kernel/environ_manager.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_destroy_all.h b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_destroy_all.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_destroy_all.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_destroy_all.h index 2a6e712a17..bf163b4b92 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_destroy_all.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_destroy_all.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_get.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_get.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_get.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_get.cc index 67105b9821..7e1db75b85 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_get.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_get.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/environ/environ_gpu_get.h" -#include "backend/kernel_compiler/environ_manager.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/environ/environ_gpu_get.h" +#include "kernel/environ_manager.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_get.h b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_get.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_get.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_get.h index 1ee5bba877..359aa3638f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_get.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_get.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_set.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_set.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_set.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_set.cc index 73257e8209..5a5770bef6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_set.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_set.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/environ/environ_gpu_set.h" -#include "backend/kernel_compiler/environ_manager.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" +#include "plugin/device/gpu/kernel/environ/environ_gpu_set.h" +#include "kernel/environ_manager.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_set.h b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_set.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_set.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_set.h index b5a83c7770..fcad1b3450 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/environ/environ_gpu_set.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/environ/environ_gpu_set.h @@ -19,8 +19,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel.cc index bba6606fc4..45b909656d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel.h index 4921e863c7..a597b8becd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel.h @@ -28,12 +28,12 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_mod.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" +#include "kernel/kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_mod.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/hal/device/gpu_device_manager.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/executor/dynamic_kernel.h" using AnfAlgo = mindspore::session::AnfRuntimeAlgorithm; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel_factory.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel_factory.cc index 8774192c94..d4c22f699e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel_factory.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" #include "utils/ms_utils.h" #include "runtime/device/kernel_info.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.h b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel_factory.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel_factory.h index 8016950cd0..5178c31da3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel_factory.h @@ -22,9 +22,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "runtime/device/gpu/kernel_info_setter.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" +#include "kernel/kernel_build_info.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_mod.h b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel_mod.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_mod.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel_mod.h index 64b93157cb..661875c334 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_mod.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/gpu_kernel_mod.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_GPU_KERNEL_MOD_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_GPU_KERNEL_MOD_H_ -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/kernel_constants.h b/mindspore/ccsrc/plugin/device/gpu/kernel/kernel_constants.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/kernel_constants.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/kernel_constants.h diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/addn_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/addn_gpu_kernel.cc index 0acc5f3dce..f8356aaa32 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/addn_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/addn_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/addn_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/addn_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/addn_gpu_kernel.h index a91d2001ed..97b13b8b37 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/addn_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/addn_gpu_kernel.h @@ -19,11 +19,11 @@ #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/math/broadcast_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/assign_add_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/assign_add_gpu_kernel.cc index 0242b5e652..4abf3c1fe8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/assign_add_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/assign_add_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/assign_add_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/assign_add_gpu_kernel.h index 8e94b7afd7..3fa7f97df3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/assign_add_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/assign_add_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/assign_add_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_complex_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_complex_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_complex_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_complex_gpu_kernel.cc index 12b23f5757..1b6f1d2ee0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_complex_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_complex_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/broadcast_complex_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/broadcast_complex_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_complex_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_complex_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_complex_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_complex_gpu_kernel.h index 0887f40b56..a74873cd92 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_complex_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_complex_gpu_kernel.h @@ -22,11 +22,11 @@ #include #include #include -#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" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_gpu_kernel.cc index 430c0e820e..68bbc9c679 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/broadcast_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_gpu_kernel.h index fdd15598a0..4ec4d963aa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_gpu_kernel.h @@ -21,11 +21,11 @@ #include #include #include -#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" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_grad_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_grad_gpu_kernel.cc index 9b143d1921..b98d028a83 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/broadcast_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_grad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_grad_gpu_kernel.h index 4e4f2cb20e..0db01af46b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/broadcast_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/broadcast_grad_gpu_kernel.h @@ -21,11 +21,11 @@ #include #include #include -#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" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_grad_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cast_all_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cast_all_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cast_all_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cast_all_gpu_kernel.cc index 6530202091..90cf992b82 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cast_all_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cast_all_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/cast_all_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/cast_all_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cast_all_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cast_all_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cast_all_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cast_all_gpu_kernel.h index 4b2e6869c8..76ae9eec4e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cast_all_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cast_all_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/cast_all_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/cast_all_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_gpu_kernel.cc index 8cafbc40b7..2280aede61 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/cholesky_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/cholesky_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(Cholesky, KernelAttr().AddInputAttr(kNumberTypeFloat32).AddOutputAttr(kNumberTypeFloat32), diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_gpu_kernel.h index db83dc1dd4..09ce07ecc1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_gpu_kernel.h @@ -21,12 +21,12 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/eye_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/matrix_split_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/triangle_matrix_copy_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 "plugin/device/gpu/kernel/cuda_impl/eye_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/matrix_split_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/triangle_matrix_copy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_solve_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_solve_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_solve_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_solve_gpu_kernel.cc index 298da00c3e..7630abdbf1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_solve_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_solve_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/cholesky_solve_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/cholesky_solve_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE( diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_solve_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_solve_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_solve_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_solve_gpu_kernel.h index acd66d1f59..da5be233b0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_solve_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_solve_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/triangle_matrix_copy_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 "plugin/device/gpu/kernel/cuda_impl/triangle_matrix_copy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_trsm_solve_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_trsm_solve_gpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_trsm_solve_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_trsm_solve_gpu_kernel.cc index 19eff7d215..f9daaf82fb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_trsm_solve_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_trsm_solve_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/cholesky_trsm_solve_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/cholesky_trsm_solve_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(CholeskyTrsm, KernelAttr().AddInputAttr(kNumberTypeFloat32).AddOutputAttr(kNumberTypeFloat32), diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_trsm_solve_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_trsm_solve_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_trsm_solve_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_trsm_solve_gpu_kernel.h index fbeae8afcf..00a2975f14 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cholesky_trsm_solve_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cholesky_trsm_solve_gpu_kernel.h @@ -21,11 +21,11 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/eye_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/matrix_split_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 "plugin/device/gpu/kernel/cuda_impl/eye_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/matrix_split_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumprod_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cumprod_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumprod_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cumprod_gpu_kernel.cc index fbedd8b93d..208ef0218d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumprod_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cumprod_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/cumprod_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/cumprod_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumprod_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cumprod_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumprod_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cumprod_gpu_kernel.h index cc1849b7d5..5eb4671703 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumprod_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cumprod_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MATH_CUMPROD_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/cumprod_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/cumprod_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumsum_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cumsum_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumsum_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cumsum_gpu_kernel.cc index 84b77f9fc4..3762a51831 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumsum_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cumsum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/cumsum_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/cumsum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumsum_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cumsum_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumsum_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/cumsum_gpu_kernel.h index 17b0c999fa..8e0bcb5273 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/cumsum_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/cumsum_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MATH_CUMSUM_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/cumsum_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/cumsum_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/determinant_triangle_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/determinant_triangle_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/determinant_triangle_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/determinant_triangle_gpu_kernel.cc index 9f971ed4ce..d0de30146f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/determinant_triangle_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/determinant_triangle_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/determinant_triangle_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/determinant_triangle_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/determinant_triangle_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/determinant_triangle_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/determinant_triangle_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/determinant_triangle_gpu_kernel.h index e6cb1d6400..2d94bc3118 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/determinant_triangle_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/determinant_triangle_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/determinant_triangle_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/determinant_triangle_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_c_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_c_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_c_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_c_gpu_kernel.cc index 24ffc0a804..8e3a604993 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_c_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_c_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/eigh_c_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/eigh_c_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_c_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_c_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_c_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_c_gpu_kernel.h index 6ad8a99e7e..cb5c9d661a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_c_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_c_gpu_kernel.h @@ -25,15 +25,15 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/triangle_matrix_copy_impl.cuh" -#include "runtime/device/gpu/cuda_common.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 "plugin/device/gpu/kernel/cuda_impl/triangle_matrix_copy_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/convert_utils.h" #include "utils/complex.h" -#include "backend/kernel_compiler/gpu/cuda_impl/real_to_complex_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/real_to_complex_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_gpu_kernel.cc index eb857267db..d390fc0cb0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/eigh_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/eigh_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_gpu_kernel.h index 4c9238dab3..98075069f2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/eigh_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/eigh_gpu_kernel.h @@ -24,13 +24,13 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/triangle_matrix_copy_impl.cuh" -#include "runtime/device/gpu/cuda_common.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 "plugin/device/gpu/kernel/cuda_impl/triangle_matrix_copy_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/convert_utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_gpu_kernel.cc index e17a0d3b4c..865e03b418 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/einsum_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/einsum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_gpu_kernel.h index 7d726712bb..3c328d6192 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_gpu_kernel.h @@ -23,9 +23,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/math/einsum_helper.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/math/einsum_helper.h" namespace mindspore { namespace kernel { constexpr int IDX_NAME = 0; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_grad_gpu_kernel.cc index 830ee49ece..69f76cea66 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/einsum_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/einsum_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_grad_gpu_kernel.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_grad_gpu_kernel.h index 783a8776b4..31b674642a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_grad_gpu_kernel.h @@ -23,9 +23,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/math/einsum_helper.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/math/einsum_helper.h" namespace mindspore { namespace kernel { constexpr int INPUT_NUM_MIN = 2; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_helper.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_helper.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_helper.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_helper.h index d78664f76d..1c9aa4ab6b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/einsum_helper.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/einsum_helper.h @@ -26,12 +26,12 @@ #include #include #include -#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" -#include "backend/kernel_compiler/gpu/cuda_impl/einsum_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/tile_impl.cuh" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/einsum_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/tile_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/equalcount_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/equalcount_gpu_kernel.cc index d9fc76b1c9..3cc4e1470f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/equalcount_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/equalcount_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/equalcount_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/equalcount_gpu_kernel.h index 94956e558e..5029e91941 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/equalcount_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/equalcount_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MATH_EQUALCOUNT_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/equalcount_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/float_status_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/float_status_gpu_kernel.cc index f994732992..8b9c8089f8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/float_status_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/float_status_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/float_status_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/float_status_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/float_status_gpu_kernel.h index f1750e5d82..758b314882 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/float_status_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/float_status_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#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" -#include "backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/float_status_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/identity_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/identity_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/identity_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/identity_gpu_kernel.cc index a2f313148a..ba7f52f9cb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/identity_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/identity_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/identity_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/identity_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/identity_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/identity_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/identity_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/identity_gpu_kernel.h index 15930896a4..91cca5c87f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/identity_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/identity_gpu_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/index_add_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/index_add_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/index_add_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/index_add_gpu_kernel.cc index 23d0a913ea..cbc525b35a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/index_add_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/index_add_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/index_add_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/index_add_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/index_add_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/index_add_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/index_add_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/index_add_gpu_kernel.h index 5a6933a6c9..22ce1d636f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/index_add_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/index_add_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MATH_INDEX_ADD_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/index_add_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/index_add_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/linspace.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/linspace.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/linspace.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/linspace.cc index e5a730c2a4..a61d1b0aa2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/linspace.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/linspace.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/linspace.h" +#include "plugin/device/gpu/kernel/math/linspace.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/linspace.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/linspace.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/linspace.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/linspace.h index 37d7cf9758..de37b2896c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/linspace.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/linspace.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/linspace.cuh" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/linspace.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/logical_not_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/logical_not_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/logical_not_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/logical_not_gpu_kernel.cc index 505c3520a3..9bb9a059c6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/logical_not_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/logical_not_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/logical_not_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/logical_not_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(LogicalNot, KernelAttr().AddInputAttr(kNumberTypeBool).AddOutputAttr(kNumberTypeBool), diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/logical_not_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/logical_not_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/logical_not_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/logical_not_gpu_kernel.h index 92478b3d85..915f3e178b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/logical_not_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/logical_not_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/logical_not_impl.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/logical_not_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_gpu_kernel.cc index b8d026fe1f..c7c97e9f97 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/lu_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/lu_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(LU, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_gpu_kernel.h index d1853bf2de..75139d839b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_gpu_kernel.h @@ -22,11 +22,11 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/convert_utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_solve_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_solve_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_solve_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_solve_gpu_kernel.cc index 999be45e21..e6de84fade 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_solve_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_solve_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/lu_solve_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/lu_solve_gpu_kernel.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE( diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_solve_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_solve_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_solve_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_solve_gpu_kernel.h index b2e70ed50d..e8a5b0e338 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/lu_solve_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/lu_solve_gpu_kernel.h @@ -22,11 +22,11 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/convert_utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matmul_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/matmul_gpu_kernel.cc index 53f7f2a695..e37160aa39 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matmul_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/matmul_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/matmul_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matmul_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/matmul_gpu_kernel.h index 909d168510..5b78d5a0c0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matmul_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matmul_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#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/fill_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/fill_impl.cuh" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_band_part_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_band_part_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_band_part_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_band_part_gpu_kernel.cc index d512afefc6..dabc1721ab 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_band_part_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_band_part_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/matrix_band_part_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/matrix_band_part_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_band_part_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_band_part_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_band_part_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_band_part_gpu_kernel.h index adb4e977dc..6c68364b3b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_band_part_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_band_part_gpu_kernel.h @@ -24,11 +24,11 @@ #include #include #include "utils/complex.h" -#include "backend/kernel_compiler/gpu/cuda_impl/matrix_band_part_impl.cuh" -#include "runtime/device/gpu/cuda_common.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 "plugin/device/gpu/kernel/cuda_impl/matrix_band_part_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_diag_part_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_diag_part_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_diag_part_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_diag_part_gpu_kernel.cc index 6ab458d9fe..fc7b2a378b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_diag_part_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_diag_part_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/matrix_diag_part_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/matrix_diag_part_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_diag_part_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_diag_part_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_diag_part_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_diag_part_gpu_kernel.h index f6bc95b269..d43fa46294 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_diag_part_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_diag_part_gpu_kernel.h @@ -26,12 +26,12 @@ #include #include #include "utils/complex.h" -#include "backend/kernel_compiler/gpu/cuda_impl/matrix_diag_part_impl.cuh" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/common_utils.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 "plugin/device/gpu/kernel/cuda_impl/matrix_diag_part_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_inverse_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_inverse_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_inverse_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_inverse_gpu_kernel.cc index 4b849302f4..924fca66fb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_inverse_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_inverse_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/matrix_inverse_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/matrix_inverse_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_inverse_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_inverse_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_inverse_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_inverse_gpu_kernel.h index 85c5598e46..91a7e52298 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/matrix_inverse_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/matrix_inverse_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/multinomial_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/multinomial_gpu_kernel.cc similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/multinomial_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/multinomial_gpu_kernel.cc index 9571d71961..d424990d4c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/multinomial_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/multinomial_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/multinomial_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/multinomial_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/multinomial_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/multinomial_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/multinomial_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/multinomial_gpu_kernel.h index 1e6788adb8..b3eaadd590 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/multinomial_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/multinomial_gpu_kernel.h @@ -23,11 +23,11 @@ #include #include #include -#include "runtime/device/gpu/gpu_memory_allocator.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/multinomial_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/cumsum_impl.cuh" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/multinomial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/cumsum_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/nms_with_mask_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/nms_with_mask_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/nms_with_mask_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/nms_with_mask_gpu_kernel.cc index ad8b47b40e..8351364b4e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/nms_with_mask_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/nms_with_mask_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/nms_with_mask_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/nms_with_mask_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/nms_with_mask_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/nms_with_mask_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/nms_with_mask_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/nms_with_mask_gpu_kernel.h index 14da7b28c8..d5e2fcd7c7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/nms_with_mask_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/nms_with_mask_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/nms_with_mask_impl.cuh" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/nms_with_mask_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/random_op_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/random_op_gpu_kernel.cc index c5c21c0828..6105cadd41 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/random_op_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/random_op_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/random_op_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/random_op_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/random_op_gpu_kernel.h index 843c2397bd..6b85adafe9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/random_op_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/random_op_gpu_kernel.h @@ -22,9 +22,9 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/random_op_impl.cuh" #include "include/curand.h" #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/solve_triangular_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/solve_triangular_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/solve_triangular_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/solve_triangular_gpu_kernel.cc index d89d666a7e..905b97762e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/solve_triangular_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/solve_triangular_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/solve_triangular_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/solve_triangular_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/solve_triangular_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/solve_triangular_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/solve_triangular_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/solve_triangular_gpu_kernel.h index 84f4a60557..66ce1e6454 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/solve_triangular_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/solve_triangular_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/square_sum_all_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/square_sum_all_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/square_sum_all_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/square_sum_all_gpu_kernel.cc index ac5553070f..6da34f3ebb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/square_sum_all_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/square_sum_all_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/square_sum_all_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/square_sum_all_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/square_sum_all_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/square_sum_all_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/square_sum_all_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/square_sum_all_gpu_kernel.h index af8d7ff43c..90736d2be7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/square_sum_all_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/square_sum_all_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/square_sum_all_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/square_sum_all_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/squared_difference_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/squared_difference_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/squared_difference_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/squared_difference_kernel.cc index 2e94a1ba4b..a78eddda51 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/squared_difference_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/squared_difference_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/squared_difference_kernel.h" +#include "plugin/device/gpu/kernel/math/squared_difference_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/squared_difference_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/squared_difference_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/squared_difference_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/squared_difference_kernel.h index 48289ac7bc..8c5e5c778d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/squared_difference_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/squared_difference_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { constexpr int MAX_DIMS = 7; diff --git a/mindspore/ccsrc/mindspore.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/trsm_solve_gpu_kernel.cc similarity index 53% rename from mindspore/ccsrc/mindspore.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/trsm_solve_gpu_kernel.cc index c98f67b51e..f4a23849de 100644 --- a/mindspore/ccsrc/mindspore.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/trsm_solve_gpu_kernel.cc @@ -1,5 +1,5 @@ /** - * Copyright 2019 Huawei Technologies Co., Ltd + * Copyright 2020-2022 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. @@ -14,11 +14,17 @@ * limitations under the License. */ -#include +#include "plugin/device/gpu/kernel/math/trsm_solve_gpu_kernel.h" namespace mindspore { - -// cppcheck-suppress unusedFunction -std::string set_version(const std::string &version) { return version; } - +namespace kernel { +MS_REG_GPU_KERNEL_ONE( + SolveTriangular, + KernelAttr().AddInputAttr(kNumberTypeFloat32).AddInputAttr(kNumberTypeFloat32).AddOutputAttr(kNumberTypeFloat32), + TrsmGpuKernelMod, float) +MS_REG_GPU_KERNEL_ONE( + SolveTriangular, + KernelAttr().AddInputAttr(kNumberTypeFloat64).AddInputAttr(kNumberTypeFloat64).AddOutputAttr(kNumberTypeFloat64), + TrsmGpuKernelMod, double) +} // namespace kernel } // namespace mindspore diff --git a/mindspore/ccsrc/plugin/device/gpu/kernel/math/trsm_solve_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/trsm_solve_gpu_kernel.h new file mode 100644 index 0000000000..e262965f18 --- /dev/null +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/trsm_solve_gpu_kernel.h @@ -0,0 +1,225 @@ +/** + * Copyright 2020-2022 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_BACKEND_KERNEL_COMPILER_GPU_MATH_TRSM_SOLVE_GPU_KERNEL_H_ +#define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MATH_TRSM_SOLVE_GPU_KERNEL_H_ +#include +#include +#include +#include +#include +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" + +namespace mindspore { +namespace kernel { +constexpr auto kAVectorxDimNum = 1; +constexpr auto kAMatrixDimNum = 2; +template +class TrsmGpuKernelMod : public NativeGpuKernelMod { + public: + TrsmGpuKernelMod() = default; + ~TrsmGpuKernelMod() = default; + + bool Launch(const std::vector &inputs, const std::vector &workspace, + const std::vector &outputs, void *stream_ptr) override { + if (is_null_input_) { + return true; + } + CHECK_CUBLAS_RET_WITH_ERROR(cublasSetStream(blas_handle_, reinterpret_cast(stream_ptr)), + "cublasSetStream failed"); + auto inputA_addr = GetDeviceAddress(inputs, 0); + auto inputb_addr = GetDeviceAddress(inputs, 1); + auto output_addr = GetDeviceAddress(outputs, 0); + + // if b is not a vector, solve b in the workspace + T *dst = nullptr; + if (n_ == 1) { + dst = output_addr; + } else { + dst = GetDeviceAddress(workspace, 0); + } + + if (n_ == 1) { + const size_t batch = m_ * n_; + CHECK_CUDA_RET_WITH_EXCEPT(kernel_node_, + cudaMemcpyAsync(dst, inputb_addr, batch * sizeof(T), cudaMemcpyDeviceToDevice, + reinterpret_cast(stream_ptr)), + "cudaMemcpyAsync dst failed"); + } else { + T alpha = 1; + T beta = 0; + // in order to convert row major matrix b(m x n) to col major matrix b'(m x n), + // the following operation is equivalent to: + // b' = b.T.reshape(m, n) + if constexpr (std::is_same_v) { + CHECK_CUBLAS_RET_WITH_EXCEPT(kernel_node_, + cublasSgeam(blas_handle_, CUBLAS_OP_T, CUBLAS_OP_T, m_, n_, &alpha, inputb_addr, + n_, &beta, inputb_addr, n_, dst, m_), + "cublas transpose b Fail"); + } else { + CHECK_CUBLAS_RET_WITH_EXCEPT(kernel_node_, + cublasDgeam(blas_handle_, CUBLAS_OP_T, CUBLAS_OP_T, m_, n_, &alpha, inputb_addr, + n_, &beta, inputb_addr, n_, dst, m_), + "cublas transpose b Fail"); + } + } + + T alpha = 1; + if constexpr (std::is_same_v) { + CHECK_CUBLAS_RET_WITH_EXCEPT(kernel_node_, + cublasStrsm(blas_handle_, CUBLAS_SIDE_LEFT, uplo_, trans_, unit_diagonal_, m_, n_, + &alpha, inputA_addr, lda_, dst, ldb_), + "cublas trsm Fail"); + } else { + CHECK_CUBLAS_RET_WITH_EXCEPT(kernel_node_, + cublasDtrsm(blas_handle_, CUBLAS_SIDE_LEFT, uplo_, trans_, unit_diagonal_, m_, n_, + &alpha, inputA_addr, lda_, dst, ldb_), + "cublas trsm Fail"); + } + + // if x is not a vector, do transpose + if (n_ != 1) { + T alpha = 1; + T beta = 0; + // in order to convert col major matrix x'(m x n) to row major matrix x'(m x n), + // the following operation is equivalent to: + // x = x'.reshape(n, m).T + if constexpr (std::is_same_v) { + CHECK_CUBLAS_RET_WITH_EXCEPT( + kernel_node_, + cublasSgeam(blas_handle_, CUBLAS_OP_T, CUBLAS_OP_T, n_, m_, &alpha, dst, m_, &beta, dst, m_, output_addr, n_), + "cublas transpose x Fail"); + } else { + CHECK_CUBLAS_RET_WITH_EXCEPT( + kernel_node_, + cublasDgeam(blas_handle_, CUBLAS_OP_T, CUBLAS_OP_T, n_, m_, &alpha, dst, m_, &beta, dst, m_, output_addr, n_), + "cublas transpose x Fail"); + } + } + + return true; + } + bool Init(const CNodePtr &kernel_node) override { + kernel_name_ = AnfAlgo::GetCNodeName(kernel_node); + kernel_node_ = kernel_node; + blas_handle_ = device::gpu::GPUDeviceManager::GetInstance().GetCublasHandle(); + auto A_shape = AnfAlgo::GetPrevNodeOutputInferShape(kernel_node, 0); + auto b_shape = AnfAlgo::GetPrevNodeOutputInferShape(kernel_node, 1); + is_null_input_ = + CHECK_SHAPE_NULL(A_shape, kernel_name_, "input_A") || CHECK_SHAPE_NULL(b_shape, kernel_name_, "input_b"); + if (is_null_input_) { + InitSizeLists(); + return true; + } + + if (A_shape.size() != kAMatrixDimNum) { + MS_LOG(EXCEPTION) << "For '" << kernel_name_ << "', A should be 2D, but got [" << A_shape.size() + << "] dimensions."; + } + if (A_shape[kDim0] != A_shape[kDim1]) { + MS_LOG(EXCEPTION) << "For '" << kernel_name_ + << "', the shape of input matrix A should be square matrix like [N X N], but got [" + << A_shape[kDim0] << " X " << A_shape[kDim1] << "]."; + } + m_ = A_shape[kDim0]; + + if (b_shape.size() != kAVectorxDimNum && b_shape.size() != kAMatrixDimNum) { + MS_LOG(EXCEPTION) << "For '" << kernel_name_ << "', b should be 1D or 2D, but got [" << b_shape.size() + << "] dimensions."; + } + if (b_shape[kDim0] != m_) { + if (b_shape.size() == kAVectorxDimNum) { + MS_LOG(EXCEPTION) << "For '" << kernel_name_ << "', the shape of input should be [" << m_ << "], but got [" + << b_shape[kDim0] << "]."; + } else { + MS_LOG(EXCEPTION) << "For '" << kernel_name_ << "', the shape of input should be [" << m_ << " X " + << b_shape[kDim1] << "], but got [" << b_shape[kDim0] << " X " << b_shape[kDim1] << "]."; + } + } + if (b_shape.size() == kAVectorxDimNum || (b_shape.size() == kAMatrixDimNum && b_shape[kDim1] == 1)) { + n_ = 1; + } else { + n_ = b_shape[kDim1]; + } + + lda_ = SizeToInt(m_); + ldb_ = SizeToInt(m_); + + const std::string trans = AnfAlgo::GetNodeAttr(kernel_node, "trans"); + SetOperation(trans); + + bool lower = AnfAlgo::GetNodeAttr(kernel_node, "lower"); + // reverting the trans flag by default, so also flip the lower flag + lower = !lower; + if (lower) { + uplo_ = CUBLAS_FILL_MODE_LOWER; + } else { + uplo_ = CUBLAS_FILL_MODE_UPPER; + } + + bool unit_diagonal = AnfAlgo::GetNodeAttr(kernel_node, "unit_diagonal"); + if (unit_diagonal) { + unit_diagonal_ = CUBLAS_DIAG_UNIT; + } else { + unit_diagonal_ = CUBLAS_DIAG_NON_UNIT; + } + + InitSizeLists(); + return true; + } + + protected: + void InitSizeLists() override { + size_t unit_size = sizeof(T); + size_t A_size = m_ * m_ * unit_size; + size_t b_size = m_ * n_ * unit_size; + input_size_list_ = {A_size, b_size}; + output_size_list_ = {b_size}; + if (n_ != 1) { + workspace_size_list_ = {b_size}; + } + } + + void SetOperation(const std::string &trans) { + // converting row major to col major is the same as reverting the trans flag + if (trans == "N") { + trans_ = CUBLAS_OP_T; + } else if (trans == "T") { + trans_ = CUBLAS_OP_N; + } else if (trans == "C") { + trans_ = CUBLAS_OP_N; + } else { + MS_LOG(EXCEPTION) << "For '" << kernel_name_ << "', trans should be in [N, T, C], but got [" << trans << "]."; + } + } + + private: + size_t m_{0}; + size_t n_{0}; + int lda_{0}; + int ldb_{0}; + bool is_null_input_{false}; + cublasHandle_t blas_handle_{nullptr}; + cublasFillMode_t uplo_{CUBLAS_FILL_MODE_UPPER}; + cublasOperation_t trans_{CUBLAS_OP_N}; + cublasDiagType_t unit_diagonal_{CUBLAS_DIAG_NON_UNIT}; +}; +} // namespace kernel +} // namespace mindspore + +#endif // MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MATH_TRSM_SOLVE_GPU_KERNEL_H_ diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_complex_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_complex_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_complex_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_complex_gpu_kernel.cc index afc5eafd2c..7a7b8653c8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_complex_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_complex_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "utils/complex.h" -#include "backend/kernel_compiler/gpu/math/unary_op_complex_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/unary_op_complex_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_complex_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_complex_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_complex_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_complex_gpu_kernel.h index c040f11793..4243648857 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_complex_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_complex_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/math/unary_op_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_gpu_kernel.cc index 5c09e9eeee..811454925b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/unary_op_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_gpu_kernel.h index 0c2b7d6204..04440f79f4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_gpu_kernel.h @@ -22,9 +22,9 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/unary_op_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_grad_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_grad_gpu_kernel.cc index 6c90445ff6..7eb1fd0919 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/unary_op_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/math/unary_op_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_grad_gpu_kernel.h index 6a0c23051f..01f390e530 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/unary_op_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/unary_op_grad_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#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_grad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/unary_op_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/update_thor_gradient.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/math/update_thor_gradient.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/update_thor_gradient.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/update_thor_gradient.cc index a404e59697..334b217679 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/update_thor_gradient.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/update_thor_gradient.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/math/update_thor_gradient.h" +#include "plugin/device/gpu/kernel/math/update_thor_gradient.h" namespace mindspore { namespace kernel { MS_REG_GPU_KERNEL_ONE(UpdateThorGradient, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/update_thor_gradient.h b/mindspore/ccsrc/plugin/device/gpu/kernel/math/update_thor_gradient.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/math/update_thor_gradient.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/math/update_thor_gradient.h index a565dc6bfe..4e64d99acd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/math/update_thor_gradient.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/math/update_thor_gradient.h @@ -20,11 +20,11 @@ #include #include #include -#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/convert_gradient_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/convert_gradient_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" #include "utils/convert_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_collective_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_collective_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_collective_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_collective_gpu_kernel.cc index 903a238636..40f1407a12 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_collective_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_collective_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nccl/nccl_collective_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/nccl_collective_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_collective_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_collective_gpu_kernel.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_collective_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_collective_gpu_kernel.h index 57b0768c68..8f56968a02 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_collective_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_collective_gpu_kernel.h @@ -22,7 +22,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.cc index 36ba332977..77be4084db 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h index 6e64a811ff..aed24cefb3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h @@ -21,12 +21,12 @@ #include #include #include -#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" -#include "runtime/hardware/gpu/nvidia_collective_comm_lib.h" -#include "runtime/hardware/collective/collective_comm_lib_loader.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/hal/device/distribution/collective_init.h" +#include "plugin/device/gpu/hal/hardware/nvidia_collective_comm_lib.h" +#include "runtime/collective/collective_comm_lib_loader.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_p2p_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_p2p_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_p2p_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_p2p_gpu_kernel.cc index 06ddbac016..a250c4f03f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_p2p_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_p2p_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nccl/nccl_p2p_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/nccl_p2p_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_p2p_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_p2p_gpu_kernel.h similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_p2p_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_p2p_gpu_kernel.h index af421fe785..564bedbc3f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_p2p_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_p2p_gpu_kernel.h @@ -22,7 +22,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_recv_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_recv_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_recv_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_recv_gpu_kernel.cc index 01fe8541ac..5a0e3b60c4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_recv_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_recv_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nccl/nccl_recv_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/nccl_recv_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_recv_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_recv_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_recv_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_recv_gpu_kernel.h index 806d91be65..744ec9f28d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_recv_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_recv_gpu_kernel.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_send_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_send_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_send_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_send_gpu_kernel.cc index a4892f05f2..9e9d1cd9b0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_send_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_send_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nccl/nccl_send_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/nccl_send_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_send_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_send_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_send_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_send_gpu_kernel.h index 7cfa1c1194..2e15a3fa73 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/nccl_send_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/nccl_send_gpu_kernel.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_gpu_kernel.cc index 7dce5bb451..ca88da1b4f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nccl/sync_batch_norm_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/sync_batch_norm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_gpu_kernel.h index b234875a69..43d9b03c42 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_gpu_kernel.h @@ -21,11 +21,11 @@ #include #include #include -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_grad_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_grad_gpu_kernel.cc index ebfbcc7aee..0b2f155c41 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nccl/sync_batch_norm_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nccl/sync_batch_norm_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_grad_gpu_kernel.h index 637625cad4..2f3ac96e6a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nccl/sync_batch_norm_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nccl/sync_batch_norm_grad_gpu_kernel.h @@ -21,11 +21,11 @@ #include #include #include -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sync_batch_norm_grad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sync_batch_norm_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_gpu_kernel.cc index b5bc6b98f7..450341b37e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/activation_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/activation_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_gpu_kernel.h index f172900369..17cb6c616e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#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/relu_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/relu_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_grad_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_grad_kernel.cc index 2cf492f635..bd5ec855a5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_grad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/activation_grad_kernel.h" +#include "plugin/device/gpu/kernel/nn/activation_grad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_grad_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_grad_kernel.h index 6a62c6635f..85bbec1603 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/activation_grad_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/activation_grad_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adagrad_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adagrad_gpu_kernel.cc index 3f6317d244..cd00fe802d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adagrad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/adagrad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adagrad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adagrad_gpu_kernel.h index 6621a5caae..9cf9ee6032 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adagrad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adagrad_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/adagrad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/adagrad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_gpu_kernel.cc index a46e259588..7bbb60b0e9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/adam_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/adam_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_gpu_kernel.h index f4572cf0da..1859fc8332 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/adam_impl.cuh" namespace mindspore { namespace kernel { constexpr size_t INPUT_NUM = 10; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_weight_decay_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_weight_decay_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_weight_decay_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_weight_decay_gpu_kernel.cc index 6d20f275ab..1c918231fd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_weight_decay_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_weight_decay_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/adam_weight_decay_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/adam_weight_decay_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_weight_decay_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_weight_decay_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_weight_decay_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_weight_decay_gpu_kernel.h index 86f8a8ade6..59cadec12c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adam_weight_decay_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adam_weight_decay_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/adam_impl.cuh" namespace mindspore { namespace kernel { constexpr size_t INPUT_NUM = 9; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_gpu_kernel.cc index d9ed4809d1..17ce4e4d48 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_gpu_kernel.h index 3fa147d392..758d204271 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_grad_gpu_kernel.cc index 4d7ca2cc3c..ec1a93d25c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_grad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_grad_gpu_kernel.h index 436d0e3bd3..0ae0cc8fe6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/adaptive_avg_pool2d_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/adaptive_avg_pool2d_grad_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/adaptive_avg_pool2d_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/apply_gradient_descent_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/apply_gradient_descent_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/apply_gradient_descent_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/apply_gradient_descent_gpu_kernel.cc index c716b84976..ac5cea6d22 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/apply_gradient_descent_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/apply_gradient_descent_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/apply_gradient_descent_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/apply_gradient_descent_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/apply_gradient_descent_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/apply_gradient_descent_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/apply_gradient_descent_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/apply_gradient_descent_gpu_kernel.h index 2f19d51836..7be111f46f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/apply_gradient_descent_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/apply_gradient_descent_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/apply_gradient_descent_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/apply_gradient_descent_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_gpu_kernel.cc index 55e5be13d5..73f9902fbb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/batch_norm_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/batch_norm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_gpu_kernel.h index d84c76e5d2..1cab486c85 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_grad_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_grad_gpu_kernel.cc index 7c2159a1a7..5b5d88dff4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/batch_norm_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/batch_norm_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_grad_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_grad_gpu_kernel.h index 76151434dd..9c7d6dbe5f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/batch_norm_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/batch_norm_grad_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include "utils/utils.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 "backend/kernel_compiler/gpu/cuda_impl/batchnorm_grad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/batchnorm_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bce_with_logits_loss_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bce_with_logits_loss_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bce_with_logits_loss_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/bce_with_logits_loss_kernel.cc index f4919f3fd6..01325e095b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bce_with_logits_loss_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bce_with_logits_loss_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/bce_with_logits_loss_kernel.h" +#include "plugin/device/gpu/kernel/nn/bce_with_logits_loss_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bce_with_logits_loss_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bce_with_logits_loss_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bce_with_logits_loss_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/bce_with_logits_loss_kernel.h index 75e885dcc2..f699b98091 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bce_with_logits_loss_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bce_with_logits_loss_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/bce_with_logits_loss_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/bce_with_logits_loss_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_gpu_kernel.cc index ebd317aff6..96598c606a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/bias_add_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/bias_add_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_gpu_kernel.h index ae8ca41235..4e1cc3e28f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_grad_gpu_kenel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_grad_gpu_kenel.cc index 387c509b3f..75f9e849cb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_grad_gpu_kenel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.h" +#include "plugin/device/gpu/kernel/nn/bias_add_grad_gpu_kenel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_grad_gpu_kenel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_grad_gpu_kenel.h index a2cdff7a42..a631f60c7d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/bias_add_grad_gpu_kenel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/bias_add_grad_gpu_kenel.h @@ -21,10 +21,10 @@ #include #include #include -#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/bias_add_grad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/bias_add_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_gpu_kernel.cc index 2cbccb6de2..30033b6381 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_gpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/binary_cross_entropy_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/binary_cross_entropy_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_gpu_kernel.h index e1717c08cd..1453a1b3b9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_gpu_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cuh" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cuh" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_grad_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_grad_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_grad_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_grad_kernel.cc index 93ab1bf658..ee2431965a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_grad_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_grad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/binary_cross_entropy_grad_kernel.h" +#include "plugin/device/gpu/kernel/nn/binary_cross_entropy_grad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_grad_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_grad_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_grad_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_grad_kernel.h index 266bf96a70..f8679afdad 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/binary_cross_entropy_grad_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/binary_cross_entropy_grad_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cuh" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cuh" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/clip_grad_norm_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/clip_grad_norm_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/clip_grad_norm_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/clip_grad_norm_gpu_kernel.cc index 9fe5eecff8..cdeb4df368 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/clip_grad_norm_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/clip_grad_norm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/clip_grad_norm_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/clip_grad_norm_gpu_kernel.h" namespace mindspore::kernel { MS_REG_GPU_KERNEL_ONE(ClipGradNorm, diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/clip_grad_norm_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/clip_grad_norm_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/clip_grad_norm_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/clip_grad_norm_gpu_kernel.h index 55e4208a42..e151dc6d61 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/clip_grad_norm_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/clip_grad_norm_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include "utils/log_adapter.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 "backend/kernel_compiler/gpu/cuda_impl/clip_grad_norm_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/clip_grad_norm_impl.cuh" namespace mindspore::kernel { constexpr size_t kArgMaxDim = 7; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/combine_momentum_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/combine_momentum_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/combine_momentum_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/combine_momentum_gpu_kernel.cc index 91a4311abe..c0e6b33fa0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/combine_momentum_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/combine_momentum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/combine_momentum_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/combine_momentum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/combine_momentum_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/combine_momentum_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/combine_momentum_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/combine_momentum_gpu_kernel.h index 47a4ab148b..4e162839f8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/combine_momentum_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/combine_momentum_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/momentum_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_gpu_kernel.cc index 60313ca949..cd31f56742 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/conv2d_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_gpu_kernel.h index 52d0a3881d..ea1ef4b8e0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pad_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 "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_filter_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_filter_gpu_kernel.cc index df1f579305..a89771713f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_filter_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/conv2d_grad_filter_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_filter_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_filter_gpu_kernel.h index e848d3bcb7..e2f6aafd96 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_filter_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_filter_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pad_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 "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_input_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_input_gpu_kernel.cc index e188b71581..b2e207490d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_input_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/conv2d_grad_input_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_input_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_input_gpu_kernel.h index 37cf13b309..7047b900dc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv2d_grad_input_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv2d_grad_input_gpu_kernel.h @@ -22,10 +22,10 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pad_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 "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_gpu_kernel.cc index ebe2154638..9d23f72e3b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/conv3d_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/conv3d_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_gpu_kernel.h index 0f616823d0..82083b5cd6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pad_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 "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_filter_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_filter_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_filter_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_filter_gpu_kernel.cc index c6b2fe4113..4df2e900a2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_filter_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_filter_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/conv3d_grad_filter_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/conv3d_grad_filter_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_filter_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_filter_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_filter_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_filter_gpu_kernel.h index a916f56b7c..d7127c2d4b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_filter_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_filter_gpu_kernel.h @@ -21,11 +21,11 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pad_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/cast_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/cast_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_input_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_input_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_input_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_input_gpu_kernel.cc index 644cd7af88..6da21ad8ca 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_input_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_input_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/conv3d_grad_input_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/conv3d_grad_input_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_input_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_input_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_input_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_input_gpu_kernel.h index f59c4e1236..cb325b0d95 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_grad_input_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_grad_input_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pad_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 "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_transpose_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_transpose_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_transpose_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_transpose_gpu_kernel.cc index 6f73106b86..0c90725292 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_transpose_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_transpose_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/conv3d_transpose_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/conv3d_transpose_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_transpose_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_transpose_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_transpose_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_transpose_gpu_kernel.h index 649dfd6cd1..795ea22519 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/conv3d_transpose_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/conv3d_transpose_gpu_kernel.h @@ -22,10 +22,10 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pad_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 "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ctcloss_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/ctcloss_gpu_kernel.cc index 8dfe9a4950..6646e2fade 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ctcloss_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/ctcloss_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ctcloss_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/ctcloss_gpu_kernel.h index d973226043..3a415c791b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ctcloss_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ctcloss_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#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" -#include "backend/kernel_compiler/gpu/cuda_impl/ctcloss_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" +#include "plugin/device/gpu/kernel/cuda_impl/ctcloss_impl.cuh" namespace mindspore { namespace kernel { constexpr size_t kPrevOutput0th = 0; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout3d_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout3d_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout3d_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout3d_gpu_kernel.cc index dffde4c932..7fc2f627ba 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout3d_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout3d_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/dropout3d_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/dropout3d_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout3d_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout3d_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout3d_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout3d_gpu_kernel.h index 0e61e271e4..dc517b7df1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout3d_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout3d_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/dropout3d_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/dropout3d_impl.cuh" #include "include/curand.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_gpu_kernel.cc index 66cc1f907c..cf57ec1bb1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/dropout_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_gpu_kernel.h index f8ae0ae5d9..ec803510ed 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/dropout_impl.cuh" #include "include/curand.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_grad_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_grad_kernel.cc index 77660a9929..75c174f4e0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_grad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/dropout_grad_kernel.h" +#include "plugin/device/gpu/kernel/nn/dropout_grad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_grad_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_grad_kernel.h index 5d3c639469..2199330311 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/dropout_grad_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/dropout_grad_kernel.h @@ -19,9 +19,9 @@ #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/dropout_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_gpu_kernel.cc index d12df85201..4593e800bf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/flatten_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_gpu_kernel.h index 5a552642de..e3c56ab9f5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_gpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_grad_gpu_kernel.cc index 42c01d2d49..76ddeb6d66 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/flatten_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_grad_gpu_kernel.h index cab2f55fed..3ba2547b72 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/flatten_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/flatten_grad_gpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ftrl_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/ftrl_gpu_kernel.cc index 03dc1db6c6..fbe8fe27e0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ftrl_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/ftrl_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ftrl_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/ftrl_gpu_kernel.h index c7f1535203..b6e00a6fe6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ftrl_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ftrl_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/ftrl_impl.cuh" namespace mindspore { namespace kernel { constexpr size_t INPUT_NUM = 8; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_adam_weight_decay.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_adam_weight_decay.cc index cdae3f25a6..ab7a49a5c5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_adam_weight_decay.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.h" +#include "plugin/device/gpu/kernel/nn/fused_adam_weight_decay.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_adam_weight_decay.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_adam_weight_decay.h index 59b44e4c59..8feb0255f6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_adam_weight_decay.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_adam_weight_decay.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_FUSED_ADAM_WEIGHT_DECAY_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/adam_weight_decay_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_grad_v2_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_grad_v2_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_grad_v2_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_grad_v2_gpu_kernel.cc index c0f2af1e68..3202746bc9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_grad_v2_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_grad_v2_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/fused_add_relu_grad_v2_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/fused_add_relu_grad_v2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_grad_v2_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_grad_v2_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_grad_v2_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_grad_v2_gpu_kernel.h index ba0fa8b3c2..12c4d3ff35 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_grad_v2_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_grad_v2_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/add_relu_v2_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/add_relu_v2_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_v2_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_v2_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_v2_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_v2_gpu_kernel.cc index eb4ad4d678..c3f3938773 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_v2_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_v2_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/fused_add_relu_v2_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/fused_add_relu_v2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_v2_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_v2_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_v2_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_v2_gpu_kernel.h index eb73c1bf1b..015395292e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_add_relu_v2_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_add_relu_v2_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/add_relu_v2_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/add_relu_v2_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_scale_momentum_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_scale_momentum_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_scale_momentum_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_scale_momentum_gpu_kernel.cc index 8ee219b688..d6d8ab8b18 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_scale_momentum_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_scale_momentum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/fused_scale_momentum_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/fused_scale_momentum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_scale_momentum_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_scale_momentum_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_scale_momentum_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_scale_momentum_gpu_kernel.h index 44c83808ad..b5d06a0f7b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_scale_momentum_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_scale_momentum_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_FUSED_SCALE_MOMENTUM_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/momentum_impl.cuh" namespace mindspore { namespace kernel { constexpr size_t INPUT_NUM = 6; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_momentum_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_momentum_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_momentum_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_momentum_gpu_kernel.cc index f91217daa1..29fdd8a8c9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_momentum_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_momentum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/fused_weightdecay_momentum_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/fused_weightdecay_momentum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_momentum_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_momentum_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_momentum_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_momentum_gpu_kernel.h index 9f64b41ad8..f67bba6eec 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_momentum_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_momentum_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_FUSED_WEIGHTDECAY_MOMENTUM_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/momentum_impl.cuh" namespace mindspore { namespace kernel { constexpr size_t INPUT_NUM = 6; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_scale_momentum_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_scale_momentum_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_scale_momentum_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_scale_momentum_gpu_kernel.cc index bbeac8a12d..9b0f052b1e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_scale_momentum_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_scale_momentum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/fused_weightdecay_scale_momentum_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/fused_weightdecay_scale_momentum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_scale_momentum_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_scale_momentum_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_scale_momentum_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_scale_momentum_gpu_kernel.h index 92a875f330..06cc7d9bee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/fused_weightdecay_scale_momentum_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/fused_weightdecay_scale_momentum_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_FUSED_WEIGHTDECAY_SCALE_MOMENTUM_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/momentum_impl.cuh" namespace mindspore { namespace kernel { constexpr size_t INPUT_NUM = 7; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_grad_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_grad_kernel.cc index f1b30248a8..bd8ccb0bf1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_grad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/gelu_grad_kernel.h" +#include "plugin/device/gpu/kernel/nn/gelu_grad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_grad_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_grad_kernel.h index d61e31ddd0..7a1edeeee0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_grad_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_grad_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_GELU_GRAD_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/gelu_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_kernel.cc index 6f9b511a3e..001ef5a878 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/gelu_kernel.h" +#include "plugin/device/gpu/kernel/nn/gelu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_kernel.h index efa15f794e..62554dc8f5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/gelu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/gelu_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_GELU_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/gelu_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_gpu_kernel.cc index 2f9ebff6e1..67aa9c10c8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/hsigmoid_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/hsigmoid_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_gpu_kernel.h index 045ba26dec..f507250721 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_HSIGMOID_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/hsigmoid_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/hsigmoid_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_grad_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_grad_gpu_kernel.cc index e8b0c86429..12edeea808 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/hsigmoid_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/hsigmoid_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_grad_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_grad_gpu_kernel.h index abb006d4c4..1bae26179d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hsigmoid_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hsigmoid_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_HSIGMOID_GRAD_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/hsigmoid_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/hsigmoid_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_gpu_kernel.cc index 2fc257b84d..eb514d9cb7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/hswish_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/hswish_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_gpu_kernel.h index 348027d5a3..4123ff2a09 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_HSWISH_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/hswish_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/hswish_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_grad_gpu_kernel.cc index 07caad4bcf..df859620cd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/hswish_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/hswish_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_grad_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_grad_gpu_kernel.h index 5359fd36d1..d772c1cda4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/hswish_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/hswish_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_HSWISH_GRAD_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/hswish_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/hswish_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/im2col_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/im2col_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/im2col_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/im2col_gpu_kernel.cc index d5c5fc937b..5e792c5f95 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/im2col_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/im2col_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/im2col_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/im2col_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/im2col_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/im2col_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/im2col_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/im2col_gpu_kernel.h index 6ea1e03068..177f811f3e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/im2col_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/im2col_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_gpu_kernel.cc index 4d99a03445..2f6d4339b0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/instance_norm_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/instance_norm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_gpu_kernel.h index ecd9692878..d3039b119b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_gpu_kernel.h @@ -19,11 +19,11 @@ #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" #include "utils/utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/instance_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/instance_norm_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_grad_gpu_kernel.cc index c4e8b8a577..30c6c6ab0e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/instance_norm_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/instance_norm_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_grad_gpu_kernel.h index 2dc93d543e..812edbdf59 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/instance_norm_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/instance_norm_grad_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include "utils/utils.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 "backend/kernel_compiler/gpu/cuda_impl/instance_norm_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/instance_norm_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_gpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_gpu_kernel.cc index 2aabebdabf..4ec5133e3a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/kl_div_loss_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/kl_div_loss_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_gpu_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_gpu_kernel.h index 4c9b2b1564..a2c1aa81ef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_gpu_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cuh" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cuh" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_grad_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_grad_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_grad_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_grad_kernel.cc index 85feaa502b..b4fb9734b9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_grad_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_grad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/kl_div_loss_grad_kernel.h" +#include "plugin/device/gpu/kernel/nn/kl_div_loss_grad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_grad_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_grad_kernel.h similarity index 89% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_grad_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_grad_kernel.h index 92c6f0c21b..c512554643 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/kl_div_loss_grad_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/kl_div_loss_grad_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cuh" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cuh" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2_loss_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2_loss_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2_loss_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2_loss_gpu_kernel.cc index 91d51c681c..4064cd598b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2_loss_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2_loss_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/l2_loss_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/l2_loss_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2_loss_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2_loss_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2_loss_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2_loss_gpu_kernel.h index f36a8b5e6c..121685e9f1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2_loss_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2_loss_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_L2_LOSS_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/l2_loss.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/l2_loss.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_gpu_kernel.cc index 5af8953472..570a0659e3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/l2normalize_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/l2normalize_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_gpu_kernel.h index c40559ad5d..d10b352a5d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_gpu_kernel.h @@ -20,11 +20,11 @@ #include #include #include -#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/cuda_impl/l2normalize_impl.cuh" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/l2normalize_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { constexpr int MAX_DIMS = 7; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_grad_gpu_kernel.cc index c8cbed6e59..beeea7c984 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/l2normalize_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/l2normalize_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_grad_gpu_kernel.h index 004958fd1c..59f6bd61b7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/l2normalize_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/l2normalize_grad_gpu_kernel.h @@ -20,11 +20,11 @@ #include #include #include -#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/cuda_impl/l2normalize_impl.cuh" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/l2normalize_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { constexpr int MAX_DIMS = 7; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_gpu_kernel.cc index f00f09e023..db7b3fc024 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/layer_norm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_gpu_kernel.h index 97cf6c9cd2..6791f6d117 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_LAYER_NORM_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/layer_norm_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_gpu_kernel.cc index ac16e5569f..3066f747ba 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/layer_norm_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_gpu_kernel.h index 6072eda897..134c5699f3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_LAYER_NORM_GRAD_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_grad_gpu_kernel.cc index c2c5abf59b..4d5b1c2702 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/layer_norm_grad_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/layer_norm_grad_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_grad_gpu_kernel.h index 89f8559301..4ddd774e09 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/layer_norm_grad_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/layer_norm_grad_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_LAYER_NORM_GRAD_GRAD_GPU_KERNEL_H_ #include -#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_grad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/layer_norm_grad_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_gpu_kernel.cc index 7d87a118dc..8b6ce03a31 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/local_response_norm_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/local_response_norm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_gpu_kernel.h index 460c586c27..b9bc6a4987 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_gpu_kernel.h @@ -19,11 +19,11 @@ #include #include -#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/local_response_norm_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl_opt.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/local_response_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl_opt.cuh" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_grad_gpu_kernel.cc index 261da64810..fb017b3848 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/local_response_norm_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/local_response_norm_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_grad_gpu_kernel.h index e9e027cc6f..7dde87fc38 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/local_response_norm_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/local_response_norm_grad_gpu_kernel.h @@ -19,11 +19,11 @@ #include #include -#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/local_response_norm_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/transpose_impl_opt.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/local_response_norm_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl_opt.cuh" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_gpu_kernel.cc index 58a0633d61..f7335c2a6c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/lstm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_gpu_kernel.h index 80681a9fb4..778846b3dc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_data_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_data_gpu_kernel.cc index 5ee305d7f6..e7b471c589 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_data_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/lstm_grad_data_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_data_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_data_gpu_kernel.h index 561fa4c4ce..cf9a5714ed 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_data_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_data_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_weight_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_weight_gpu_kernel.cc index 2484131f29..19c667d993 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_weight_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/lstm_grad_weight_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_weight_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_weight_gpu_kernel.h index c386243cab..9d53ba0dd2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/lstm_grad_weight_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/lstm_grad_weight_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_gpu_kernel.cc index 255421022a..210be7039c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/maxpool_with_argmax_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/maxpool_with_argmax_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_gpu_kernel.h index 63ee37bccb..659aa16808 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_impl.cuh" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_grad_gpu_kernel.cc index 91f826c4c2..d618d9aec2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/maxpool_with_argmax_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/maxpool_with_argmax_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_grad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_grad_gpu_kernel.h index 804e10868d..d263c02f91 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/maxpool_with_argmax_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/maxpool_with_argmax_grad_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/maxpool_with_argmax_grad_impl.cuh" -#include "backend/kernel_compiler/gpu/kernel_constants.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/maxpool_with_argmax_grad_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_gpu_kernel.cc index f1a3dc9bf9..94d119faac 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/mirror_pad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/mirror_pad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_gpu_kernel.h index 36a4248e8d..79c07c84d6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/mirror_pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/mirror_pad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_grad_gpu_kernel.cc index 9208bdb385..341597af6c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/mirror_pad_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/mirror_pad_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_grad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_grad_gpu_kernel.h index 70587790a4..06d8d71568 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/mirror_pad_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/mirror_pad_grad_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/mirror_pad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/mirror_pad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/momentum_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/momentum_gpu_kernel.cc index d4d9b9aa6b..ed27dac1e7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/momentum_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/momentum_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/momentum_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/momentum_gpu_kernel.h index 8de0bb8167..03e667c944 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/momentum_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/momentum_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_MOMENTUM_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/momentum_impl.cuh" namespace mindspore { namespace kernel { constexpr size_t INPUT_NUM = 5; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_gpu_kernel.cc index fb2e26be91..169dfd2547 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/nll_loss_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/nll_loss_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_gpu_kernel.h index 035515581a..fe5c27f195 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_gpu_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cuh" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cuh" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_grad_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_grad_gpu_kernel.cc index 7727af5518..0de73beb4f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/nll_loss_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/nll_loss_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_grad_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_grad_gpu_kernel.h index 74b8ee7642..c5533e4fb2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/nll_loss_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/nll_loss_grad_gpu_kernel.h @@ -19,10 +19,10 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/loss_with_reduction_impl.cuh" -#include "backend/kernel_compiler/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/loss_with_reduction_impl.cuh" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pad_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/pad_gpu_kernel.cc index e0de239008..348d3dacf3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/pad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/pad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pad_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/pad_gpu_kernel.h index 55d2b47424..972902526b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pad_gpu_kernel.h @@ -22,10 +22,10 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/pad_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/slice_impl.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/slice_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_gpu_kernel.cc index aa5300ff92..8aabfab211 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/pooling_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_gpu_kernel.h index 022765094c..cc5f2e4a8f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_grad_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_grad_gpu_kernel.cc index 7887a9cc2f..775875208f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/pooling_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_grad_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_grad_gpu_kernel.h index b93ea32025..0efd058fc8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/pooling_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/pooling_grad_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/pad_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_gpu_kernel.cc index 451a1e0f7b..75db0dbd95 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/prelu_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/prelu_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_gpu_kernel.h index 518491fad0..6c16d19b6b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/prelu_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/prelu_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_grad_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_grad_gpu_kernel.cc index 9d91c1e383..b658ae284a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/prelu_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/prelu_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_grad_gpu_kernel.h index 4f2a926c2c..373bc58aa8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/prelu_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/prelu_grad_gpu_kernel.h @@ -21,9 +21,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/prelu_grad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/prelu_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_gpu_kernel.cc index cfbf04a190..22ccc6f64a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/ps_roi_pooling_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/ps_roi_pooling_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_gpu_kernel.h index 4349ddfe29..34f0db1d59 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/psroi_pooling_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/psroi_pooling_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_grad_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_grad_gpu_kernel.cc index d3f31443f4..6c223b0c9e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/ps_roi_pooling_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/ps_roi_pooling_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_grad_gpu_kernel.h index caafbc6f8e..8a0d4a86eb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/ps_roi_pooling_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/ps_roi_pooling_grad_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/psroi_pooling_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/psroi_pooling_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_gpu_kernel.cc index 25de079f05..99c339f5cf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/relu_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/relu_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_gpu_kernel.h index 42fdf9136a..6573863641 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/relu_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/relu_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_gpu_kernel.cc index c7ccb1e0c6..45a9a5bb3f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/relu_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/relu_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_gpu_kernel.h index 76a0a8824b..ce5852877f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#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/relu_grad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/relu_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_v2_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_v2_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_v2_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_v2_gpu_kernel.cc index 9c5ad55bfb..12c08429b9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_v2_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_v2_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/relu_grad_v2_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/relu_grad_v2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_v2_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_v2_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_v2_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_v2_gpu_kernel.h index c34a9c6ed6..c3b9708d26 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_grad_v2_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_grad_v2_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/relu_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/relu_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_v2_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_v2_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_v2_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_v2_gpu_kernel.cc index b01ad8a024..577b67b3f2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_v2_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_v2_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/relu_v2_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/relu_v2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_v2_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_v2_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_v2_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_v2_gpu_kernel.h index a8851fcff0..72be64cf00 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/relu_v2_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/relu_v2_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/relu_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/relu_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_gpu_kernel.cc index ca8b273898..4e1248fdbf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/resize_bilinear_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/resize_bilinear_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_gpu_kernel.h index 5b5156141e..5059dbd342 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_RESIZE_BILINEAR_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/resize_bilinear_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/resize_bilinear_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_grad_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_grad_gpu_kernel.cc index dbc77290b1..5bbec975fa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/resize_bilinear_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/resize_bilinear_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_grad_gpu_kernel.h index bc28a2613c..28f39509f1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/resize_bilinear_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/resize_bilinear_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_RESIZE_BILINEAR_GRAD_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/resize_bilinear_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/resize_bilinear_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/rmsprop_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/rmsprop_gpu_kernel.cc index 0975639a18..5d977f6881 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/rmsprop_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/rmsprop_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/rmsprop_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/rmsprop_gpu_kernel.h index d5278ee921..9ff5d48308 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/rmsprop_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/rmsprop_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_RMSPROP_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/rmsprop_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_gpu_kernel.cc index e07ea0be5d..653f7f2533 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/roi_align_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/roi_align_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_gpu_kernel.h index 11c92fb59d..53f631a1da 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_ROI_ALIGN_GPU_KERNEL_H #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/roi_align_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/roi_align_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_grad_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_grad_gpu_kernel.cc index 996d82d7f1..114385a8e8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/roi_align_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/roi_align_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_grad_gpu_kernel.h index 1f161078dd..7578704d7b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/roi_align_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/roi_align_grad_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/roi_align_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/roi_align_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sgd_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sgd_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sgd_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sgd_gpu_kernel.cc index 34654740e6..e72ba24536 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sgd_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sgd_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/sgd_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/sgd_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sgd_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sgd_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sgd_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sgd_gpu_kernel.h index 68db2c5bd4..82c9f815f3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sgd_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sgd_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_NN_SGD_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/cuda_impl/sgd_impl.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/sgd_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc index 6fd91a2677..3a01a43c56 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h index 8ee1c31ee3..f2491bfae4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc index 72228d0a3b..d561817980 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h index 8eea782aeb..e92086d25f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sigmoid_cross_entropy_with_logits_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_SIGMOID_CROSS_ENTROPY_WITH_LOGITS_GRAD_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/sigmoid_cross_entropy_with_logits_grad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_gpu_kernel.cc index 7eb7c4340e..b82ffe7e68 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/smooth_l1_loss_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_gpu_kernel.h index b6bbccd41e..4d227013cd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_SMOOTH_L1_LOSS_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/smooth_l1_loss_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_grad_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_grad_gpu_kernel.cc index f3e397cf8c..5cb7d89920 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/smooth_l1_loss_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_grad_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_grad_gpu_kernel.h index d6a63b41b4..57b81854cf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/smooth_l1_loss_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/smooth_l1_loss_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_SMOOTH_L1_LOSS_GRAD_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/smooth_l1_loss_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc index cb1e0ba083..2afdcba78f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_cross_entropy_with_logits_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/softmax_cross_entropy_with_logits_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_cross_entropy_with_logits_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_cross_entropy_with_logits_gpu_kernel.h index 3bd75b58b9..f712642eb4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_cross_entropy_with_logits_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_cross_entropy_with_logits_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/cross_entropy_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_gpu_kernel.cc index 63d258d4a8..fbd6a81993 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/softmax_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_gpu_kernel.h index 8967eb12a8..92bec8ac22 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_grad_gpu_kernel.cc index af3ab03c12..16a2ddba5c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/softmax_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_grad_gpu_kernel.h index 57101e2a13..dad1553352 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softmax_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softmax_grad_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/transpose_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_gpu_kernel.cc index 9380084be0..1ddf55980a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/softplus_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/softplus_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_gpu_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_gpu_kernel.h index ec48999d41..4fab63e732 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_gpu_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_SOFTPLUS_GPU_KERNEL_H_ #include -#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/softplus_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/softplus_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_grad_gpu_kernel.cc index dcdb333788..881539bc48 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/softplus_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/softplus_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_grad_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_grad_gpu_kernel.h index aceafb54d3..06abc62edd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/softplus_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/softplus_grad_gpu_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_SOFTPLUS_GRAD_KERNEL_H_ #include -#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/softplus_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/softplus_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_apply_proximal_adagrad_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_apply_proximal_adagrad_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_apply_proximal_adagrad_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_apply_proximal_adagrad_kernel.cc index 722ded5717..8dc18d4a29 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_apply_proximal_adagrad_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_apply_proximal_adagrad_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/sparse_apply_proximal_adagrad_kernel.h" +#include "plugin/device/gpu/kernel/nn/sparse_apply_proximal_adagrad_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_apply_proximal_adagrad_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_apply_proximal_adagrad_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_apply_proximal_adagrad_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_apply_proximal_adagrad_kernel.h index 2ad2f73614..b0c8c69ef0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_apply_proximal_adagrad_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_apply_proximal_adagrad_kernel.h @@ -23,9 +23,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_SPARSE_APPLY_PROXIMAL_ADAGRAD_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/sparse_apply_proximal_adagrad_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_ftrl_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_ftrl_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_ftrl_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_ftrl_gpu_kernel.cc index 85097741ad..fb49dccf5a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_ftrl_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_ftrl_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/sparse_ftrl_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/sparse_ftrl_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_ftrl_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_ftrl_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_ftrl_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_ftrl_gpu_kernel.h index ddf29a57f5..ded51c00bb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_ftrl_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_ftrl_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_SPARSE_FTRL_GPU_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sparse_ftrl_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/sparse_ftrl_impl.cuh" namespace mindspore { namespace kernel { constexpr size_t INPUT_NUM = 5; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc index 2e8de3b243..317a4de7b0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h" +#include "plugin/device/gpu/kernel/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h index acf129fdf1..d5fc085fc9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/nn/sparse_softmax_cross_entropy_with_logits_gpu_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/cross_entropy_impl.cuh" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/assign_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/assign_gpu_kernel.cc index 63da05e9a4..6aedc77543 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/assign_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/assign_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/assign_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/assign_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/assign_gpu_kernel.h index c32d21d165..686546664d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/assign_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/assign_gpu_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_decode_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_decode_gpu_kernel.cc similarity index 89% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_decode_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_decode_gpu_kernel.cc index fcf184788f..dda630e9db 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_decode_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_decode_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/boundingbox_decode_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/boundingbox_decode_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_decode_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_decode_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_decode_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_decode_gpu_kernel.h index d8f69c2fb7..2b01569cf2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_decode_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_decode_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/boundingbox_decode_impl.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/boundingbox_decode_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_encode_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_encode_gpu_kernel.cc similarity index 89% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_encode_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_encode_gpu_kernel.cc index 6437813744..5d096c8995 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_encode_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_encode_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/boundingbox_encode_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/boundingbox_encode_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_encode_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_encode_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_encode_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_encode_gpu_kernel.h index aef2e7928b..28559c72e6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/boundingbox_encode_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/boundingbox_encode_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/boundingbox_encode_impl.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/boundingbox_encode_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/check_valid_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/check_valid_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/check_valid_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/check_valid_gpu_kernel.cc index 6eaf3c7182..17c2776ac2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/check_valid_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/check_valid_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/check_valid_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/check_valid_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/check_valid_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/check_valid_gpu_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/check_valid_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/check_valid_gpu_kernel.h index 6d7692a627..77957902c5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/check_valid_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/check_valid_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/check_valid_impl.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/check_valid_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcast_grad_args_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcast_grad_args_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcast_grad_args_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcast_grad_args_gpu_kernel.cc index bffc5badf5..aec7356390 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcast_grad_args_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcast_grad_args_gpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/dynamic_broadcast_grad_args_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/dynamic_broadcast_grad_args_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcast_grad_args_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcast_grad_args_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcast_grad_args_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcast_grad_args_gpu_kernel.h index e152018761..0eea5f8222 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcast_grad_args_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcast_grad_args_gpu_kernel.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcastto_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcastto_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcastto_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcastto_gpu_kernel.cc index 2d02919037..841d63b529 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcastto_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcastto_gpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/dynamic_broadcastto_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/dynamic_broadcastto_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcastto_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcastto_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcastto_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcastto_gpu_kernel.h index badce885a2..b19bf3b8b8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_broadcastto_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_broadcastto_gpu_kernel.h @@ -22,9 +22,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/broadcast_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_reshape_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_reshape_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_reshape_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_reshape_gpu_kernel.cc index fec8be761e..1ce2b586e9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_reshape_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_reshape_gpu_kernel.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/dynamic_reshape_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/dynamic_reshape_gpu_kernel.h" #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_common.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_reshape_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_reshape_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_reshape_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_reshape_gpu_kernel.h index 6bd16daefe..806e58dde8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_reshape_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_reshape_gpu_kernel.h @@ -22,9 +22,9 @@ #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_stitch_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_stitch_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_stitch_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_stitch_gpu_kernel.cc index 302e9b29b3..06c0b8fb13 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_stitch_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_stitch_gpu_kernel.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/dynamic_stitch_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/dynamic_stitch_gpu_kernel.h" #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/dynamic_stitch_impl.cuh" -#include "runtime/device/gpu/gpu_common.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/cuda_impl/dynamic_stitch_impl.cuh" +#include "plugin/device/gpu/hal/device/gpu_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_stitch_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_stitch_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_stitch_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_stitch_gpu_kernel.h index 7324333e6f..be0ed2e18b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/dynamic_stitch_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/dynamic_stitch_gpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/gpu_convert_to_dynamic_shape_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/gpu_convert_to_dynamic_shape_gpu_kernel.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/gpu_convert_to_dynamic_shape_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/gpu_convert_to_dynamic_shape_gpu_kernel.cc index 31a27e64a1..6d5fb83d96 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/gpu_convert_to_dynamic_shape_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/gpu_convert_to_dynamic_shape_gpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/gpu_convert_to_dynamic_shape_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/gpu_convert_to_dynamic_shape_gpu_kernel.h" #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/gpu_convert_to_dynamic_shape_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/gpu_convert_to_dynamic_shape_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/gpu_convert_to_dynamic_shape_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/gpu_convert_to_dynamic_shape_gpu_kernel.h index 6ba6dbfa6c..eeca568b92 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/gpu_convert_to_dynamic_shape_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/gpu_convert_to_dynamic_shape_gpu_kernel.h @@ -19,8 +19,8 @@ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/iou_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/other/iou_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/iou_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/iou_gpu_kernel.cc index d3d7902940..821eb0c3d1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/iou_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/iou_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/other/iou_gpu_kernel.h" +#include "plugin/device/gpu/kernel/other/iou_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/iou_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/other/iou_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/other/iou_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/other/iou_gpu_kernel.h index edffb0ee1b..9aa4339681 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/other/iou_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/other/iou_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/cuda_impl/iou_impl.cuh" -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/iou_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_gpu_kernel.cc index 1ac5dbac90..330bbcd521 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.h" +#include "plugin/device/gpu/kernel/quant/batchnorm_fold2_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_gpu_kernel.h index f3b3f4b19e..e1a0c4ea14 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_BATCHNORMFOLD2_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/batchnorm_fold2_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_grad_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_grad_gpu_kernel.cc index 737cb1458c..a0bab39d4a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/quant/batchnorm_fold2_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_grad_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_grad_gpu_kernel.h index d0c85c54aa..0c0c0b93df 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold2_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold2_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_NN_BATCHNORMFOLD2_GRAD_GPU_KERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/batchnorm_fold2_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_gpu_kernel.cc index 75107ac180..ab58eeef2c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.h" +#include "plugin/device/gpu/kernel/quant/batchnorm_fold_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_gpu_kernel.h index b17b2473a5..840c1d408d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_gpu_kernel.h @@ -18,10 +18,10 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_BATCHNORM_FOLD_GPUKERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" +#include "plugin/device/gpu/kernel/cuda_impl/batchnorm_fold_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_grad_gpu_kernel.cc index 28aa4b1e51..00244a5936 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_grad_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/quant/batchnorm_fold_grad_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_grad_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_grad_gpu_kernel.h index c5ffc9102b..3c10b80cb1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/batchnorm_fold_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/batchnorm_fold_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_BATCHNORM_FOLD_GRAD_GPUKERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/batchnorm_fold_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_gpu_kernel.cc index c5106bb3c1..7476265df9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.h" +#include "plugin/device/gpu/kernel/quant/correction_mul_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_gpu_kernel.h index 855bf89882..002ec25572 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CORRECTIONMUL_GPUKERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/correction_mul_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_grad_gpu_kernel.cc similarity index 88% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_grad_gpu_kernel.cc index 8109ac47b0..2d18708d4f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_grad_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/cuda_impl/correction_mul_impl.cuh" +#include "plugin/device/gpu/kernel/quant/correction_mul_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/correction_mul_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_grad_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_grad_gpu_kernel.h index 4ff55525af..366738ae50 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/correction_mul_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/correction_mul_grad_gpu_kernel.h @@ -18,9 +18,9 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_CORRECTIONMULGRAD_GPUKERNEL_H_ #include -#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" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/correction_mul_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_gpu_kernel.cc index cabbfa6fdd..3bf75434ba 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh" +#include "plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_gpu_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_gpu_kernel.h index 7b5558dcc1..1a2896d618 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_FAKE_LEARNED_SCALE_QUANT_PER_CHANNEL_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.cc index e4bc4f7e6f..cc62653da4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh" +#include "plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perchannel_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.h index d75f1b3020..8dd2735ec1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perchannel_grad_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_FAKE_LEARNED_SCALE_QUANT_PER_CHANNEL_GRAD_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_gpu_kernel.cc index b2a9a28889..bbab369644 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh" +#include "plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_gpu_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_gpu_kernel.h index 94a9e4e544..372534ea44 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_FAKE_LEARNED_SCALE_QUANT_PERLAYER_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.cc index 8ce1e78d0d..89bf52e91c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh" +#include "plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/fake_learned_scale_quant_perlayer_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.h index e75b4da825..d44d08afb3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_learned_scale_quant_perlayer_grad_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_KERNEL_GPU_FAKE_LEARNED_SCALE_QUANT_PERLAYER_GRAD_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_gpu_kernel.cc index 76c870b33d..5556795993 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#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 "plugin/device/gpu/kernel/quant/fake_quant_perchannel_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/fake_quant_perchannel_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_gpu_kernel.h index 7ea178670b..70a2320cae 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_FAKEQUANT_PER_CHANNEL_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_grad_gpu_kernel.cc index bbdb1c3f74..d16860c541 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_grad_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#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" +#include "plugin/device/gpu/kernel/quant/fake_quant_perchannel_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/fake_quant_perchannel_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_grad_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_grad_gpu_kernel.h index 123e90e38a..9f1c106d52 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perchannel_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perchannel_grad_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_FAKEQUANT_PER_CHANNEL_GRAD_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_gpu_kernel.cc index b167d52476..5345d19a92 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#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 "plugin/device/gpu/kernel/quant/fake_quant_perlayer_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/fake_quant_perlayer_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_gpu_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_gpu_kernel.h index 739920d0c2..7c9909be45 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_FAKEQUANT_PERLAYER_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_grad_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_grad_gpu_kernel.cc index a34f36196f..b7d27020ad 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_grad_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#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" +#include "plugin/device/gpu/kernel/quant/fake_quant_perlayer_grad_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/fake_quant_perlayer_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_grad_gpu_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_grad_gpu_kernel.h index 2d68512a42..d07761c4b8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/fake_quant_perlayer_grad_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/fake_quant_perlayer_grad_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_FAKEQUANT_PERLAYER_GRAD_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perchannel_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perchannel_gpu_kernel.cc index 3dfcd85e90..5bc204ebbd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perchannel_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh" +#include "plugin/device/gpu/kernel/quant/minmax_update_perchannel_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/minmax_update_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perchannel_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perchannel_gpu_kernel.h index c2573a4115..b293c4ffae 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perchannel_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perchannel_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MINMAX_UPDATE_PERCHANNEL_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perlayer_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perlayer_gpu_kernel.cc index f9ee76fe0d..1adc65610d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perlayer_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/cuda_impl/minmax_update_impl.cuh" +#include "plugin/device/gpu/kernel/quant/minmax_update_perlayer_gpu_kernel.h" +#include "plugin/device/gpu/kernel/cuda_impl/minmax_update_impl.cuh" #include #include #include diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perlayer_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perlayer_gpu_kernel.h index dc1fc3c561..96f809e5d6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/quant/minmax_update_perlayer_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/quant/minmax_update_perlayer_gpu_kernel.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MINMAX_UPDATE_PERLAYER_GPUKERNEL_H_ #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_categorical_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/random/random_categorical_gpu_kernel.cc similarity index 99% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_categorical_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/random/random_categorical_gpu_kernel.cc index fab0c56d4b..27190b597e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_categorical_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/random/random_categorical_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/random/random_categorical_gpu_kernel.h" +#include "plugin/device/gpu/kernel/random/random_categorical_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_categorical_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/random/random_categorical_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_categorical_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/random/random_categorical_gpu_kernel.h index ba93205517..baace85324 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_categorical_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/random/random_categorical_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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_categorical.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/random_categorical.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_choice_with_mask_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/random/random_choice_with_mask_gpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_choice_with_mask_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/random/random_choice_with_mask_gpu_kernel.cc index 2c348bce70..6d64c27845 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_choice_with_mask_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/random/random_choice_with_mask_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/random/random_choice_with_mask_gpu_kernel.h" +#include "plugin/device/gpu/kernel/random/random_choice_with_mask_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_choice_with_mask_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/random/random_choice_with_mask_gpu_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_choice_with_mask_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/random/random_choice_with_mask_gpu_kernel.h index ff2afae90c..f46d1eba0b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/random_choice_with_mask_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/random/random_choice_with_mask_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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_choice_with_mask_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/random_choice_with_mask_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/randperm_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/random/randperm_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/random/randperm_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/random/randperm_gpu_kernel.cc index f1250494e9..d6acb6d4eb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/randperm_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/random/randperm_gpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/random/randperm_gpu_kernel.h" +#include "plugin/device/gpu/kernel/random/randperm_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/randperm_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/random/randperm_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/random/randperm_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/random/randperm_gpu_kernel.h index 7cb6befcc9..f8f3b83e7a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/randperm_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/random/randperm_gpu_kernel.h @@ -22,8 +22,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/uniform_candidate_sampler_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/random/uniform_candidate_sampler_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/random/uniform_candidate_sampler_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/random/uniform_candidate_sampler_gpu_kernel.cc index 959898c225..5bb8eaa2bf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/uniform_candidate_sampler_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/random/uniform_candidate_sampler_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/random/uniform_candidate_sampler_gpu_kernel.h" +#include "plugin/device/gpu/kernel/random/uniform_candidate_sampler_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/uniform_candidate_sampler_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/random/uniform_candidate_sampler_gpu_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/random/uniform_candidate_sampler_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/random/uniform_candidate_sampler_gpu_kernel.h index 8405c1b4e1..638783918c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/random/uniform_candidate_sampler_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/random/uniform_candidate_sampler_gpu_kernel.h @@ -23,9 +23,9 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/uniform_candidate_sampler_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/uniform_candidate_sampler_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_append_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_append_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_append_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_append_gpu_kernel.cc index 8169ee07bc..3a29013b03 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_append_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_append_gpu_kernel.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/buffer_append_gpu_kernel.h" +#include "plugin/device/gpu/kernel/rl/buffer_append_gpu_kernel.h" #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cuh" -#include "runtime/device/gpu/gpu_common.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cuh" +#include "plugin/device/gpu/hal/device/gpu_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_append_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_append_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_append_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_append_gpu_kernel.h index b84d06506c..64c066a357 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_append_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_append_gpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_get_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_get_gpu_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_get_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_get_gpu_kernel.cc index ef64a493f8..b49d6b6cb9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_get_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_get_gpu_kernel.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/buffer_get_gpu_kernel.h" +#include "plugin/device/gpu/kernel/rl/buffer_get_gpu_kernel.h" #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cuh" -#include "runtime/device/gpu/gpu_common.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cuh" +#include "plugin/device/gpu/hal/device/gpu_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_get_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_get_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_get_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_get_gpu_kernel.h index 53c27f0acf..8ca268ee81 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_get_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_get_gpu_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_sample_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_sample_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_sample_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_sample_gpu_kernel.cc index 17ad29d21c..f94e2c8478 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_sample_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_sample_gpu_kernel.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/buffer_sample_gpu_kernel.h" +#include "plugin/device/gpu/kernel/rl/buffer_sample_gpu_kernel.h" #include #include #include -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/gpu/cuda_impl/rl/rl_buffer_impl.cuh" -#include "backend/kernel_compiler/gpu/cuda_impl/topk_impl.cuh" -#include "runtime/device/gpu/gpu_common.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/kernel/cuda_impl/rl/rl_buffer_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/topk_impl.cuh" +#include "plugin/device/gpu/hal/device/gpu_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_sample_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_sample_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_sample_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_sample_gpu_kernel.h index d9a441833f..f68c6a55fa 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/buffer_sample_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/buffer_sample_gpu_kernel.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/discounted_return_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/discounted_return_gpu_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/discounted_return_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/discounted_return_gpu_kernel.cc index 079581ca32..f244c73d83 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/discounted_return_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/discounted_return_gpu_kernel.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/discounted_return_gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/rl/discounted_return_gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/discounted_return_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/discounted_return_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/discounted_return_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/discounted_return_gpu_kernel.h index 7bd6919d9f..2c79488226 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/discounted_return_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/discounted_return_gpu_kernel.h @@ -19,9 +19,9 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/gpu/cuda_impl/rl/discounted_return_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/kernel/cuda_impl/rl/discounted_return_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/env_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/env_gpu_kernel.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/env_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/env_gpu_kernel.cc index b2d5ecfa2f..0e84262cf4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/env_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/env_gpu_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/env_gpu_kernel.h" +#include "plugin/device/gpu/kernel/rl/env_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/env_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/env_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/env_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/env_gpu_kernel.h index 1940d3105e..5146d879b3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/env_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/env_gpu_kernel.h @@ -23,10 +23,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/gpu/rl/environment_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/kernel/rl/environment_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/environment_factory.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/environment_factory.cc similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/environment_factory.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/environment_factory.cc index cee090e556..d4fa57fcde 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/environment_factory.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/environment_factory.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/environment_factory.h" +#include "plugin/device/gpu/kernel/rl/environment_factory.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/environment_factory.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/environment_factory.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/environment_factory.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/environment_factory.h index 8435e5f801..37787da634 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/environment_factory.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/environment_factory.h @@ -23,8 +23,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_gpu_kernel.cc index 1bfefdef58..683a428daf 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/gru_gpu_kernel.h" +#include "plugin/device/gpu/kernel/rl/gru_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_gpu_kernel.h index 46c6cd7b62..0df0296983 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_data_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_data_gpu_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_data_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_data_gpu_kernel.cc index bf27067b0d..9fe20045a0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_data_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_data_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/gru_grad_data_gpu_kernel.h" +#include "plugin/device/gpu/kernel/rl/gru_grad_data_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_data_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_data_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_data_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_data_gpu_kernel.h index 355c5b34a7..aafae03376 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_data_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_data_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_weight_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_weight_gpu_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_weight_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_weight_gpu_kernel.cc index ce93a8b989..db2023e3fc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_weight_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_weight_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/gru_grad_weight_gpu_kernel.h" +#include "plugin/device/gpu/kernel/rl/gru_grad_weight_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_weight_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_weight_gpu_kernel.h similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_weight_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_weight_gpu_kernel.h index 3cc64d7ffb..506a7b7325 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/gru_grad_weight_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/gru_grad_weight_gpu_kernel.h @@ -20,9 +20,9 @@ #include #include #include -#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 "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/kernel_constants.h" namespace mindspore { namespace kernel { constexpr size_t kIndexFour = 4; diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tag_environment.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tag_environment.cc similarity index 98% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tag_environment.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tag_environment.cc index 887ff63db8..31049380c1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tag_environment.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tag_environment.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/tag_environment.h" +#include "plugin/device/gpu/kernel/rl/tag_environment.h" #include #include @@ -21,8 +21,8 @@ #include #include #include -#include "runtime/device/gpu/cuda_driver.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tag_environment.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tag_environment.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tag_environment.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tag_environment.h index fef49f14ef..39bfad9502 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tag_environment.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tag_environment.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_TAG_ENV_KERNEL_H_ #include -#include "backend/kernel_compiler/gpu/rl/environment_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/rl/tag_env_impl.cuh" +#include "plugin/device/gpu/kernel/rl/environment_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/rl/tag_env_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_clear_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_clear_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_clear_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_clear_kernel.cc index e3fc55cb77..da965bf90d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_clear_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_clear_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/tensor_array_clear_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_tensor_array.h" +#include "plugin/device/gpu/kernel/rl/tensor_array_clear_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_clear_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_clear_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_clear_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_clear_kernel.h index cbbe02abc1..a1c026e359 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_clear_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_clear_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_close_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_close_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_close_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_close_kernel.cc index aa7d897198..fdac08d343 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_close_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_close_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/tensor_array_close_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_tensor_array.h" +#include "plugin/device/gpu/kernel/rl/tensor_array_close_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_close_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_close_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_close_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_close_kernel.h index 95054c381a..d7cf4968f8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_close_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_close_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_create_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_create_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_create_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_create_kernel.cc index a2548cc517..0f6350eca6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_create_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_create_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ #include -#include "backend/kernel_compiler/gpu/rl/tensor_array_create_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_tensor_array.h" +#include "plugin/device/gpu/kernel/rl/tensor_array_create_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_create_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_create_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_create_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_create_kernel.h index 06ef193c3d..d088fd0420 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_create_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_create_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_read_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_read_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_read_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_read_kernel.cc index 0ca80455a9..707369db4d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_read_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_read_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/tensor_array_read_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_tensor_array.h" +#include "plugin/device/gpu/kernel/rl/tensor_array_read_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_read_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_read_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_read_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_read_kernel.h index 66762ad951..af9bae0383 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_read_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_read_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_size_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_size_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_size_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_size_kernel.cc index 2b1f213a14..6cb6ef95e8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_size_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_size_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/tensor_array_size_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_tensor_array.h" +#include "plugin/device/gpu/kernel/rl/tensor_array_size_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_size_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_size_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_size_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_size_kernel.h index a5829b01e8..b7a91afc25 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_size_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_size_kernel.h @@ -18,8 +18,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_stack_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_stack_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_stack_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_stack_kernel.cc index 402accc95a..f3df617549 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_stack_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_stack_kernel.cc @@ -16,10 +16,10 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/rl/tensor_array_stack_kernel.h" +#include "plugin/device/gpu/kernel/rl/tensor_array_stack_kernel.h" #include -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_tensor_array.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_stack_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_stack_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_stack_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_stack_kernel.h index 91066778e2..690801e71a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_stack_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_stack_kernel.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_write_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_write_kernel.cc similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_write_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_write_kernel.cc index f14f77964b..0226eae761 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_write_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_write_kernel.cc @@ -14,9 +14,9 @@ * limitations under the License. */ #include -#include "backend/kernel_compiler/gpu/rl/tensor_array_write_kernel.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/gpu_tensor_array.h" +#include "plugin/device/gpu/kernel/rl/tensor_array_write_kernel.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/gpu_tensor_array.h" #include "runtime/device/tensor_array_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_write_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_write_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_write_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_write_kernel.h index 7ab84dc9d9..5bac486b29 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/rl/tensor_array_write_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/rl/tensor_array_write_kernel.h @@ -19,8 +19,8 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_atom_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_atom_energy_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_atom_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_atom_energy_kernel.cc index f027fe6ead..108bd42a55 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_atom_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_atom_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/angle/angle_atom_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/angle/angle_atom_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_atom_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_atom_energy_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_atom_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_atom_energy_kernel.h index 0bda46955e..b6dcaba508 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_atom_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_atom_energy_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_atom_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_energy_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_energy_kernel.cc index f5aa891f3f..99a30601a1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/angle/angle_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/angle/angle_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_energy_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_energy_kernel.h index dd66c42ae7..ac5155d7c2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_energy_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_kernel.cc index 0a7ff696a6..0732fe5a5e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/angle/angle_force_kernel.h" +#include "plugin/device/gpu/kernel/sponge/angle/angle_force_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_kernel.h index 8daefc4cb7..5afb3dc506 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_with_atom_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_with_atom_energy_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_with_atom_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_with_atom_energy_kernel.cc index d0cc58e253..dc81e9505b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_with_atom_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_with_atom_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/angle/angle_force_with_atom_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/angle/angle_force_with_atom_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_with_atom_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_with_atom_energy_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_with_atom_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_with_atom_energy_kernel.h index a0a83c1c43..62ec916995 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/angle/angle_force_with_atom_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/angle/angle_force_with_atom_energy_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/angle/angle_force_with_atom_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_atom_energy_cuda_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_atom_energy_cuda_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_atom_energy_cuda_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_atom_energy_cuda_gpu_kernel.cc index 3348b1f5df..331c8f0677 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_atom_energy_cuda_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_atom_energy_cuda_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/bond/bond_atom_energy_cuda_gpu_kernel.h" +#include "plugin/device/gpu/kernel/sponge/bond/bond_atom_energy_cuda_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_atom_energy_cuda_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_atom_energy_cuda_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_atom_energy_cuda_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_atom_energy_cuda_gpu_kernel.h index d7c67315d7..0dd63d6a93 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_atom_energy_cuda_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_atom_energy_cuda_gpu_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_ATOM_ENERGY_CUDA_GPU_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_ATOM_ENERGY_CUDA_GPU_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_atom_energy_cuda_gpu_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_energy_cuda_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_energy_cuda_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_energy_cuda_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_energy_cuda_gpu_kernel.cc index 02efaa5755..bfb93d7857 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_energy_cuda_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_energy_cuda_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/bond/bond_energy_cuda_gpu_kernel.h" +#include "plugin/device/gpu/kernel/sponge/bond/bond_energy_cuda_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_energy_cuda_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_energy_cuda_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_energy_cuda_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_energy_cuda_gpu_kernel.h index 86c2ddb90f..96c2bbf7f1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_energy_cuda_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_energy_cuda_gpu_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_ENERGY_CUDA_GPU_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_ENERGY_CUDA_GPU_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_energy_cuda_gpu_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_cuda_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_cuda_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_cuda_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_cuda_gpu_kernel.cc index 90e056d90c..a8e9fde047 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_cuda_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_cuda_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/bond/bond_force_cuda_gpu_kernel.h" +#include "plugin/device/gpu/kernel/sponge/bond/bond_force_cuda_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_cuda_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_cuda_gpu_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_cuda_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_cuda_gpu_kernel.h index 51dd02c24b..871d8ac9d4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_cuda_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_cuda_gpu_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_FORCE_CUDA_GPU_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_FORCE_CUDA_GPU_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_cuda_gpu_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.cc index 08089278e0..cb1dea8375 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.h" +#include "plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.h index 816b69415e..873c243450 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_and_virial_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_FORCE_WITH_ATOM_ENERGY_AND_VIRIAL_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_FORCE_WITH_ATOM_ENERGY_AND_VIRIAL_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_and_virial_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_kernel.cc index 7986a4befb..ce4dca2e80 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_kernel.h index 397f39964c..c4f9f82f18 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_energy_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_FORCE_WITH_ATOM_ENERGY_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_FORCE_WITH_ATOM_ENERGY_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_energy_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_virial_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_virial_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_virial_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_virial_kernel.cc index 4c7889e25e..e9ae2d9341 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_virial_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_virial_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_virial_kernel.h" +#include "plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_virial_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_virial_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_virial_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_virial_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_virial_kernel.h index 5caa708dc1..102fd693d4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/bond/bond_force_with_atom_virial_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/bond/bond_force_with_atom_virial_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_FORCE_WITH_ATOM_VIRIAL_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_BOND_BOND_FORCE_WITH_ATOM_VIRIAL_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/bond/bond_force_with_atom_virial_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/atomcrdtocv_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/atomcrdtocv_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/atomcrdtocv_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/atomcrdtocv_kernel.cc index 5b73e7b06b..6c26d16f7b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/atomcrdtocv_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/atomcrdtocv_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/common/atomcrdtocv_kernel.h" +#include "plugin/device/gpu/kernel/sponge/common/atomcrdtocv_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/atomcrdtocv_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/atomcrdtocv_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/atomcrdtocv_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/atomcrdtocv_kernel.h index 5bf8f5d3a8..7f577d7fa1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/atomcrdtocv_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/atomcrdtocv_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_COMMON_ATOMCRDTOCV_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_COMMON_ATOMCRDTOCV_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/atomcrdtocv_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/atomcrdtocv_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_kernel.cc index 4ad935ee84..fb80d29279 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_kernel.h" +#include "plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_kernel.h index 5fd6a02635..f13ac4d4da 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_quarter_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_quarter_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_quarter_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_quarter_kernel.cc index 1f02c8bc41..63905c0a42 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_quarter_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_quarter_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_quarter_kernel.h" +#include "plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_quarter_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_quarter_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_quarter_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_quarter_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_quarter_kernel.h index 4ac02c08f9..2d67f62a78 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/crd_to_uint_crd_quarter_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/crd_to_uint_crd_quarter_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/crd_to_uint_crd_quarter_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/get_center_of_mass_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/get_center_of_mass_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/get_center_of_mass_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/get_center_of_mass_kernel.cc index e03119eb1c..6b37707852 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/get_center_of_mass_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/get_center_of_mass_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/common/get_center_of_mass_kernel.h" +#include "plugin/device/gpu/kernel/sponge/common/get_center_of_mass_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/get_center_of_mass_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/get_center_of_mass_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/get_center_of_mass_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/get_center_of_mass_kernel.h index fae5eeacc9..5ad1021e99 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/get_center_of_mass_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/get_center_of_mass_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/get_center_of_mass_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/get_center_of_mass_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/getcenter_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/getcenter_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/getcenter_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/getcenter_kernel.cc index 37837edbcf..78eb13f04e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/getcenter_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/getcenter_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/common/getcenter_kernel.h" +#include "plugin/device/gpu/kernel/sponge/common/getcenter_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/getcenter_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/getcenter_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/getcenter_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/getcenter_kernel.h index c457e52f29..38662c9dc8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/getcenter_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/getcenter_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/getcenter_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/getcenter_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/map_center_of_mass_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/map_center_of_mass_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/map_center_of_mass_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/map_center_of_mass_kernel.cc index 607299607e..08c27d7710 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/map_center_of_mass_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/map_center_of_mass_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/common/map_center_of_mass_kernel.h" +#include "plugin/device/gpu/kernel/sponge/common/map_center_of_mass_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/map_center_of_mass_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/map_center_of_mass_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/map_center_of_mass_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/map_center_of_mass_kernel.h index 49189fd642..cc7019080a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/map_center_of_mass_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/map_center_of_mass_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/map_center_of_mass_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/map_center_of_mass_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/mdtemperature_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/mdtemperature_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/mdtemperature_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/mdtemperature_kernel.cc index 2d4bc400e0..e4e0a5808c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/mdtemperature_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/mdtemperature_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/common/mdtemperature_kernel.h" +#include "plugin/device/gpu/kernel/sponge/common/mdtemperature_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/mdtemperature_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/mdtemperature_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/mdtemperature_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/mdtemperature_kernel.h index f376839e78..addec13597 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/mdtemperature_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/mdtemperature_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/mdtemperature_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/mdtemperature_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/total_c6_get_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/total_c6_get_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/total_c6_get_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/total_c6_get_kernel.cc index 78e08fd707..d1411045db 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/total_c6_get_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/total_c6_get_kernel.cc @@ -18,7 +18,7 @@ * Totalc6get. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/common/total_c6_get_kernel.h" +#include "plugin/device/gpu/kernel/sponge/common/total_c6_get_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/total_c6_get_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/total_c6_get_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/total_c6_get_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/total_c6_get_kernel.h index c620bdbf48..3ce82aa180 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/common/total_c6_get_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/common/total_c6_get_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/common/total_c6_get_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/common/total_c6_get_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/cal_no_wrap_crd_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/cal_no_wrap_crd_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/cal_no_wrap_crd_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/cal_no_wrap_crd_kernel.cc index e6429ca29a..f39f46e7b9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/cal_no_wrap_crd_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/cal_no_wrap_crd_kernel.cc @@ -18,7 +18,7 @@ * CalculateNowrapCrd. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/crdmcmap/cal_no_wrap_crd_kernel.h" +#include "plugin/device/gpu/kernel/sponge/crdmcmap/cal_no_wrap_crd_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/cal_no_wrap_crd_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/cal_no_wrap_crd_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/cal_no_wrap_crd_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/cal_no_wrap_crd_kernel.h index d6a7dcb00e..b5d370e357 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/cal_no_wrap_crd_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/cal_no_wrap_crd_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_CRDMCMAP_CAL_NO_WRAP_CRD_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_CRDMCMAP_CAL_NO_WRAP_CRD_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/cal_no_wrap_crd_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/refresh_boxmaptimes_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/refresh_boxmaptimes_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/refresh_boxmaptimes_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/refresh_boxmaptimes_kernel.cc index bbe5e923bf..4e0c49179a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/refresh_boxmaptimes_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/refresh_boxmaptimes_kernel.cc @@ -18,7 +18,7 @@ * RefreshBoxmapTimes. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/crdmcmap/refresh_boxmaptimes_kernel.h" +#include "plugin/device/gpu/kernel/sponge/crdmcmap/refresh_boxmaptimes_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/refresh_boxmaptimes_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/refresh_boxmaptimes_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/refresh_boxmaptimes_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/refresh_boxmaptimes_kernel.h index 5d23a29435..88eb632e8f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/crdmcmap/refresh_boxmaptimes_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/crdmcmap/refresh_boxmaptimes_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_CRDMCMAP_REFRESH_BOXMAPTIMES_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_CRDMCMAP_REFRESH_BOXMAPTIMES_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/crdmcmap/refresh_boxmaptimes_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_atom_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_atom_energy_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_atom_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_atom_energy_kernel.cc index ae084aad35..0af1b5608d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_atom_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_atom_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/dihedral/dihedral_atom_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/dihedral/dihedral_atom_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_atom_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_atom_energy_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_atom_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_atom_energy_kernel.h index 50e4b1d140..9dc3528d87 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_atom_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_atom_energy_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_atom_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_energy_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_energy_kernel.cc index fbf91f74d9..af84b47b29 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/dihedral/dihedral_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/dihedral/dihedral_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_energy_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_energy_kernel.h index 0e4eb1ccc6..fd7c3e95ac 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_energy_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_kernel.cc index 06c5466098..6802a89c47 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_kernel.h" +#include "plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_kernel.h index 35a8f1f99b..926a8a3b31 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_with_atom_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_with_atom_energy_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_with_atom_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_with_atom_energy_kernel.cc index f7ec8e5d6c..04436b949a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_with_atom_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_with_atom_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_with_atom_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_with_atom_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_with_atom_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_with_atom_energy_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_with_atom_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_with_atom_energy_kernel.h index 30327623ab..b4b6aa337b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/dihedral/dihedral_force_with_atom_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/dihedral/dihedral_force_with_atom_energy_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/dihedral/dihedral_force_with_atom_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.cc index 2158ac9505..4faf780a09 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.cc @@ -17,7 +17,7 @@ * Note: * LJForceWithVirialEnergy. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.h index d1e28900bc..2af64f733f 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_kernel.h @@ -23,10 +23,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_energy_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_energy_kernel.cc index 8bc4194538..361e853cf5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_energy_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/lj/lj_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/lj/lj_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_energy_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_energy_kernel.h index 7ff67c3166..bcedc485c9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_energy_kernel.h @@ -19,10 +19,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_kernel.cc index 1b94ca8820..0887aade6a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/lj/lj_force_kernel.h" +#include "plugin/device/gpu/kernel/sponge/lj/lj_force_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_kernel.h index 6907039be8..e2c7e9ae6a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_kernel.h @@ -19,10 +19,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_kernel.cc index 3945143f61..20eb3981f5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_kernel.h" +#include "plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_kernel.h similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_kernel.h index 66b11600e5..da2227ee73 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_kernel.h @@ -19,10 +19,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_update_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_update_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_update_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_update_kernel.cc index 75ad37e16d..a7c9664e87 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_update_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_update_kernel.cc @@ -17,7 +17,7 @@ * Note: * LJForceWithPMEDirectForceUpdate. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_update_kernel.h" +#include "plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_update_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_update_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_update_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_update_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_update_kernel.h index f4d01f709b..a007d330ea 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_pme_direct_force_update_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_pme_direct_force_update_kernel.h @@ -23,10 +23,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_force_with_pme_direct_force_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_virial_energy_update_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_virial_energy_update_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_virial_energy_update_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_virial_energy_update_kernel.cc index 531a50a930..46667e01ee 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_virial_energy_update_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_virial_energy_update_kernel.cc @@ -17,7 +17,7 @@ * Note: * LJForceWithVirialEnergyUpdate. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/lj/lj_force_with_virial_energy_update_kernel.h" +#include "plugin/device/gpu/kernel/sponge/lj/lj_force_with_virial_energy_update_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_virial_energy_update_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_virial_energy_update_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_virial_energy_update_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_virial_energy_update_kernel.h index 72a69d16f6..0359ff3138 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/lj/lj_force_with_virial_energy_update_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/lj/lj_force_with_virial_energy_update_kernel.h @@ -23,10 +23,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/lj/lj_direct_cf_force_with_lj_virial_direct_cf_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_atom_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_atom_energy_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_atom_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_atom_energy_kernel.cc index f6b03816f1..cae02b472d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_atom_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_atom_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_atom_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_atom_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_atom_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_atom_energy_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_atom_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_atom_energy_kernel.h index 67f54fc9f1..92beeba773 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_atom_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_atom_energy_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_atom_energy_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_energy_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_energy_kernel.cc index c569fbc233..b414221647 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_energy_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_energy_kernel.h index 01e174dfe5..adbe74c15b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_cf_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_cf_energy_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_cf_energy_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_atom_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_atom_energy_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_atom_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_atom_energy_kernel.cc index 0c8822cfe9..0954a2df89 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_atom_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_atom_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_atom_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_atom_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_atom_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_atom_energy_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_atom_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_atom_energy_kernel.h index 661aeb7341..26b766a650 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_atom_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_atom_energy_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_atom_energy_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.cc index 1713b457c5..024d06ea47 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.h index 46e4da30a2..00427d8ab4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_and_virial_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.cc index 073e08efe0..fa2b36fb50 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.h index d754d3bf86..3b7932b4d9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_cf_force_with_atom_energy_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_energy_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_energy_kernel.cc index 8fb3457a05..eb47127df5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_energy_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_energy_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_energy_kernel.h index c05bb85259..b44d8d6657 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_energy_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_energy_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_gpu_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_gpu_kernel.cc index 387e9e04ba..b6cb263969 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_gpu_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_gpu_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_gpu_kernel.h index 57250042b3..49b3cb1323 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_gpu_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.cc index 3f507a2cec..d3635b716c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.h similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.h index a93de05b63..ad8af605b8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nb14/dihedral_14_lj_force_with_direct_cf_kernel.h @@ -21,10 +21,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nb14/dihedral_14_lj_force_with_direct_cf_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_kernel.cc index ba2cdc7e20..e3d0d4230c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_kernel.cc @@ -18,7 +18,7 @@ * NeighborListUpdate. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_kernel.h" +#include "plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_kernel.h index 9142b840ba..64e2d544a3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_kernel.h @@ -25,10 +25,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_new_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_new_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_new_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_new_kernel.cc index c9a7199cbf..a224be1313 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_new_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_new_kernel.cc @@ -18,7 +18,7 @@ * NeighborListRefresh. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_new_kernel.h" +#include "plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_new_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_new_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_new_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_new_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_new_kernel.h index 7bd3b70da5..d0f2348a4d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/neighbor_list/neighbor_list_update_new_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/neighbor_list/neighbor_list_update_new_kernel.h @@ -24,10 +24,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/neighbor_list/neighbor_list_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_gradient_descent_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_gradient_descent_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_gradient_descent_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_gradient_descent_kernel.cc index 811ddcbce0..4bcfb32bf3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_gradient_descent_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_gradient_descent_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_gradient_descent_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nvtit/md_iteration_gradient_descent_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_gradient_descent_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_gradient_descent_kernel.h similarity index 89% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_gradient_descent_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_gradient_descent_kernel.h index 24664b326f..4fc6661f49 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_gradient_descent_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_gradient_descent_kernel.h @@ -17,15 +17,15 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MD_ITERATION_GRADIENT_DESCENT_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MD_ITERATION_GRADIENT_DESCENT_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_gradient_descent_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_kernel.cc index 98ca8e4a0c..422e18a285 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_kernel.h index 2763eb04c9..c55aac62a0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_kernel.h @@ -26,10 +26,10 @@ #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.cc index 2230fbdbf6..327bb97a5a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.h index ad2ec9661d..f1cde2bfa0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_kernel.h @@ -17,15 +17,15 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MD_ITERATION_LEAP_FROG_LIUJIAN_GPU_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MD_ITERATION_LEAP_FROG_LIUJIAN_GPU_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.cc index c035d72e71..8931ab5793 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.h index 8cb62c5df8..e8ddd4ba75 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_liujian_gpu_with_max_vel_kernel.h @@ -17,15 +17,15 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_MD_ITERATION_LEAP_FROG_LIUJIAN_GPU_WITH_MAX_VEL_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_MD_ITERATION_LEAP_FROG_LIUJIAN_GPU_WITH_MAX_VEL_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_liujian_with_max_vel_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.cc index db06307d78..4ab86af290 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.h" +#include "plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.h index ca77e21543..15805f0a3d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_leap_frog_with_max_vel_kernel.h @@ -17,15 +17,15 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MD_ITERATION_LEAP_FROG_WITH_MAX_VEL_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MD_ITERATION_LEAP_FROG_WITH_MAX_VEL_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_leap_frog_with_max_vel_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_setup_random_state.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_setup_random_state.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_setup_random_state.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_setup_random_state.cc index dbd0c3b131..0dec3545eb 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_setup_random_state.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_setup_random_state.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_setup_random_state.h" +#include "plugin/device/gpu/kernel/sponge/nvtit/md_iteration_setup_random_state.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_setup_random_state.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_setup_random_state.h similarity index 89% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_setup_random_state.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_setup_random_state.h index 880e30c8c1..6326d3eeca 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/nvtit/md_iteration_setup_random_state.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/nvtit/md_iteration_setup_random_state.h @@ -17,15 +17,15 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MD_ITERATION_SETUP_RANDOM_STATE_GPU_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_MD_ITERATION_SETUP_RANDOM_STATE_GPU_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/nvtit/md_iteration_setup_random_state_gpu_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/fft_3d_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/fft_3d_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/fft_3d_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/fft_3d_kernel.cc index d9e2a629b9..d7d664a2c2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/fft_3d_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/fft_3d_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/pme/fft_3d_kernel.h" +#include "plugin/device/gpu/kernel/sponge/pme/fft_3d_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/fft_3d_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/fft_3d_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/fft_3d_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/fft_3d_kernel.h index 3541436de5..fd6c04d335 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/fft_3d_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/fft_3d_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/fft_3d_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/fft_3d_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/ifft_3d_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/ifft_3d_kernel.cc similarity index 92% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/ifft_3d_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/ifft_3d_kernel.cc index 9c7ed5b2f0..d7c8f064dd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/ifft_3d_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/ifft_3d_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/pme/ifft_3d_kernel.h" +#include "plugin/device/gpu/kernel/sponge/pme/ifft_3d_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/ifft_3d_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/ifft_3d_kernel.h similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/ifft_3d_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/ifft_3d_kernel.h index f3e8933f89..c2c0e06144 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/ifft_3d_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/ifft_3d_kernel.h @@ -20,10 +20,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/ifft_3d_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/ifft_3d_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_kernel.cc index 1ce2aceb0c..e26e5bcfef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/pme/pme_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/pme/pme_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_kernel.h index ea9ee27db2..ad2e7ba0ae 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_kernel.h @@ -18,10 +18,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_update_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_update_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_update_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_update_kernel.cc index e07555e4b2..ed53552993 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_update_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_update_kernel.cc @@ -17,7 +17,7 @@ * Note: * PMEEnergyUpdate. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/pme/pme_energy_update_kernel.h" +#include "plugin/device/gpu/kernel/sponge/pme/pme_energy_update_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_update_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_update_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_update_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_update_kernel.h index 995bf65805..1c43ceeaf9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_energy_update_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_energy_update_kernel.h @@ -22,10 +22,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_energy_update_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_energy_update_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_kernel.cc similarity index 91% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_kernel.cc index 95e60abc87..21864bbe06 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_kernel.h" +#include "plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_kernel.h similarity index 90% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_kernel.h index e8a2af2baa..d055a95aef 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_kernel.h @@ -22,10 +22,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_update_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_update_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_update_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_update_kernel.cc index 6880a725b5..de0ec83a10 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_update_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_update_kernel.cc @@ -17,7 +17,7 @@ * Note: * PMEExcludedForceUpdate. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_update_kernel.h" +#include "plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_update_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_update_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_update_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_update_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_update_kernel.h index b89914178e..ee448d3d62 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_excluded_force_update_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_excluded_force_update_kernel.h @@ -25,10 +25,10 @@ #include #include #include -#include "runtime/device/gpu/cuda_common.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/sponge/pme/pme_excluded_force_impl.cuh" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_excluded_force_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_kernel.cc similarity index 89% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_kernel.cc index 488e678b9b..d8ed969b05 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_kernel.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_kernel.h" +#include "plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_kernel.h index 9ac014c309..0b4f9c235a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_kernel.h @@ -24,10 +24,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh" namespace mindspore { namespace kernel { template diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_update_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_update_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_update_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_update_kernel.cc index 1a495d390a..d25884edb9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_update_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_update_kernel.cc @@ -17,7 +17,7 @@ * Note: * PMEReciprocalForceUpdate. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_update_kernel.h" +#include "plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_update_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_update_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_update_kernel.h similarity index 97% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_update_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_update_kernel.h index b2fdd4e128..4f29259d8e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/pme/pme_reciprocal_force_update_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/pme/pme_reciprocal_force_update_kernel.h @@ -22,10 +22,10 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/pme/pme_reciprocal_force_impl.cuh" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_energy_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_energy_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_energy_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_energy_kernel.cc index d812934b2b..c75fd71b85 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_energy_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_energy_kernel.cc @@ -18,7 +18,7 @@ * RestrainEnergy. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/restrain/restrain_energy_kernel.h" +#include "plugin/device/gpu/kernel/sponge/restrain/restrain_energy_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_energy_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_energy_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_energy_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_energy_kernel.h index 3d2eb9c494..87367c18e1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_energy_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_energy_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_RESTRAIN_RESTRAIN_FORCE_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_RESTRAIN_RESTRAIN_FORCE_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_energy_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_energy_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_atom_energy_virial_impl_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_atom_energy_virial_impl_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_atom_energy_virial_impl_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_atom_energy_virial_impl_kernel.cc index 7f1efe4c45..00e17f3785 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_atom_energy_virial_impl_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_atom_energy_virial_impl_kernel.cc @@ -18,7 +18,7 @@ * RestrainForceWithAtomEnergyVirial. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/restrain/restrain_force_atom_energy_virial_kernel.h" +#include "plugin/device/gpu/kernel/sponge/restrain/restrain_force_atom_energy_virial_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_atom_energy_virial_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_atom_energy_virial_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_atom_energy_virial_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_atom_energy_virial_kernel.h index b6a0f3ccf6..a854b1a130 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_atom_energy_virial_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_atom_energy_virial_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_RESTRAIN_RESTRAIN_FORCE_ATOM_ENERGY_VIRIAL_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_RESTRAIN_RESTRAIN_FORCE_ATOM_ENERGY_VIRIAL_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_atom_energy_virial_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_kernel.cc index 286055b75f..843616974d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/restrain/restrain_force_kernel.h" +#include "plugin/device/gpu/kernel/sponge/restrain/restrain_force_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_kernel.h index e322ff1b1a..ef162944f9 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/restrain/restrain_force_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/restrain/restrain_force_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_RESTRAIN_RESTRAIN_FORCE_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_RESTRAIN_RESTRAIN_FORCE_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/restrain/restrain_force_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/restrain/restrain_force_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_kernel.cc index 7477f37408..745353432e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_kernel.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_kernel.h" +#include "plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_kernel.h index 4070f73346..1758efd614 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_CYCLE_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_CYCLE_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.cc index 8895ad161c..02f5e921ce 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.cc @@ -18,7 +18,7 @@ * ConstrainForceCycleWithVirial. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.h" +#include "plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.h index 3989c44a3b..d29518fa01 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_cycle_with_virial_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_CYCLE_WITH_VIRIAL_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_CYCLE_WITH_VIRIAL_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_cycle_with_virial_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_kernel.cc index cbf8059d03..0c4a0b13d1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_kernel.cc @@ -17,7 +17,7 @@ * Note: * ConstrainForce. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_kernel.h" +#include "plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_kernel.h index ae01d6dc66..236f5659c4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_kernel.h @@ -21,16 +21,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_virial_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_virial_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_virial_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_virial_kernel.cc index 58b58e295b..9b01f9000d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_virial_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_virial_kernel.cc @@ -18,7 +18,7 @@ * ConstrainForceVirial. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_virial_kernel.h" +#include "plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_virial_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_virial_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_virial_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_virial_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_virial_kernel.h index 23a127a2ca..9c04703f69 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_force_virial_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_force_virial_kernel.h @@ -20,16 +20,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_VIRIAL_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_FORCE_VIRIAL_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_kernel.cc similarity index 95% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_kernel.cc index 197acc675d..e2f0bcd862 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_kernel.cc @@ -17,7 +17,7 @@ * Note: * Constrain. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_kernel.h" +#include "plugin/device/gpu/kernel/sponge/simple_constrain/constrain_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_kernel.h similarity index 96% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_kernel.h index c8ed2587dd..4b1ff8a1a7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/constrain_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/constrain_kernel.h @@ -20,16 +20,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_CONSTRAIN_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/constrain_force_virial_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/last_crd_to_dr_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/last_crd_to_dr_kernel.cc similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/last_crd_to_dr_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/last_crd_to_dr_kernel.cc index 8c9abbf856..5f9325b4c0 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/last_crd_to_dr_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/last_crd_to_dr_kernel.cc @@ -17,7 +17,7 @@ * Note: * LastCrdToDr. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/simple_constrain/last_crd_to_dr_kernel.h" +#include "plugin/device/gpu/kernel/sponge/simple_constrain/last_crd_to_dr_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/last_crd_to_dr_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/last_crd_to_dr_kernel.h similarity index 94% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/last_crd_to_dr_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/last_crd_to_dr_kernel.h index 834957f0ce..589578a676 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/last_crd_to_dr_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/last_crd_to_dr_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_LAST_CRD_TO_DR_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_LAST_CRD_TO_DR_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/last_crd_to_dr_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_crd_vel_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_crd_vel_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_crd_vel_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_crd_vel_kernel.cc index 937223fc7f..52859060f1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_crd_vel_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_crd_vel_kernel.cc @@ -18,7 +18,7 @@ * RefreshCrdVel. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_crd_vel_kernel.h" +#include "plugin/device/gpu/kernel/sponge/simple_constrain/refresh_crd_vel_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_crd_vel_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_crd_vel_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_crd_vel_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_crd_vel_kernel.h index 92794fcb16..069b482d7e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_crd_vel_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_crd_vel_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_REFRESH_CRD_VEL_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_REFRESH_CRD_VEL_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_crd_vel_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_uint_crd_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_uint_crd_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_uint_crd_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_uint_crd_kernel.cc index d326f8ef94..a4ca9a0e90 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_uint_crd_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_uint_crd_kernel.cc @@ -17,7 +17,7 @@ * Note: * RefreshUintCrd. This is an experimental interface that is subject to change and/or deletion. */ -#include "backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_uint_crd_kernel.h" +#include "plugin/device/gpu/kernel/sponge/simple_constrain/refresh_uint_crd_kernel.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_uint_crd_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_uint_crd_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_uint_crd_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_uint_crd_kernel.h index 6803ed8721..37f45d544b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/sponge/simple_constrain/refresh_uint_crd_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/sponge/simple_constrain/refresh_uint_crd_kernel.h @@ -17,16 +17,16 @@ #ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_REFRESH_UINT_CRD_KERNEL_H_ #define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_GPU_SPONG_SIMPLE_CONSTRAIN_REFRESH_UINT_CRD_KERNEL_H_ -#include "backend/kernel_compiler/gpu/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh" +#include "plugin/device/gpu/kernel/cuda_impl/sponge/simple_constrain/refresh_uint_crd_impl.cuh" #include #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" -#include "runtime/device/gpu/cuda_common.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" +#include "plugin/device/gpu/hal/device/cuda_common.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/trt/trt_kernel.cc b/mindspore/ccsrc/plugin/device/gpu/kernel/trt/trt_kernel.cc similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/trt/trt_kernel.cc rename to mindspore/ccsrc/plugin/device/gpu/kernel/trt/trt_kernel.cc index d9f313dd88..c24aed2021 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/trt/trt_kernel.cc +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/trt/trt_kernel.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/gpu/trt/trt_kernel.h" +#include "plugin/device/gpu/kernel/trt/trt_kernel.h" #include #include -#include "backend/kernel_compiler/gpu/data/dataset_utils.h" -#include "backend/kernel_compiler/gpu/trt/trt_utils.h" -#include "backend/kernel_compiler/common_utils.h" -#include "runtime/device/gpu/trt_loader.h" +#include "plugin/device/gpu/kernel/data/dataset_utils.h" +#include "plugin/device/gpu/kernel/trt/trt_utils.h" +#include "kernel/common_utils.h" +#include "plugin/device/gpu/hal/device/trt_loader.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/trt/trt_kernel.h b/mindspore/ccsrc/plugin/device/gpu/kernel/trt/trt_kernel.h similarity index 93% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/trt/trt_kernel.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/trt/trt_kernel.h index ad234a6967..8e2cc68555 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/trt/trt_kernel.h +++ b/mindspore/ccsrc/plugin/device/gpu/kernel/trt/trt_kernel.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/kernel_compiler/gpu/gpu_kernel.h" -#include "backend/kernel_compiler/gpu/gpu_kernel_factory.h" +#include "plugin/device/gpu/kernel/gpu_kernel.h" +#include "plugin/device/gpu/kernel/gpu_kernel_factory.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/trt/trt_utils.h b/mindspore/ccsrc/plugin/device/gpu/kernel/trt/trt_utils.h similarity index 100% rename from mindspore/ccsrc/backend/kernel_compiler/gpu/trt/trt_utils.h rename to mindspore/ccsrc/plugin/device/gpu/kernel/trt/trt_utils.h diff --git a/mindspore/ccsrc/plugin/device/gpu/optimizer/CMakeLists.txt b/mindspore/ccsrc/plugin/device/gpu/optimizer/CMakeLists.txt new file mode 100644 index 0000000000..2775d3c651 --- /dev/null +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/CMakeLists.txt @@ -0,0 +1,24 @@ +if("${ENABLE_HIDDEN}" STREQUAL "OFF") + string(REPLACE " -Werror " " " CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") + string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") +endif() + +file(GLOB_RECURSE _PREACTIVATE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") +file(GLOB_RECURSE _TRT_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "trt_pass/*.cc") +list(REMOVE_ITEM _PREACTIVATE_SRC_LIST ${_TRT_SRC_LIST}) + +if(ENABLE_GPU_INFER) + file(GLOB_RECURSE GPU_SRC_TRT_PASS_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "trt_pass/*.cc") + list(APPEND _PREACTIVATE_SRC_LIST ${GPU_SRC_TRT_PASS_LIST}) +endif() + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS_RELEASE "$ENV{CXXFLAGS} -Wno-user-defined-warnings -Wno-inconsistent-missing-override \ + -Wno-overloaded-virtual -Wno-unused-const-variable -Wno-pessimizing-move") +endif() + +set_property(SOURCE ${_PREACTIVATE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS + SUBMODULE_ID=mindspore::SubModuleId::SM_PRE_ACT) +if(ENABLE_GPU) + add_library(_mindspore_plugin_device_gpu_optimizer_obj OBJECT ${_PREACTIVATE_SRC_LIST}) +endif() diff --git a/mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/adam_fusion.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/adam_fusion.cc index ddddf8e54f..4b0fd72559 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/adam_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/adam_fusion.h" +#include "plugin/device/gpu/optimizer/adam_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/adam_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/adam_fusion.h index b65fd1257d..a279c4b49b 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/adam_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/adam_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_ADAM_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/adam_weight_decay_fusion.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/adam_weight_decay_fusion.cc index 9661cf67d6..d295e2fa0c 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/adam_weight_decay_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/adam_weight_decay_fusion.h" +#include "plugin/device/gpu/optimizer/adam_weight_decay_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/adam_weight_decay_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/adam_weight_decay_fusion.h index 7bf3c05ec4..fe550dc259 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/adam_weight_decay_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/adam_weight_decay_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_ADAM_WEIGHT_DECAY_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/add_relu_grad_v2_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_grad_v2_fusion.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/gpu/add_relu_grad_v2_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_grad_v2_fusion.cc index 00e694e792..84cd9bf69b 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/add_relu_grad_v2_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_grad_v2_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/add_relu_grad_v2_fusion.h" +#include "plugin/device/gpu/optimizer/add_relu_grad_v2_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/add_relu_grad_v2_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_grad_v2_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/add_relu_grad_v2_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_grad_v2_fusion.h index b41f35dfee..7b43616d01 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/add_relu_grad_v2_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_grad_v2_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_ADD_RELU_GRAD_V2_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/add_relu_v2_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_v2_fusion.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/gpu/add_relu_v2_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_v2_fusion.cc index 78190636d1..6fb9eef121 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/add_relu_v2_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_v2_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/add_relu_v2_fusion.h" +#include "plugin/device/gpu/optimizer/add_relu_v2_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/add_relu_v2_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_v2_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/add_relu_v2_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_v2_fusion.h index c0c3465447..4dacdac952 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/add_relu_v2_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/add_relu_v2_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_ADD_RELU_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/alltoall_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/alltoall_fusion.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/alltoall_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/alltoall_fusion.cc index 250ca29926..fd34657204 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/alltoall_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/alltoall_fusion.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "backend/optimizer/gpu/alltoall_fusion.h" +#include "plugin/device/gpu/optimizer/alltoall_fusion.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "runtime/device/gpu/kernel_info_setter.h" -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/alltoall_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/alltoall_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/alltoall_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/alltoall_fusion.h index 4e053a65e8..eae9b14163 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/alltoall_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/alltoall_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_ALLTOALL_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_scale_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_scale_fusion.cc similarity index 95% rename from mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_scale_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_scale_fusion.cc index 738a8b0ec8..256dfe5e8d 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_scale_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_scale_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/apply_momentum_scale_fusion.h" +#include "plugin/device/gpu/optimizer/apply_momentum_scale_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_scale_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_scale_fusion.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_scale_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_scale_fusion.h index 1271492d38..ba302d666b 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_scale_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_scale_fusion.h @@ -17,8 +17,8 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_APPLY_MOMENTUM_SCALE_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_fusion.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_fusion.cc index 8b37ef28b0..906896cc9f 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_fusion.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/apply_momentum_weight_fusion.h" +#include "plugin/device/gpu/optimizer/apply_momentum_weight_fusion.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_fusion.h index dd2d57f385..d5931a9197 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_APPLY_MOMENTUM_WEIGHT_DECAY_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_scale_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_scale_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_scale_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_scale_fusion.cc index 6878d5984b..bfa08c5375 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_scale_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_scale_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/apply_momentum_weight_scale_fusion.h" +#include "plugin/device/gpu/optimizer/apply_momentum_weight_scale_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_scale_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_scale_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_scale_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_scale_fusion.h index 51b158751a..590087ca32 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/apply_momentum_weight_scale_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/apply_momentum_weight_scale_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_APPLY_MOMENTUM_WEIGHT_DECAY_SCALE_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.cc index a9748837cd..8c2a80ceb9 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/batch_norm_add_relu_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "runtime/device/gpu/kernel_info_setter.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.h index bb4407657d..5bdd56fb4b 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_BATCH_NORM_ADD_RELU_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.cc index 8f834a4e68..6c6d4d6a70 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.cc @@ -13,18 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.h" #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "runtime/device/gpu/kernel_info_setter.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.h index 80a0fc1b67..ab03f6fa54 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_BATCH_NORM_ADD_RELU_GRAD_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_fusion.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_fusion.cc index f38bf58cb5..fd791c82e4 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_fusion.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/batch_norm_relu_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_relu_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "runtime/device/gpu/kernel_info_setter.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_fusion.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_fusion.h index ab249af064..0d1cb02706 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_BATCH_NORM_RELU_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_grad_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_grad_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.cc index 2f2de9f6a8..2e7d9bbdd3 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_grad_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/batch_norm_relu_grad_fusion.h" +#include "plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "runtime/device/gpu/kernel_info_setter.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" #include "utils/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_grad_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_grad_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.h index 4d7fefdd50..d1702a9efd 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_grad_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_BATCH_NORM_RELU_GRAD_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/bce_with_logits_loss_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/bce_with_logits_loss_fusion.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/bce_with_logits_loss_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/bce_with_logits_loss_fusion.cc index e73821f4d5..e49af2baca 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/bce_with_logits_loss_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/bce_with_logits_loss_fusion.cc @@ -14,15 +14,15 @@ * limitations under the License. */ -#include "backend/optimizer/gpu/bce_with_logits_loss_fusion.h" +#include "plugin/device/gpu/optimizer/bce_with_logits_loss_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "runtime/device/gpu/kernel_info_setter.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/bce_with_logits_loss_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/bce_with_logits_loss_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/bce_with_logits_loss_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/bce_with_logits_loss_fusion.h index 93e2a6aad3..bc7695b2f7 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/bce_with_logits_loss_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/bce_with_logits_loss_fusion.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_BCE_WITH_LOGITS_FUSION_H_ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_BCE_WITH_LOGITS_FUSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/combine_cast_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/combine_cast_fusion.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/combine_cast_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/combine_cast_fusion.cc index 5ac527a810..efa3d553ff 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/combine_cast_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/combine_cast_fusion.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/combine_cast_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/optimizer/combine_cast_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/combine_cast_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/combine_cast_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/combine_cast_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/combine_cast_fusion.h index 3d9c2f8650..4fbdffb552 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/combine_cast_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/combine_cast_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/combine_momentum_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/combine_momentum_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/combine_momentum_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/combine_momentum_fusion.cc index 523ffec5cc..135c963271 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/combine_momentum_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/combine_momentum_fusion.cc @@ -13,11 +13,11 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/combine_momentum_fusion.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/optimizer/combine_momentum_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/combine_momentum_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/combine_momentum_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/combine_momentum_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/combine_momentum_fusion.h index b348adc431..c43182737d 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/combine_momentum_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/combine_momentum_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/concat_outputs_for_all_gather.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/concat_outputs_for_all_gather.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/gpu/concat_outputs_for_all_gather.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/concat_outputs_for_all_gather.cc index f7ea32119a..d9f424ce09 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/concat_outputs_for_all_gather.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/concat_outputs_for_all_gather.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "backend/optimizer/gpu/concat_outputs_for_all_gather.h" +#include "plugin/device/gpu/optimizer/concat_outputs_for_all_gather.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore::opt { namespace { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/concat_outputs_for_all_gather.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/concat_outputs_for_all_gather.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/concat_outputs_for_all_gather.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/concat_outputs_for_all_gather.h index 24cfc891f2..46e5c2f8a9 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/concat_outputs_for_all_gather.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/concat_outputs_for_all_gather.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/cudnn_inplace_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/cudnn_inplace_fusion.cc similarity index 98% rename from mindspore/ccsrc/backend/optimizer/gpu/cudnn_inplace_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/cudnn_inplace_fusion.cc index b91f41c51a..8122235292 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/cudnn_inplace_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/cudnn_inplace_fusion.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/gpu/cudnn_inplace_fusion.h" +#include "plugin/device/gpu/optimizer/cudnn_inplace_fusion.h" #include #include @@ -25,12 +25,12 @@ #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "utils/contract.h" -#include "backend/optimizer/common/helper.h" -#include "runtime/device/gpu/kernel_info_setter.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/cudnn_inplace_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/cudnn_inplace_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/cudnn_inplace_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/cudnn_inplace_fusion.h index 3b36a49913..77b4b7bdc8 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/cudnn_inplace_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/cudnn_inplace_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_CUDNN_INPLACE_AGGREGATE_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/insert_cast_gpu.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/insert_cast_gpu.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/insert_cast_gpu.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/insert_cast_gpu.cc index 5630b8306e..06961cef30 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/insert_cast_gpu.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/insert_cast_gpu.cc @@ -13,15 +13,15 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/insert_cast_gpu.h" +#include "plugin/device/gpu/optimizer/insert_cast_gpu.h" #include #include #include #include "utils/hash_set.h" -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/gpu/insert_cast_gpu.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/insert_cast_gpu.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/insert_cast_gpu.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/insert_cast_gpu.h index 30c0e344b6..818cbf3278 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/insert_cast_gpu.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/insert_cast_gpu.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/insert_format_transform_op.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/insert_format_transform_op.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/insert_format_transform_op.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/insert_format_transform_op.cc index 89d0a7858d..bd2fc2e868 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/insert_format_transform_op.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/insert_format_transform_op.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "backend/optimizer/gpu/insert_format_transform_op.h" +#include "plugin/device/gpu/optimizer/insert_format_transform_op.h" #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "runtime/device/gpu/kernel_info_setter.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/insert_format_transform_op.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/insert_format_transform_op.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/insert_format_transform_op.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/insert_format_transform_op.h index 50e773ee2a..a68eda4bee 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/insert_format_transform_op.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/insert_format_transform_op.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/matmul_biasadd_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/matmul_biasadd_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/matmul_biasadd_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/matmul_biasadd_fusion.cc index 107f424e77..e8363c2470 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/matmul_biasadd_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/matmul_biasadd_fusion.cc @@ -13,16 +13,16 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/matmul_biasadd_fusion.h" +#include "plugin/device/gpu/optimizer/matmul_biasadd_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/matmul_biasadd_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/matmul_biasadd_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/matmul_biasadd_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/matmul_biasadd_fusion.h index b6150ffbef..dcf88dd7b6 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/matmul_biasadd_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/matmul_biasadd_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_MATMUL_BIASADD_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/neighbor_exchange_v2_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/neighbor_exchange_v2_fusion.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/gpu/neighbor_exchange_v2_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/neighbor_exchange_v2_fusion.cc index 050e775c8d..4237e41d73 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/neighbor_exchange_v2_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/neighbor_exchange_v2_fusion.cc @@ -14,18 +14,18 @@ * limitations under the License. */ -#include "backend/optimizer/gpu/neighbor_exchange_v2_fusion.h" +#include "plugin/device/gpu/optimizer/neighbor_exchange_v2_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "runtime/device/gpu/kernel_info_setter.h" -#include "backend/optimizer/common/helper.h" -#include "backend/kernel_compiler/gpu/nccl/nccl_gpu_kernel.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/gpu/kernel/nccl/nccl_gpu_kernel.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/neighbor_exchange_v2_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/neighbor_exchange_v2_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/neighbor_exchange_v2_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/neighbor_exchange_v2_fusion.h index b28d76e208..68536c0d22 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/neighbor_exchange_v2_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/neighbor_exchange_v2_fusion.h @@ -18,8 +18,8 @@ #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/post_batch_norm_add_relu_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.cc similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/post_batch_norm_add_relu_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.cc index 61f4de425c..c02bb0fb65 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/post_batch_norm_add_relu_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/post_batch_norm_add_relu_fusion.h" +#include "plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.h" #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" -#include "runtime/device/gpu/kernel_info_setter.h" +#include "backend/common/optimizer/helper.h" +#include "plugin/device/gpu/hal/device/kernel_info_setter.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/post_batch_norm_add_relu_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.h similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/post_batch_norm_add_relu_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.h index 8d2e4ecd32..e8ce546aa3 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/post_batch_norm_add_relu_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_POST_BATCH_NORM_ADD_RELU_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/print_reduce_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/print_reduce_fusion.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/print_reduce_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/print_reduce_fusion.cc index 95fce0c7d7..c8e96d71dd 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/print_reduce_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/print_reduce_fusion.cc @@ -13,16 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/print_reduce_fusion.h" +#include "plugin/device/gpu/optimizer/print_reduce_fusion.h" #include #include #include - -#include "backend/session/anf_runtime_algorithm.h" +#include +#include +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/print_reduce_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/print_reduce_fusion.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/gpu/print_reduce_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/print_reduce_fusion.h index 2c4f215295..4a8f953c0a 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/print_reduce_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/print_reduce_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_PRINT_REDUCE_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/reduce_precision_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/reduce_precision_fusion.cc similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/reduce_precision_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/reduce_precision_fusion.cc index 1855256fec..f2b18d9032 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/reduce_precision_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/reduce_precision_fusion.cc @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/reduce_precision_fusion.h" +#include "plugin/device/gpu/optimizer/reduce_precision_fusion.h" #include #include #include -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/gpu/reduce_precision_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/reduce_precision_fusion.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/reduce_precision_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/reduce_precision_fusion.h index fa4506bd65..504d6270e8 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/reduce_precision_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/reduce_precision_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/relu_v2_pass.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/relu_v2_pass.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/gpu/relu_v2_pass.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/relu_v2_pass.cc index a258f39a18..226918d1e2 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/relu_v2_pass.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/relu_v2_pass.cc @@ -13,17 +13,17 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/relu_v2_pass.h" +#include "plugin/device/gpu/optimizer/relu_v2_pass.h" #include #include #include #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" #include "abstract/abstract_value.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/relu_v2_pass.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/relu_v2_pass.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/relu_v2_pass.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/relu_v2_pass.h index abaa51d90c..e27be1c99a 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/relu_v2_pass.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/relu_v2_pass.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_RELU_V2_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/remove_format_transform_pair.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/remove_format_transform_pair.cc similarity index 93% rename from mindspore/ccsrc/backend/optimizer/gpu/remove_format_transform_pair.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/remove_format_transform_pair.cc index 4eea43ce84..c514612845 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/remove_format_transform_pair.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/remove_format_transform_pair.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "backend/optimizer/gpu/remove_format_transform_pair.h" +#include "plugin/device/gpu/optimizer/remove_format_transform_pair.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/remove_format_transform_pair.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/remove_format_transform_pair.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/remove_format_transform_pair.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/remove_format_transform_pair.h index 3ca197b237..92e781aec5 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/remove_format_transform_pair.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/remove_format_transform_pair.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_REMOVE_FORMAT_TRANSFORM_PAIR_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/remove_redundant_format_transform.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/remove_redundant_format_transform.cc similarity index 92% rename from mindspore/ccsrc/backend/optimizer/gpu/remove_redundant_format_transform.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/remove_redundant_format_transform.cc index 2777ef7fe8..54d6104086 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/remove_redundant_format_transform.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/remove_redundant_format_transform.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/gpu/remove_redundant_format_transform.h" +#include "plugin/device/gpu/optimizer/remove_redundant_format_transform.h" #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/remove_redundant_format_transform.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/remove_redundant_format_transform.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/gpu/remove_redundant_format_transform.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/remove_redundant_format_transform.h index 7679a55bd0..5ba6f8dabd 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/remove_redundant_format_transform.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/remove_redundant_format_transform.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_REMOVE_REDUNDANT_FORMAT_TRANSFORM_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/replace_addn_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/replace_addn_fusion.cc similarity index 90% rename from mindspore/ccsrc/backend/optimizer/gpu/replace_addn_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/replace_addn_fusion.cc index 6aa9af34d7..2c2c0da795 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/replace_addn_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/replace_addn_fusion.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/replace_addn_fusion.h" +#include "plugin/device/gpu/optimizer/replace_addn_fusion.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/replace_addn_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/replace_addn_fusion.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/replace_addn_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/replace_addn_fusion.h index d83da2b067..c91dac1eca 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/replace_addn_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/replace_addn_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_REPLACE_ADDN_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/replace_momentum_cast_fusion.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/replace_momentum_cast_fusion.cc similarity index 90% rename from mindspore/ccsrc/backend/optimizer/gpu/replace_momentum_cast_fusion.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/replace_momentum_cast_fusion.cc index 2655aa4c2b..02b9b69681 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/replace_momentum_cast_fusion.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/replace_momentum_cast_fusion.cc @@ -13,12 +13,12 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/gpu/replace_momentum_cast_fusion.h" +#include "plugin/device/gpu/optimizer/replace_momentum_cast_fusion.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/primitive.h" #include "utils/utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/gpu/replace_momentum_cast_fusion.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/replace_momentum_cast_fusion.h similarity index 94% rename from mindspore/ccsrc/backend/optimizer/gpu/replace_momentum_cast_fusion.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/replace_momentum_cast_fusion.h index f67033dcbe..dcb1ecbca2 100644 --- a/mindspore/ccsrc/backend/optimizer/gpu/replace_momentum_cast_fusion.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/replace_momentum_cast_fusion.h @@ -17,7 +17,7 @@ #define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_GPU_REPLACE_MOMENTUM_CAST_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/trt_pass/graph_converter.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_converter.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/trt_pass/graph_converter.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_converter.cc index 6831fd3c24..9e10d09524 100644 --- a/mindspore/ccsrc/backend/optimizer/trt_pass/graph_converter.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_converter.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/trt_pass/graph_converter.h" +#include "plugin/device/gpu/optimizer/trt_pass/graph_converter.h" #include #include @@ -26,10 +26,10 @@ #include #include "utils/hash_map.h" #include "utils/ms_context.h" -#include "backend/optimizer/trt_pass/trt_converter_context.h" +#include "plugin/device/gpu/optimizer/trt_pass/trt_converter_context.h" #include "utils/singleton.h" -#include "runtime/device/gpu/cuda_driver.h" -#include "runtime/device/gpu/trt_loader.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" +#include "plugin/device/gpu/hal/device/trt_loader.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/trt_pass/graph_converter.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_converter.h similarity index 95% rename from mindspore/ccsrc/backend/optimizer/trt_pass/graph_converter.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_converter.h index eeae33a870..79cd3ff222 100644 --- a/mindspore/ccsrc/backend/optimizer/trt_pass/graph_converter.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_converter.h @@ -19,8 +19,8 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/trt_pass/graph_partitioner.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/gpu/optimizer/trt_pass/graph_partitioner.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/trt_pass/graph_partitioner.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_partitioner.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/trt_pass/graph_partitioner.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_partitioner.cc index 293b5e7b05..5b1a68546a 100644 --- a/mindspore/ccsrc/backend/optimizer/trt_pass/graph_partitioner.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_partitioner.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/trt_pass/graph_partitioner.h" +#include "plugin/device/gpu/optimizer/trt_pass/graph_partitioner.h" #include #include @@ -26,9 +26,9 @@ #include "utils/hash_map.h" #include "utils/ms_context.h" #include "utils/trace_base.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/trt_pass/trt_op_factory.h" -#include "vm/segment_runner.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/optimizer/trt_pass/trt_op_factory.h" +#include "backend/graph_compiler/segment_runner.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/trt_pass/graph_partitioner.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_partitioner.h similarity index 98% rename from mindspore/ccsrc/backend/optimizer/trt_pass/graph_partitioner.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_partitioner.h index c664287b9d..ac52f05fc4 100644 --- a/mindspore/ccsrc/backend/optimizer/trt_pass/graph_partitioner.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/graph_partitioner.h @@ -22,7 +22,7 @@ #include #include #include "utils/hash_map.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/trt_pass/layer_input.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/layer_input.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/trt_pass/layer_input.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/layer_input.h diff --git a/mindspore/ccsrc/backend/optimizer/trt_pass/trt_converter_context.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_converter_context.cc similarity index 97% rename from mindspore/ccsrc/backend/optimizer/trt_pass/trt_converter_context.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_converter_context.cc index a563e62fea..bc469266ed 100644 --- a/mindspore/ccsrc/backend/optimizer/trt_pass/trt_converter_context.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_converter_context.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "backend/optimizer/trt_pass/trt_converter_context.h" +#include "plugin/device/gpu/optimizer/trt_pass/trt_converter_context.h" #include #include -#include "runtime/device/gpu/trt_loader.h" -#include "backend/optimizer/trt_pass/trt_op_factory.h" -#include "backend/kernel_compiler/gpu/trt/trt_utils.h" +#include "plugin/device/gpu/hal/device/trt_loader.h" +#include "plugin/device/gpu/optimizer/trt_pass/trt_op_factory.h" +#include "plugin/device/gpu/kernel/trt/trt_utils.h" #include "utils/convert_utils.h" #include "utils/utils.h" #include "utils/singleton.h" diff --git a/mindspore/ccsrc/backend/optimizer/trt_pass/trt_converter_context.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_converter_context.h similarity index 96% rename from mindspore/ccsrc/backend/optimizer/trt_pass/trt_converter_context.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_converter_context.h index f3aed3480e..a3a7322c85 100644 --- a/mindspore/ccsrc/backend/optimizer/trt_pass/trt_converter_context.h +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_converter_context.h @@ -26,8 +26,8 @@ #include "utils/hash_map.h" #include "base/base.h" #include "ir/anf.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/trt_pass/layer_input.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/gpu/optimizer/trt_pass/layer_input.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/trt_pass/trt_op_converter.cc b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_op_converter.cc similarity index 99% rename from mindspore/ccsrc/backend/optimizer/trt_pass/trt_op_converter.cc rename to mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_op_converter.cc index 040d25920f..4f5ddab1f9 100644 --- a/mindspore/ccsrc/backend/optimizer/trt_pass/trt_op_converter.cc +++ b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_op_converter.cc @@ -18,9 +18,9 @@ #include #include #include -#include "backend/optimizer/trt_pass/trt_converter_context.h" -#include "backend/optimizer/trt_pass/trt_op_factory.h" -#include "backend/kernel_compiler/gpu/trt/trt_utils.h" +#include "plugin/device/gpu/optimizer/trt_pass/trt_converter_context.h" +#include "plugin/device/gpu/optimizer/trt_pass/trt_op_factory.h" +#include "plugin/device/gpu/kernel/trt/trt_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/trt_pass/trt_op_factory.h b/mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_op_factory.h similarity index 100% rename from mindspore/ccsrc/backend/optimizer/trt_pass/trt_op_factory.h rename to mindspore/ccsrc/plugin/device/gpu/optimizer/trt_pass/trt_op_factory.h diff --git a/mindspore/ccsrc/profiler/device/ascend/ascend_profiling.cc b/mindspore/ccsrc/profiler/device/ascend/ascend_profiling.cc index 63cc2b3de8..f47f8ed458 100644 --- a/mindspore/ccsrc/profiler/device/ascend/ascend_profiling.cc +++ b/mindspore/ccsrc/profiler/device/ascend/ascend_profiling.cc @@ -21,7 +21,7 @@ #include "utils/log_adapter.h" #include "utils/utils.h" #include "profiler/device/ascend/memory_profiling.h" -#include "runtime/device/ascend/profiling/profiling_manager.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" #include "profiler/device/ascend/parallel_strategy_profiling.h" #include diff --git a/mindspore/ccsrc/profiler/device/gpu/gpu_profiling_utils.cc b/mindspore/ccsrc/profiler/device/gpu/gpu_profiling_utils.cc index b955c53c52..608fbba861 100644 --- a/mindspore/ccsrc/profiler/device/gpu/gpu_profiling_utils.cc +++ b/mindspore/ccsrc/profiler/device/gpu/gpu_profiling_utils.cc @@ -15,8 +15,8 @@ */ #include "profiler/device/gpu/gpu_profiling_utils.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "kernel/kernel.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_utils.h" #include "utils/ms_context.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/profiler/device/gpu/gpu_profiling_utils.h b/mindspore/ccsrc/profiler/device/gpu/gpu_profiling_utils.h index 87dbb1dfe7..4db3d23e6f 100644 --- a/mindspore/ccsrc/profiler/device/gpu/gpu_profiling_utils.h +++ b/mindspore/ccsrc/profiler/device/gpu/gpu_profiling_utils.h @@ -23,7 +23,7 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace profiler { diff --git a/mindspore/ccsrc/ps/optimizer_info.h b/mindspore/ccsrc/ps/optimizer_info.h index d1ae05453d..645e7dd573 100644 --- a/mindspore/ccsrc/ps/optimizer_info.h +++ b/mindspore/ccsrc/ps/optimizer_info.h @@ -19,7 +19,7 @@ #include #include -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #include "ps/constants.h" namespace mindspore { diff --git a/mindspore/ccsrc/ps/optimizer_info_builder.cc b/mindspore/ccsrc/ps/optimizer_info_builder.cc index 256c4d2573..2f24e9c6c0 100644 --- a/mindspore/ccsrc/ps/optimizer_info_builder.cc +++ b/mindspore/ccsrc/ps/optimizer_info_builder.cc @@ -18,7 +18,7 @@ #include #include #include -#include "backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h" +#include "plugin/device/cpu/kernel/ps/sparse_apply_ftrl_ps_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/ps/optimizer_info_builder.h b/mindspore/ccsrc/ps/optimizer_info_builder.h index eda6bcd806..72cc015c90 100644 --- a/mindspore/ccsrc/ps/optimizer_info_builder.h +++ b/mindspore/ccsrc/ps/optimizer_info_builder.h @@ -20,8 +20,8 @@ #include #include #include -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" +#include "kernel/kernel.h" +#include "plugin/device/cpu/kernel/ps/pserver_kernel.h" #include "ps/optimizer_info.h" namespace mindspore { diff --git a/mindspore/ccsrc/ps/parameter_server.h b/mindspore/ccsrc/ps/parameter_server.h index 59ff89c7df..116eec7832 100644 --- a/mindspore/ccsrc/ps/parameter_server.h +++ b/mindspore/ccsrc/ps/parameter_server.h @@ -35,22 +35,22 @@ #include "utils/hash_map.h" #include "ir/func_graph.h" -#include "backend/session/session_basic.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/session_factory.h" +#include "backend/common/session/session_basic.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/session_factory.h" #include "ps/optimizer_info.h" #include "ps/optimizer_info_builder.h" #include "ps/ps_context.h" -#include "runtime/device/cpu/kernel_select_cpu.h" +#include "plugin/device/cpu/hal/device/kernel_select_cpu.h" #include "utils/ms_context.h" -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" -#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h" -#include "backend/kernel_compiler/cpu/ps/sparse_apply_adam_ps_kernel.h" -#include "backend/kernel_compiler/cpu/ps/sparse_apply_lazy_adam_ps_kernel.h" -#include "backend/kernel_compiler/cpu/ps/sparse_apply_ftrl_ps_kernel.h" -#include "backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h" -#include "backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h" +#include "kernel/kernel.h" +#include "plugin/device/cpu/kernel/cpu_kernel_factory.h" +#include "plugin/device/cpu/kernel/ps/pserver_kernel.h" +#include "plugin/device/cpu/kernel/ps/sparse_apply_adam_ps_kernel.h" +#include "plugin/device/cpu/kernel/ps/sparse_apply_lazy_adam_ps_kernel.h" +#include "plugin/device/cpu/kernel/ps/sparse_apply_ftrl_ps_kernel.h" +#include "plugin/device/cpu/kernel/ps/apply_momentum_ps_kernel.h" +#include "plugin/device/cpu/kernel/ps/embedding_look_up_ps_kernel.h" #include "ps/ps_cache/ps_data/ps_data_prefetch.h" #include "ps/random_normal/random_normal.h" #include "distributed/persistent/data.h" diff --git a/mindspore/ccsrc/ps/ps_cache/ascend/ascend_ps_cache.cc b/mindspore/ccsrc/ps/ps_cache/ascend/ascend_ps_cache.cc index 4912a008aa..9fa4b5c18c 100644 --- a/mindspore/ccsrc/ps/ps_cache/ascend/ascend_ps_cache.cc +++ b/mindspore/ccsrc/ps/ps_cache/ascend/ascend_ps_cache.cc @@ -20,8 +20,8 @@ #include #include #include "ps/ps_cache/ps_cache_factory.h" -#include "runtime/device/ascend/ascend_memory_pool.h" -#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h" +#include "plugin/device/ascend/hal/device/ascend_memory_pool.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.h" #include "utils/ms_context.h" #include "proto/tensor.pb.h" #include "proto/tensor_shape.pb.h" diff --git a/mindspore/ccsrc/ps/ps_cache/ascend/ascend_ps_cache.h b/mindspore/ccsrc/ps/ps_cache/ascend/ascend_ps_cache.h index 5cdae1cff9..9762dd9cc8 100644 --- a/mindspore/ccsrc/ps/ps_cache/ascend/ascend_ps_cache.h +++ b/mindspore/ccsrc/ps/ps_cache/ascend/ascend_ps_cache.h @@ -22,7 +22,7 @@ #include #include #include "ps/ps_cache/ps_cache_basic.h" -#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_mod.h" #include "ir/dtype.h" #include "runtime/base.h" diff --git a/mindspore/ccsrc/ps/ps_cache/gpu/gpu_ps_cache.cc b/mindspore/ccsrc/ps/ps_cache/gpu/gpu_ps_cache.cc index d345a6f764..eb9687af39 100644 --- a/mindspore/ccsrc/ps/ps_cache/gpu/gpu_ps_cache.cc +++ b/mindspore/ccsrc/ps/ps_cache/gpu/gpu_ps_cache.cc @@ -16,10 +16,10 @@ #include "ps/ps_cache/gpu/gpu_ps_cache.h" #include "ps/ps_cache/ps_cache_factory.h" -#include "backend/kernel_compiler/gpu/cuda_impl/hash_impl.cuh" -#include "runtime/device/gpu/gpu_common.h" -#include "runtime/device/gpu/cuda_driver.h" -#include "runtime/device/gpu/gpu_memory_allocator.h" +#include "plugin/device/gpu/kernel/cuda_impl/hash_impl.cuh" +#include "plugin/device/gpu/hal/device/gpu_common.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" +#include "plugin/device/gpu/hal/device/gpu_memory_allocator.h" #include "utils/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/ps/ps_cache/ps_cache_manager.h b/mindspore/ccsrc/ps/ps_cache/ps_cache_manager.h index 8085b0723e..ab646536c0 100644 --- a/mindspore/ccsrc/ps/ps_cache/ps_cache_manager.h +++ b/mindspore/ccsrc/ps/ps_cache/ps_cache_manager.h @@ -26,7 +26,7 @@ #include #include #include "utils/ms_context.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #include "utils/shape_utils.h" #include "ir/tensor.h" #include "ps/constants.h" diff --git a/mindspore/ccsrc/ps/ps_context.cc b/mindspore/ccsrc/ps/ps_context.cc index 7b55f7a51c..8e194c6df1 100644 --- a/mindspore/ccsrc/ps/ps_context.cc +++ b/mindspore/ccsrc/ps/ps_context.cc @@ -17,7 +17,7 @@ #include "ps/ps_context.h" #include "utils/log_adapter.h" #include "utils/ms_utils.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #if ((defined ENABLE_CPU) && (!defined _WIN32)) #include "ps/ps_cache/ps_cache_manager.h" #include "ps/ps_cache/ps_data/ps_data_prefetch.h" diff --git a/mindspore/ccsrc/ps/util.h b/mindspore/ccsrc/ps/util.h index db2380e1b9..f68d55c206 100644 --- a/mindspore/ccsrc/ps/util.h +++ b/mindspore/ccsrc/ps/util.h @@ -24,9 +24,9 @@ #include "utils/hash_map.h" #include "ps/constants.h" #include "frontend/optimizer/optimizer.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/common_utils.h" -#include "backend/kernel_compiler/cpu/sparse_optimizer_cpu_kernel.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/common_utils.h" +#include "plugin/device/cpu/kernel/sparse_optimizer_cpu_kernel.h" namespace mindspore { namespace ps { diff --git a/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.cc b/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.cc index ced6c809eb..b683139ecd 100644 --- a/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.cc +++ b/mindspore/ccsrc/pybind_api/random_normal/random_cpu_kernel.cc @@ -15,7 +15,7 @@ */ #include "pybind_api/random_normal/random_cpu_kernel.h" -#include "runtime/device/cpu/cpu_device_address.h" +#include "plugin/device/cpu/hal/device/cpu_device_address.h" #include "ir/tensor.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/collective/CMakeLists.txt b/mindspore/ccsrc/runtime/collective/CMakeLists.txt new file mode 100644 index 0000000000..14cd310556 --- /dev/null +++ b/mindspore/ccsrc/runtime/collective/CMakeLists.txt @@ -0,0 +1,8 @@ +file(GLOB_RECURSE COLLECTIVE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") + +if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") + set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-abstract-non-virtual-dtor") +endif() + +set_property(SOURCE ${COLLECTIVE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) +add_library(_mindspore_runtime_collective_obj OBJECT ${COLLECTIVE_SRC_LIST}) diff --git a/mindspore/ccsrc/runtime/hardware/collective/collective_comm_lib_loader.cc b/mindspore/ccsrc/runtime/collective/collective_comm_lib_loader.cc similarity index 96% rename from mindspore/ccsrc/runtime/hardware/collective/collective_comm_lib_loader.cc rename to mindspore/ccsrc/runtime/collective/collective_comm_lib_loader.cc index 81726c7c94..856e166c8b 100644 --- a/mindspore/ccsrc/runtime/hardware/collective/collective_comm_lib_loader.cc +++ b/mindspore/ccsrc/runtime/collective/collective_comm_lib_loader.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware/collective/collective_comm_lib_loader.h" +#include "runtime/collective/collective_comm_lib_loader.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/collective/collective_comm_lib_loader.h b/mindspore/ccsrc/runtime/collective/collective_comm_lib_loader.h similarity index 96% rename from mindspore/ccsrc/runtime/hardware/collective/collective_comm_lib_loader.h rename to mindspore/ccsrc/runtime/collective/collective_comm_lib_loader.h index baf71b86f0..c310d58aa2 100644 --- a/mindspore/ccsrc/runtime/hardware/collective/collective_comm_lib_loader.h +++ b/mindspore/ccsrc/runtime/collective/collective_comm_lib_loader.h @@ -21,7 +21,7 @@ #include #include #include "utils/dlopen_macro.h" -#include "runtime/hardware/collective/collective_communication_lib.h" +#include "runtime/collective/collective_communication_lib.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/collective/collective_communication_lib.cc b/mindspore/ccsrc/runtime/collective/collective_communication_lib.cc similarity index 97% rename from mindspore/ccsrc/runtime/hardware/collective/collective_communication_lib.cc rename to mindspore/ccsrc/runtime/collective/collective_communication_lib.cc index b5ca9bfef3..3b23599517 100644 --- a/mindspore/ccsrc/runtime/hardware/collective/collective_communication_lib.cc +++ b/mindspore/ccsrc/runtime/collective/collective_communication_lib.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware/collective/collective_communication_lib.h" +#include "runtime/collective/collective_communication_lib.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/collective/collective_communication_lib.h b/mindspore/ccsrc/runtime/collective/collective_communication_lib.h similarity index 98% rename from mindspore/ccsrc/runtime/hardware/collective/collective_communication_lib.h rename to mindspore/ccsrc/runtime/collective/collective_communication_lib.h index 44078207e1..70e7103886 100644 --- a/mindspore/ccsrc/runtime/hardware/collective/collective_communication_lib.h +++ b/mindspore/ccsrc/runtime/collective/collective_communication_lib.h @@ -22,7 +22,7 @@ #include #include #include "ir/dtype/type_id.h" -#include "runtime/hardware/collective/communication_group.h" +#include "runtime/collective/communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/collective/communication_group.cc b/mindspore/ccsrc/runtime/collective/communication_group.cc similarity index 97% rename from mindspore/ccsrc/runtime/hardware/collective/communication_group.cc rename to mindspore/ccsrc/runtime/collective/communication_group.cc index a478a1a9d9..ea0a0184bb 100644 --- a/mindspore/ccsrc/runtime/hardware/collective/communication_group.cc +++ b/mindspore/ccsrc/runtime/collective/communication_group.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware/collective/communication_group.h" +#include "runtime/collective/communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/collective/communication_group.h b/mindspore/ccsrc/runtime/collective/communication_group.h similarity index 100% rename from mindspore/ccsrc/runtime/hardware/collective/communication_group.h rename to mindspore/ccsrc/runtime/collective/communication_group.h diff --git a/mindspore/ccsrc/runtime/device/CMakeLists.txt b/mindspore/ccsrc/runtime/device/CMakeLists.txt index 573a882f02..513200c04f 100644 --- a/mindspore/ccsrc/runtime/device/CMakeLists.txt +++ b/mindspore/ccsrc/runtime/device/CMakeLists.txt @@ -9,108 +9,10 @@ if("${ENABLE_HIDDEN}" STREQUAL "OFF") string(REPLACE " -fvisibility=hidden" " -fvisibility=default" CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}") endif() -if(ENABLE_GPU) - list(APPEND DEVICE_SRC_LIST "gpu/distribution/collective_init.cc") -else() - list(APPEND DEVICE_SRC_LIST "gpu/distribution/collective_fake_init.cc") -endif() - -if(ENABLE_D) - file(GLOB_RECURSE D_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "ascend/*.cc" "kernel_adjust.cc") - list(REMOVE_ITEM D_SRC_LIST "ascend/distribute/mpi_collective_group.cc" - "ascend/distribute/collective_group_wrapper.cc" "ascend/distribute/mpi_pycc.cc") -endif() if(ENABLE_TDTQUE) file(GLOB_RECURSE TDT_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../../minddata/dataset/engine/tdt/tdt_handle.cc") endif() -if(ENABLE_CPU) - file(GLOB_RECURSE CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "cpu/*.cc") - list(REMOVE_ITEM CPU_SRC_LIST "cpu/mpi/mpi_adapter.cc" "cpu/mpi/mpi_export.cc") -endif() - -if(ENABLE_MPI) - if(ENABLE_CPU) - file(GLOB_RECURSE MPI_SRC_LIST "cpu/mpi/mpi_adapter.cc" "cpu/mpi/mpi_export.cc") - set_property(SOURCE ${MPI_SRC_LIST} - PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) - add_library(mpi_adapter SHARED ${MPI_SRC_LIST}) - target_link_libraries(mpi_adapter PRIVATE mindspore::ompi mindspore::pybind11_module -ldl ${SECUREC_LIBRARY}) - endif() - - if(ENABLE_GPU) - set_property(SOURCE "gpu/mpi/mpi_initializer.cc" - PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) - pybind11_add_module(_ms_mpi NO_EXTRAS "gpu/mpi/mpi_initializer.cc") - target_link_libraries(_ms_mpi PRIVATE mindspore::pybind11_module mindspore::ompi) - endif() - - if(ENABLE_D) - set_property(SOURCE "ascend/distribute/mpi_pycc.cc" - PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) - pybind11_add_module(_ascend_mpi "ascend/distribute/mpi_pycc.cc") - target_link_libraries(_ascend_mpi PRIVATE mindspore::pybind11_module mindspore::ompi) - endif() -endif() - -# gpu -if(ENABLE_GPU) - file(GLOB_RECURSE CUDA_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "gpu/*.cc" "gpu/*.cu") - - set(GPU_QUEUE_SRCS "gpu/blocking_queue.cc" "gpu/gpu_buffer_mgr.cc") - set(GPU_COLLECTIVE_SRCS "gpu/distribution/collective_wrapper.cc" - "gpu/distribution/mpi_wrapper.cc" - "gpu/distribution/nccl_wrapper.cc") - - # gpu_queue - list(REMOVE_ITEM CUDA_SRC_LIST ${GPU_QUEUE_SRCS}) - set_property(SOURCE ${GPU_QUEUE_SRCS} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) - add_library(gpu_queue SHARED ${GPU_QUEUE_SRCS}) - target_link_libraries(gpu_queue ${CMAKE_THREAD_LIBS_INIT} ${CUDA_PATH}/lib64/libcudart.so) - - list(REMOVE_ITEM CUDA_SRC_LIST "gpu/mpi/mpi_initializer.cc" ${GPU_COLLECTIVE_SRCS}) - - if(ENABLE_MPI) - include(ExternalProject) - # gpu_collective - set_property(SOURCE ${GPU_COLLECTIVE_SRCS} - PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) - add_library(gpu_collective SHARED ${GPU_COLLECTIVE_SRCS}) - target_link_libraries(gpu_collective PRIVATE mindspore::ompi mindspore::nccl) - target_link_libraries(_ms_mpi PRIVATE gpu_collective) - endif() - - # add_library(_mindspore_device_cuda_obj OBJECT ${CUDA_SRC_LIST}) -endif() - -list(REMOVE_ITEM D_SRC_LIST "ascend/profiling/profiling_callback_register.cc") - -if(ENABLE_SECURITY) - list(REMOVE_ITEM D_SRC_LIST "ascend/profiling/profiling_callback_register.cc") - list(REMOVE_ITEM D_SRC_LIST "ascend/profiling/profiling_manager.cc") - list(REMOVE_ITEM D_SRC_LIST "ascend/profiling/profiling_utils.cc") -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_runtime_device_obj OBJECT ${DEVICE_SRC_LIST} ${D_SRC_LIST} ${CPU_SRC_LIST} ${TDT_SRC_LIST}) -if(ENABLE_D) - file(GLOB_RECURSE GE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "ascend/ge_runtime/*.cc") - set_property(SOURCE ${GE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_GE) - target_include_directories(_mindspore_runtime_device_obj PRIVATE ${CMAKE_BINARY_DIR}/proto/ge) - add_dependencies(_mindspore_runtime_device_obj graph) - if(ENABLE_MPI) - set(ASCEND_PATH /usr/local/Ascend) - set(ASCEND_TOOLKIT_RUNTIME_PATH ${ASCEND_PATH}/ascend-toolkit/latest/fwkacllib/lib64) - set(ASCEND_RUNTIME_PATH ${ASCEND_PATH}/fwkacllib/lib64) - find_library(HCCL hccl ${ASCEND_RUNTIME_PATH} ${ASCEND_TOOLKIT_RUNTIME_PATH}) - file(GLOB_RECURSE ASCEND_COLLECTIVE_LIST "ascend/distribute/mpi_collective_group.cc" - "ascend/distribute/collective_group_wrapper.cc") - set_property(SOURCE ${ASCEND_COLLECTIVE_LIST} - PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) - add_library(ascend_collective SHARED ${ASCEND_COLLECTIVE_LIST}) - target_link_libraries(ascend_collective PRIVATE ${HCCL} mindspore::ompi) - target_link_libraries(_ascend_mpi PRIVATE ascend_collective) - endif() -endif() +set_property(SOURCE ${DEVICE_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) +add_library(_mindspore_runtime_device_obj OBJECT ${DEVICE_SRC_LIST} ${TDT_SRC_LIST}) diff --git a/mindspore/ccsrc/runtime/device/bucket.h b/mindspore/ccsrc/runtime/device/bucket.h index 85e64df351..ee4dc1f4be 100644 --- a/mindspore/ccsrc/runtime/device/bucket.h +++ b/mindspore/ccsrc/runtime/device/bucket.h @@ -25,7 +25,7 @@ #include "ir/device_event.h" #include "runtime/device/launch_kernel.h" #include "runtime/device/device_address.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::device { class Bucket { diff --git a/mindspore/ccsrc/runtime/device/executor/dynamic_kernel.cc b/mindspore/ccsrc/runtime/device/executor/dynamic_kernel.cc index 06686fa7d0..2ff0be6c86 100644 --- a/mindspore/ccsrc/runtime/device/executor/dynamic_kernel.cc +++ b/mindspore/ccsrc/runtime/device/executor/dynamic_kernel.cc @@ -18,8 +18,8 @@ #include #include #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" #include "utils/ms_device_shape_transfer.h" #include "pipeline/jit/static_analysis/static_analysis.h" #include "abstract/dshape.h" diff --git a/mindspore/ccsrc/runtime/device/kernel_adjust.cc b/mindspore/ccsrc/runtime/device/kernel_adjust.cc index 6c1429de93..e36815ad0b 100644 --- a/mindspore/ccsrc/runtime/device/kernel_adjust.cc +++ b/mindspore/ccsrc/runtime/device/kernel_adjust.cc @@ -22,16 +22,16 @@ #include #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_context.h" #include "utils/ms_device_shape_transfer.h" #include "utils/config_manager.h" #include "utils/ms_utils.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "kernel/kernel_build_info.h" #include "utils/utils.h" -#include "runtime/device/ascend/profiling/profiling_manager.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_manager.h" #include "runtime/base.h" -#include "runtime/device/ascend/ascend_stream_manager.h" +#include "plugin/device/ascend/hal/device/ascend_stream_manager.h" #include "utils/shape_utils.h" #ifndef ENABLE_SECURITY #include "debug/data_dump/dump_json_parser.h" diff --git a/mindspore/ccsrc/runtime/device/kernel_adjust.h b/mindspore/ccsrc/runtime/device/kernel_adjust.h index 87b9e8ef6f..e50c84b168 100644 --- a/mindspore/ccsrc/runtime/device/kernel_adjust.h +++ b/mindspore/ccsrc/runtime/device/kernel_adjust.h @@ -23,15 +23,15 @@ #include #include #include "ir/anf.h" -#include "backend/session/kernel_graph.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/session/session_context.h" +#include "backend/common/session/kernel_graph.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/session/session_context.h" #include "ir/tensor.h" #include "runtime/device/kernel_info.h" #include "runtime/device/kernel_runtime_manager.h" #ifndef ENABLE_SECURITY -#include "runtime/device/ascend/profiling/profiling_utils.h" +#include "plugin/device/ascend/hal/device/profiling/profiling_utils.h" using mindspore::device::ascend::ProfilingTraceInfo; using mindspore::device::ascend::ProfilingUtils; #endif diff --git a/mindspore/ccsrc/runtime/device/kernel_info.h b/mindspore/ccsrc/runtime/device/kernel_info.h index 5483003e57..670b45c3d4 100644 --- a/mindspore/ccsrc/runtime/device/kernel_info.h +++ b/mindspore/ccsrc/runtime/device/kernel_info.h @@ -20,9 +20,9 @@ #include #include #include "ir/kernel_info_dev.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "runtime/device/ascend/ascend_device_address.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel_build_info.h" +#include "plugin/device/ascend/hal/device/ascend_device_address.h" +#include "kernel/kernel.h" namespace mindspore { const uint32_t kInvalidGraphId = UINT32_MAX; diff --git a/mindspore/ccsrc/runtime/device/kernel_runtime.cc b/mindspore/ccsrc/runtime/device/kernel_runtime.cc index 2268acd27e..175bc5fba1 100644 --- a/mindspore/ccsrc/runtime/device/kernel_runtime.cc +++ b/mindspore/ccsrc/runtime/device/kernel_runtime.cc @@ -19,9 +19,9 @@ #include #include #include -#include "backend/optimizer/common/helper.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/optimizer/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" #include "utils/ms_device_shape_transfer.h" #include "debug/data_dump/dump_json_parser.h" #include "frontend/operator/ops.h" diff --git a/mindspore/ccsrc/runtime/device/kernel_runtime.h b/mindspore/ccsrc/runtime/device/kernel_runtime.h index eee04a3c79..4ae6ca7627 100644 --- a/mindspore/ccsrc/runtime/device/kernel_runtime.h +++ b/mindspore/ccsrc/runtime/device/kernel_runtime.h @@ -28,9 +28,9 @@ #ifdef ENABLE_DEBUGGER #include "debug/debugger/debugger.h" #endif -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/kernel.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/kernel.h" #include "utils/ms_context.h" #include "runtime/device/memory_manager.h" #include "runtime/device/memory_scheduler.h" diff --git a/mindspore/ccsrc/runtime/device/kernel_runtime_manager.cc b/mindspore/ccsrc/runtime/device/kernel_runtime_manager.cc index 6a55938af1..8c4945da7c 100644 --- a/mindspore/ccsrc/runtime/device/kernel_runtime_manager.cc +++ b/mindspore/ccsrc/runtime/device/kernel_runtime_manager.cc @@ -19,7 +19,7 @@ #if ((defined ENABLE_CPU) && (!defined _WIN32)) #include "ps/ps_cache/ps_cache_manager.h" #endif -#include "backend/session/pynative_task_manager.h" +#include "backend/common/session/pynative_task_manager.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/launch_kernel.h b/mindspore/ccsrc/runtime/device/launch_kernel.h index 302fdf7e86..8639b42a8e 100644 --- a/mindspore/ccsrc/runtime/device/launch_kernel.h +++ b/mindspore/ccsrc/runtime/device/launch_kernel.h @@ -19,7 +19,7 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::device { class LaunchKernel { diff --git a/mindspore/ccsrc/runtime/device/launch_mul.cc b/mindspore/ccsrc/runtime/device/launch_mul.cc index 2f6fda8e30..803ff627ce 100644 --- a/mindspore/ccsrc/runtime/device/launch_mul.cc +++ b/mindspore/ccsrc/runtime/device/launch_mul.cc @@ -16,7 +16,7 @@ #include "runtime/device/launch_mul.h" #include "abstract/utils.h" -#include "backend/session/single_kernel_graph.h" +#include "backend/common/session/single_kernel_graph.h" #include "frontend/parallel/context.h" namespace mindspore::device { diff --git a/mindspore/ccsrc/runtime/device/launch_mul.h b/mindspore/ccsrc/runtime/device/launch_mul.h index c53858abfd..e06b6b3ae1 100644 --- a/mindspore/ccsrc/runtime/device/launch_mul.h +++ b/mindspore/ccsrc/runtime/device/launch_mul.h @@ -19,7 +19,7 @@ #include #include -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore::device { class LaunchMul { diff --git a/mindspore/ccsrc/runtime/device/memory_manager.cc b/mindspore/ccsrc/runtime/device/memory_manager.cc index 88b9ddb97b..cc76782a39 100644 --- a/mindspore/ccsrc/runtime/device/memory_manager.cc +++ b/mindspore/ccsrc/runtime/device/memory_manager.cc @@ -16,7 +16,7 @@ #include "runtime/device/memory_manager.h" #include -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "debug/common.h" #ifdef ENABLE_DUMP_IR #include "debug/rdr/running_data_recorder.h" diff --git a/mindspore/ccsrc/runtime/device/memory_manager.h b/mindspore/ccsrc/runtime/device/memory_manager.h index f6cd8cd377..ea445de446 100644 --- a/mindspore/ccsrc/runtime/device/memory_manager.h +++ b/mindspore/ccsrc/runtime/device/memory_manager.h @@ -21,8 +21,8 @@ #include #include #include -#include "backend/optimizer/mem_reuse/mem_reuse.h" -#include "backend/optimizer/somas/somas.h" +#include "common/mem_reuse/mem_reuse.h" +#include "backend/common/somas/somas.h" #include "runtime/device/memory_scheduler.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/tensor_array.h b/mindspore/ccsrc/runtime/device/tensor_array.h index 84f969251f..6281a5f770 100644 --- a/mindspore/ccsrc/runtime/device/tensor_array.h +++ b/mindspore/ccsrc/runtime/device/tensor_array.h @@ -20,9 +20,9 @@ #include #include #include -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/kernel.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/kernel.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/tensor_array_manager.h b/mindspore/ccsrc/runtime/device/tensor_array_manager.h index ddaeaff06f..fa1c0e0dab 100644 --- a/mindspore/ccsrc/runtime/device/tensor_array_manager.h +++ b/mindspore/ccsrc/runtime/device/tensor_array_manager.h @@ -22,8 +22,8 @@ #include #include #include -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/tensor_array.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/CMakeLists.txt b/mindspore/ccsrc/runtime/graph_scheduler/CMakeLists.txt similarity index 50% rename from mindspore/ccsrc/runtime/framework/CMakeLists.txt rename to mindspore/ccsrc/runtime/graph_scheduler/CMakeLists.txt index 03300454d0..ad648546ed 100644 --- a/mindspore/ccsrc/runtime/framework/CMakeLists.txt +++ b/mindspore/ccsrc/runtime/graph_scheduler/CMakeLists.txt @@ -1,8 +1,8 @@ include_directories(${CMAKE_SOURCE_DIR}/mindspore/core/mindrt/include) include_directories(${CMAKE_SOURCE_DIR}/mindspore/core/mindrt/src) -file(GLOB_RECURSE FRAMEWORK_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") +file(GLOB_RECURSE GRAPH_SCHEDULER_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") -set_property(SOURCE ${FRAMEWORK_SRC_LIST} +set_property(SOURCE ${GRAPH_SCHEDULER_SRC_LIST} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_RUNTIME_FRAMEWORK) -add_library(_mindspore_runtime_framework_obj OBJECT ${FRAMEWORK_SRC_LIST}) \ No newline at end of file +add_library(_mindspore_runtime_graph_scheduler_obj OBJECT ${GRAPH_SCHEDULER_SRC_LIST}) \ No newline at end of file diff --git a/mindspore/ccsrc/runtime/framework/actor/abstract_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/abstract_actor.cc similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/abstract_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/abstract_actor.cc index b55f4786ad..3d91359446 100644 --- a/mindspore/ccsrc/runtime/framework/actor/abstract_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/abstract_actor.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/framework/actor/abstract_actor.h" -#include "runtime/framework/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/abstract_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/abstract_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/abstract_actor.h similarity index 96% rename from mindspore/ccsrc/runtime/framework/actor/abstract_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/abstract_actor.h index 853af92828..bf795f8e3b 100644 --- a/mindspore/ccsrc/runtime/framework/actor/abstract_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/abstract_actor.h @@ -23,9 +23,9 @@ #include #include #include "mindrt/include/actor/op_actor.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/device_tensor_store.h" -#include "runtime/framework/device_tensor_copy_store.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/device_tensor_store.h" +#include "runtime/graph_scheduler/device_tensor_copy_store.h" #include "runtime/hardware/device_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/actor_common.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_common.cc similarity index 99% rename from mindspore/ccsrc/runtime/framework/actor/actor_common.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/actor_common.cc index 514d1de5f6..7f2798ee0c 100644 --- a/mindspore/ccsrc/runtime/framework/actor/actor_common.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_common.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/device_tensor_store.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/device_tensor_store.h" #include "utils/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/actor_common.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_common.h similarity index 99% rename from mindspore/ccsrc/runtime/framework/actor/actor_common.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/actor_common.h index 74544bee9f..6cddcf24d3 100644 --- a/mindspore/ccsrc/runtime/framework/actor/actor_common.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_common.h @@ -26,8 +26,8 @@ #include "utils/hash_map.h" #include "mindrt/include/actor/op_actor.h" #include "runtime/device/device_address.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" #include "utils/log_adapter.h" #include "ir/tensor.h" #include "utils/ms_device_shape_transfer.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/actor_dump.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_dump.cc similarity index 99% rename from mindspore/ccsrc/runtime/framework/actor/actor_dump.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/actor_dump.cc index b4eab17481..5719c8de00 100644 --- a/mindspore/ccsrc/runtime/framework/actor/actor_dump.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_dump.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/framework/actor/actor_dump.h" +#include "runtime/graph_scheduler/actor/actor_dump.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/actor_dump.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_dump.h similarity index 64% rename from mindspore/ccsrc/runtime/framework/actor/actor_dump.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/actor_dump.h index 385d063afe..38a6d22414 100644 --- a/mindspore/ccsrc/runtime/framework/actor/actor_dump.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_dump.h @@ -22,22 +22,22 @@ #include #include #include -#include "runtime/framework/actor/abstract_actor.h" -#include "runtime/framework/actor/data_prepare_actor.h" -#include "runtime/framework/actor/data_source_actor.h" -#include "runtime/framework/actor/loop_count_actor.h" -#include "runtime/framework/actor/kernel_actor.h" -#include "runtime/framework/actor/super_kernel_actor.h" -#include "runtime/framework/actor/output_actor.h" -#include "runtime/framework/actor/copy_actor.h" -#include "runtime/framework/actor/custom_actor.h" -#include "runtime/framework/actor/control_flow/control_actor.h" -#include "runtime/framework/actor/control_flow/switch_actor.h" -#include "runtime/framework/actor/control_flow/gather_actor.h" -#include "runtime/framework/actor/control_flow/entrance_actor.h" -#include "runtime/framework/actor/control_flow/exit_actor.h" -#include "runtime/framework/actor/control_flow/stack_actor.h" -#include "runtime/framework/control_node_scheduler.h" +#include "runtime/graph_scheduler/actor/abstract_actor.h" +#include "runtime/graph_scheduler/actor/data_prepare_actor.h" +#include "runtime/graph_scheduler/actor/data_source_actor.h" +#include "runtime/graph_scheduler/actor/loop_count_actor.h" +#include "runtime/graph_scheduler/actor/kernel_actor.h" +#include "runtime/graph_scheduler/actor/super_kernel_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/copy_actor.h" +#include "runtime/graph_scheduler/actor/custom_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/control_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/switch_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/gather_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/entrance_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/exit_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/stack_actor.h" +#include "runtime/graph_scheduler/control_node_scheduler.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/actor_set.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_set.cc similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/actor_set.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/actor_set.cc index cea88f1a30..c577f8cb20 100644 --- a/mindspore/ccsrc/runtime/framework/actor/actor_set.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_set.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/framework/actor/actor_set.h" +#include "runtime/graph_scheduler/actor/actor_set.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/actor_set.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_set.h similarity index 83% rename from mindspore/ccsrc/runtime/framework/actor/actor_set.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/actor_set.h index c466a40221..2bf4c2b1b6 100644 --- a/mindspore/ccsrc/runtime/framework/actor/actor_set.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/actor_set.h @@ -24,22 +24,22 @@ #include #include #include -#include "runtime/framework/actor/abstract_actor.h" -#include "runtime/framework/actor/data_prepare_actor.h" -#include "runtime/framework/actor/data_source_actor.h" -#include "runtime/framework/actor/loop_count_actor.h" -#include "runtime/framework/actor/kernel_actor.h" -#include "runtime/framework/actor/custom_actor.h" -#include "runtime/framework/actor/rpc/send_actor.h" -#include "runtime/framework/actor/rpc/recv_actor.h" -#include "runtime/framework/actor/super_kernel_actor.h" -#include "runtime/framework/actor/output_actor.h" -#include "runtime/framework/actor/copy_actor.h" -#include "runtime/framework/actor/control_flow/switch_actor.h" -#include "runtime/framework/actor/control_flow/gather_actor.h" -#include "runtime/framework/actor/control_flow/entrance_actor.h" -#include "runtime/framework/actor/control_flow/exit_actor.h" -#include "runtime/framework/actor/control_flow/stack_actor.h" +#include "runtime/graph_scheduler/actor/abstract_actor.h" +#include "runtime/graph_scheduler/actor/data_prepare_actor.h" +#include "runtime/graph_scheduler/actor/data_source_actor.h" +#include "runtime/graph_scheduler/actor/loop_count_actor.h" +#include "runtime/graph_scheduler/actor/kernel_actor.h" +#include "runtime/graph_scheduler/actor/custom_actor.h" +#include "runtime/graph_scheduler/actor/rpc/send_actor.h" +#include "runtime/graph_scheduler/actor/rpc/recv_actor.h" +#include "runtime/graph_scheduler/actor/super_kernel_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/copy_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/switch_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/gather_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/entrance_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/exit_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/stack_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/control_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/control_actor.cc similarity index 99% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/control_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/control_actor.cc index 291cf91c26..1b20128e2b 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/control_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/control_actor.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/framework/actor/control_flow/control_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/control_actor.h" #include "runtime/hardware/device_context_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/control_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/control_actor.h similarity index 96% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/control_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/control_actor.h index f453e8ad81..002509e20a 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/control_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/control_actor.h @@ -27,10 +27,10 @@ #include #include #include -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/abstract_actor.h" -#include "runtime/framework/actor/memory_aware_actor.h" -#include "runtime/framework/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/abstract_actor.h" +#include "runtime/graph_scheduler/actor/memory_aware_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/entrance_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/entrance_actor.cc similarity index 98% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/entrance_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/entrance_actor.cc index 97e3769eba..a037ca5eb2 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/entrance_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/entrance_actor.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/framework/actor/control_flow/entrance_actor.h" -#include "runtime/framework/actor/control_flow/exit_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/entrance_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/exit_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/entrance_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/entrance_actor.h similarity index 96% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/entrance_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/entrance_actor.h index ca3edc6320..2ffd4dfd19 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/entrance_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/entrance_actor.h @@ -25,8 +25,8 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/control_flow/control_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/control_flow/control_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/exit_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/exit_actor.cc similarity index 98% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/exit_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/exit_actor.cc index 323dd26c62..55b3d053ad 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/exit_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/exit_actor.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/framework/actor/control_flow/exit_actor.h" -#include "runtime/framework/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/exit_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/exit_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/exit_actor.h similarity index 96% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/exit_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/exit_actor.h index c57aae6238..fc47f9cdbc 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/exit_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/exit_actor.h @@ -23,8 +23,8 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/control_flow/control_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/control_flow/control_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/gather_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/gather_actor.cc similarity index 98% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/gather_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/gather_actor.cc index da6b35587d..2f31093011 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/gather_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/gather_actor.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/framework/actor/control_flow/gather_actor.h" -#include "runtime/framework/actor/control_flow/entrance_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/gather_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/entrance_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/gather_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/gather_actor.h similarity index 95% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/gather_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/gather_actor.h index a2eda5fe57..54dd91ffab 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/gather_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/gather_actor.h @@ -24,8 +24,8 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/control_flow/control_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/control_flow/control_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/stack_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/stack_actor.cc similarity index 98% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/stack_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/stack_actor.cc index 1ce1e32b77..7323ce4f8f 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/stack_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/stack_actor.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/framework/actor/control_flow/stack_actor.h" -#include "runtime/framework/actor/memory_manager_actor.h" -#include "runtime/framework/control_node_parser.h" +#include "runtime/graph_scheduler/actor/control_flow/stack_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/control_node_parser.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/stack_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/stack_actor.h similarity index 96% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/stack_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/stack_actor.h index 6af4cd89c9..f7dc5bc1f4 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/stack_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/stack_actor.h @@ -24,8 +24,8 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/control_flow/control_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/control_flow/control_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/switch_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/switch_actor.cc similarity index 95% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/switch_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/switch_actor.cc index f67cfc7eac..64e11fe0b9 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/switch_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/switch_actor.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "runtime/framework/actor/control_flow/switch_actor.h" -#include "runtime/framework/actor/control_flow/entrance_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/switch_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/entrance_actor.h" #include "abstract/utils.h" -#include "runtime/framework/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/control_flow/switch_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/switch_actor.h similarity index 93% rename from mindspore/ccsrc/runtime/framework/actor/control_flow/switch_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/switch_actor.h index fa5db17cab..64d078aad4 100644 --- a/mindspore/ccsrc/runtime/framework/actor/control_flow/switch_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/control_flow/switch_actor.h @@ -21,8 +21,8 @@ #include #include #include -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/control_flow/control_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/control_flow/control_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/copy_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/copy_actor.cc similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/copy_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/copy_actor.cc index 4ca5fc8f17..08397ffd99 100644 --- a/mindspore/ccsrc/runtime/framework/actor/copy_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/copy_actor.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/framework/actor/copy_actor.h" -#include "runtime/framework/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/copy_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" #include "mindrt/include/async/async.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/copy_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/copy_actor.h similarity index 94% rename from mindspore/ccsrc/runtime/framework/actor/copy_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/copy_actor.h index 66fb57962b..b515a79f6c 100644 --- a/mindspore/ccsrc/runtime/framework/actor/copy_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/copy_actor.h @@ -22,10 +22,10 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/memory_aware_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/memory_aware_actor.h" #include "runtime/hardware/device_context.h" -#include "runtime/framework/device_tensor_store.h" +#include "runtime/graph_scheduler/device_tensor_store.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/custom_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/custom_actor.cc similarity index 92% rename from mindspore/ccsrc/runtime/framework/actor/custom_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/custom_actor.cc index c22f21ea94..2088bf57e7 100644 --- a/mindspore/ccsrc/runtime/framework/actor/custom_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/custom_actor.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/framework/actor/custom_actor.h" -#include "runtime/framework/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/custom_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/custom_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/custom_actor.h similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/custom_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/custom_actor.h index 7cdee2da12..9726503286 100644 --- a/mindspore/ccsrc/runtime/framework/actor/custom_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/custom_actor.h @@ -19,7 +19,7 @@ #include #include -#include "runtime/framework/actor/abstract_actor.h" +#include "runtime/graph_scheduler/actor/abstract_actor.h" #include "runtime/hardware/device_context.h" #include "ir/anf.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/data_prepare_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/data_prepare_actor.cc similarity index 99% rename from mindspore/ccsrc/runtime/framework/actor/data_prepare_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/data_prepare_actor.cc index 3913a89b33..f2ebea0b3c 100644 --- a/mindspore/ccsrc/runtime/framework/actor/data_prepare_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/data_prepare_actor.cc @@ -16,11 +16,11 @@ #include -#include "runtime/framework/actor/data_prepare_actor.h" -#include "runtime/framework/actor/memory_manager_actor.h" -#include "runtime/framework/actor/kernel_actor.h" -#include "runtime/framework/actor/loop_count_actor.h" -#include "runtime/framework/actor/debug_actor.h" +#include "runtime/graph_scheduler/actor/data_prepare_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/kernel_actor.h" +#include "runtime/graph_scheduler/actor/loop_count_actor.h" +#include "runtime/graph_scheduler/actor/debug_actor.h" #include "runtime/hardware/device_context_manager.h" #include "mindrt/include/async/async.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/data_prepare_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/data_prepare_actor.h similarity index 95% rename from mindspore/ccsrc/runtime/framework/actor/data_prepare_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/data_prepare_actor.h index 71ec8cb870..bc4ac2e334 100644 --- a/mindspore/ccsrc/runtime/framework/actor/data_prepare_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/data_prepare_actor.h @@ -23,11 +23,11 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/graph_compiler.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/data_source_actor.h" -#include "runtime/framework/actor/debug_aware_actor.h" -#include "runtime/framework/device_tensor_store.h" +#include "runtime/graph_scheduler/graph_compiler.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/data_source_actor.h" +#include "runtime/graph_scheduler/actor/debug_aware_actor.h" +#include "runtime/graph_scheduler/device_tensor_store.h" #include "runtime/hardware/device_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/data_source_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/data_source_actor.cc similarity index 96% rename from mindspore/ccsrc/runtime/framework/actor/data_source_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/data_source_actor.cc index bb6fac232e..56b920936e 100644 --- a/mindspore/ccsrc/runtime/framework/actor/data_source_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/data_source_actor.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "runtime/framework/actor/data_source_actor.h" -#include "runtime/framework/actor/kernel_actor.h" -#include "runtime/framework/actor/memory_manager_actor.h" -#include "runtime/framework/actor/output_actor.h" -#include "runtime/framework/actor/recorder_actor.h" -#include "runtime/framework/actor/debug_actor.h" +#include "runtime/graph_scheduler/actor/data_source_actor.h" +#include "runtime/graph_scheduler/actor/kernel_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/recorder_actor.h" +#include "runtime/graph_scheduler/actor/debug_actor.h" #include "mindrt/include/async/async.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/data_source_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/data_source_actor.h similarity index 96% rename from mindspore/ccsrc/runtime/framework/actor/data_source_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/data_source_actor.h index c7ada9adbd..d2f663870e 100644 --- a/mindspore/ccsrc/runtime/framework/actor/data_source_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/data_source_actor.h @@ -23,11 +23,11 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/debug_aware_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/debug_aware_actor.h" #include "runtime/hardware/device_context.h" -#include "runtime/framework/device_tensor_store.h" -#include "runtime/framework/host_tensor_queue.h" +#include "runtime/graph_scheduler/device_tensor_store.h" +#include "runtime/graph_scheduler/host_tensor_queue.h" #include "base/base.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/debug_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/debug_actor.cc similarity index 98% rename from mindspore/ccsrc/runtime/framework/actor/debug_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/debug_actor.cc index 7998b2b461..f04a7bafb1 100644 --- a/mindspore/ccsrc/runtime/framework/actor/debug_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/debug_actor.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "runtime/framework/actor/debug_actor.h" +#include "runtime/graph_scheduler/actor/debug_actor.h" #include #include #include -#include "runtime/framework/actor/debug_aware_actor.h" +#include "runtime/graph_scheduler/actor/debug_aware_actor.h" #include "mindrt/include/async/async.h" #include "utils/log_adapter.h" #ifndef ENABLE_SECURITY diff --git a/mindspore/ccsrc/runtime/framework/actor/debug_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/debug_actor.h similarity index 95% rename from mindspore/ccsrc/runtime/framework/actor/debug_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/debug_actor.h index 5477d18796..e2ec81cc9f 100644 --- a/mindspore/ccsrc/runtime/framework/actor/debug_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/debug_actor.h @@ -18,8 +18,8 @@ #define MINDSPORE_CCSRC_RUNTIME_FRAMEWORK_ACTOR_DEBUG_ACTOR_H_ #include -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/device_tensor_store.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/device_tensor_store.h" #include "runtime/hardware/device_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/debug_aware_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/debug_aware_actor.h similarity index 96% rename from mindspore/ccsrc/runtime/framework/actor/debug_aware_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/debug_aware_actor.h index 86dcabfb4a..6da5149a33 100644 --- a/mindspore/ccsrc/runtime/framework/actor/debug_aware_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/debug_aware_actor.h @@ -18,7 +18,7 @@ #define MINDSPORE_CCSRC_RUNTIME_FRAMEWORK_ACTOR_DEBUG_AWARE_ACTOR_H_ #include -#include "runtime/framework/actor/memory_aware_actor.h" +#include "runtime/graph_scheduler/actor/memory_aware_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/kernel_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/kernel_actor.cc similarity index 98% rename from mindspore/ccsrc/runtime/framework/actor/kernel_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/kernel_actor.cc index 6bf7e6223c..bdb08e4102 100644 --- a/mindspore/ccsrc/runtime/framework/actor/kernel_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/kernel_actor.cc @@ -14,11 +14,11 @@ * limitations under the License. */ -#include "runtime/framework/actor/kernel_actor.h" -#include "runtime/framework/actor/memory_manager_actor.h" -#include "runtime/framework/actor/output_actor.h" -#include "runtime/framework/actor/recorder_actor.h" -#include "runtime/framework/actor/debug_actor.h" +#include "runtime/graph_scheduler/actor/kernel_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/recorder_actor.h" +#include "runtime/graph_scheduler/actor/debug_actor.h" #include "mindrt/include/async/async.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/kernel_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/kernel_actor.h similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/kernel_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/kernel_actor.h index 08321bf0eb..fe63bacb5a 100644 --- a/mindspore/ccsrc/runtime/framework/actor/kernel_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/kernel_actor.h @@ -23,11 +23,11 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/debug_aware_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/debug_aware_actor.h" #include "runtime/hardware/device_context.h" -#include "runtime/framework/device_tensor_store.h" -#include "backend/kernel_compiler/kernel.h" +#include "runtime/graph_scheduler/device_tensor_store.h" +#include "kernel/kernel.h" #include "ir/anf.h" #include "ir/tensor.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/loop_count_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/loop_count_actor.cc similarity index 88% rename from mindspore/ccsrc/runtime/framework/actor/loop_count_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/loop_count_actor.cc index b9a5195c53..44b5632907 100644 --- a/mindspore/ccsrc/runtime/framework/actor/loop_count_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/loop_count_actor.cc @@ -14,13 +14,13 @@ * limitations under the License. */ -#include "runtime/framework/actor/loop_count_actor.h" -#include "runtime/framework/actor/data_prepare_actor.h" -#include "runtime/framework/actor/output_actor.h" -#include "runtime/framework/actor/memory_manager_actor.h" -#include "runtime/framework/actor/recorder_actor.h" -#include "runtime/framework/actor/debug_actor.h" -#include "runtime/framework/actor/control_flow/entrance_actor.h" +#include "runtime/graph_scheduler/actor/loop_count_actor.h" +#include "runtime/graph_scheduler/actor/data_prepare_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/recorder_actor.h" +#include "runtime/graph_scheduler/actor/debug_actor.h" +#include "runtime/graph_scheduler/actor/control_flow/entrance_actor.h" #include "mindrt/include/async/async.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/loop_count_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/loop_count_actor.h similarity index 92% rename from mindspore/ccsrc/runtime/framework/actor/loop_count_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/loop_count_actor.h index 52d98f6abc..caa3aab927 100644 --- a/mindspore/ccsrc/runtime/framework/actor/loop_count_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/loop_count_actor.h @@ -23,10 +23,10 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/debug_aware_actor.h" -#include "runtime/framework/device_tensor_store.h" -#include "runtime/framework/control_node_parser.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/debug_aware_actor.h" +#include "runtime/graph_scheduler/device_tensor_store.h" +#include "runtime/graph_scheduler/control_node_parser.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/memory_aware_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/memory_aware_actor.h similarity index 95% rename from mindspore/ccsrc/runtime/framework/actor/memory_aware_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/memory_aware_actor.h index 447669d670..2b2c50485d 100644 --- a/mindspore/ccsrc/runtime/framework/actor/memory_aware_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/memory_aware_actor.h @@ -19,8 +19,8 @@ #include #include -#include "runtime/framework/actor/abstract_actor.h" -#include "runtime/framework/device_tensor_store.h" +#include "runtime/graph_scheduler/actor/abstract_actor.h" +#include "runtime/graph_scheduler/device_tensor_store.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/memory_manager_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/memory_manager_actor.cc similarity index 98% rename from mindspore/ccsrc/runtime/framework/actor/memory_manager_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/memory_manager_actor.cc index a618b76667..4028100ed5 100644 --- a/mindspore/ccsrc/runtime/framework/actor/memory_manager_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/memory_manager_actor.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/framework/actor/memory_manager_actor.h" -#include "runtime/framework/actor/data_source_actor.h" -#include "runtime/framework/actor/kernel_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/data_source_actor.h" +#include "runtime/graph_scheduler/actor/kernel_actor.h" #include "runtime/hardware/device_context_manager.h" #include "mindrt/include/async/async.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/memory_manager_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/memory_manager_actor.h similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/memory_manager_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/memory_manager_actor.h index ae50bd87d8..1ebd8789c0 100644 --- a/mindspore/ccsrc/runtime/framework/actor/memory_manager_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/memory_manager_actor.h @@ -22,8 +22,8 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/device_tensor_store.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/device_tensor_store.h" #include "runtime/hardware/device_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/output_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/output_actor.cc similarity index 99% rename from mindspore/ccsrc/runtime/framework/actor/output_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/output_actor.cc index 67ae809ddc..95981a9002 100644 --- a/mindspore/ccsrc/runtime/framework/actor/output_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/output_actor.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/framework/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" #include "runtime/hardware/device_context_manager.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/output_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/output_actor.h similarity index 92% rename from mindspore/ccsrc/runtime/framework/actor/output_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/output_actor.h index e2695a52f8..82453a3ed0 100644 --- a/mindspore/ccsrc/runtime/framework/actor/output_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/output_actor.h @@ -24,12 +24,12 @@ #include #include #include "utils/hash_map.h" -#include "runtime/framework/control_node_parser.h" -#include "runtime/framework/device_tensor_store.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/actor/abstract_actor.h" +#include "runtime/graph_scheduler/control_node_parser.h" +#include "runtime/graph_scheduler/device_tensor_store.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/abstract_actor.h" #include "runtime/hardware/device_context.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "ir/tensor.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/actor/recorder_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/recorder_actor.cc similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/recorder_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/recorder_actor.cc index 9f0acee80f..ae553b38c5 100644 --- a/mindspore/ccsrc/runtime/framework/actor/recorder_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/recorder_actor.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/framework/actor/recorder_actor.h" +#include "runtime/graph_scheduler/actor/recorder_actor.h" #include #include #ifdef ENABLE_DUMP_IR diff --git a/mindspore/ccsrc/runtime/framework/actor/recorder_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/recorder_actor.h similarity index 93% rename from mindspore/ccsrc/runtime/framework/actor/recorder_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/recorder_actor.h index 3c2ce44a1b..9aa1fc6212 100644 --- a/mindspore/ccsrc/runtime/framework/actor/recorder_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/recorder_actor.h @@ -19,8 +19,8 @@ #include #include -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/device_tensor_store.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/device_tensor_store.h" #include "runtime/hardware/device_context.h" #include "profiler/device/profiling.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/rpc/recv_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/rpc/recv_actor.h similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/rpc/recv_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/rpc/recv_actor.h index 001d7b426b..0200abd436 100644 --- a/mindspore/ccsrc/runtime/framework/actor/rpc/recv_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/rpc/recv_actor.h @@ -20,7 +20,7 @@ #include #include #include -#include "runtime/framework/actor/rpc/rpc_actor.h" +#include "runtime/graph_scheduler/actor/rpc/rpc_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/rpc/rpc_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/rpc/rpc_actor.h similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/rpc/rpc_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/rpc/rpc_actor.h index f98dc32665..10027172ba 100644 --- a/mindspore/ccsrc/runtime/framework/actor/rpc/rpc_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/rpc/rpc_actor.h @@ -21,7 +21,7 @@ #include #include #include -#include "runtime/framework/actor/debug_aware_actor.h" +#include "runtime/graph_scheduler/actor/debug_aware_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/rpc/send_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/rpc/send_actor.h similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/rpc/send_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/rpc/send_actor.h index 73aef982a5..b8fff2ae12 100644 --- a/mindspore/ccsrc/runtime/framework/actor/rpc/send_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/rpc/send_actor.h @@ -20,7 +20,7 @@ #include #include #include -#include "runtime/framework/actor/rpc/rpc_actor.h" +#include "runtime/graph_scheduler/actor/rpc/rpc_actor.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/actor/super_kernel_actor.cc b/mindspore/ccsrc/runtime/graph_scheduler/actor/super_kernel_actor.cc similarity index 97% rename from mindspore/ccsrc/runtime/framework/actor/super_kernel_actor.cc rename to mindspore/ccsrc/runtime/graph_scheduler/actor/super_kernel_actor.cc index b622595413..27ee8586e9 100644 --- a/mindspore/ccsrc/runtime/framework/actor/super_kernel_actor.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/super_kernel_actor.cc @@ -14,10 +14,10 @@ * limitations under the License. */ -#include "runtime/framework/actor/super_kernel_actor.h" -#include "runtime/framework/actor/output_actor.h" -#include "runtime/framework/actor/memory_manager_actor.h" -#include "runtime/framework/actor/debug_actor.h" +#include "runtime/graph_scheduler/actor/super_kernel_actor.h" +#include "runtime/graph_scheduler/actor/output_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/debug_actor.h" #include "mindrt/include/async/async.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/framework/actor/super_kernel_actor.h b/mindspore/ccsrc/runtime/graph_scheduler/actor/super_kernel_actor.h similarity index 95% rename from mindspore/ccsrc/runtime/framework/actor/super_kernel_actor.h rename to mindspore/ccsrc/runtime/graph_scheduler/actor/super_kernel_actor.h index e4b5ea2ed4..97564dd2ab 100644 --- a/mindspore/ccsrc/runtime/framework/actor/super_kernel_actor.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/actor/super_kernel_actor.h @@ -23,8 +23,8 @@ #include #include #include -#include "runtime/framework/actor/debug_aware_actor.h" -#include "runtime/framework/actor/actor_common.h" +#include "runtime/graph_scheduler/actor/debug_aware_actor.h" +#include "runtime/graph_scheduler/actor/actor_common.h" #include "runtime/hardware/device_context.h" #include "ir/anf.h" diff --git a/mindspore/ccsrc/runtime/framework/control_node_parser.cc b/mindspore/ccsrc/runtime/graph_scheduler/control_node_parser.cc similarity index 99% rename from mindspore/ccsrc/runtime/framework/control_node_parser.cc rename to mindspore/ccsrc/runtime/graph_scheduler/control_node_parser.cc index aba2db1615..a8c6abd518 100644 --- a/mindspore/ccsrc/runtime/framework/control_node_parser.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/control_node_parser.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/framework/control_node_parser.h" -#include "runtime/framework/actor/actor_common.h" +#include "runtime/graph_scheduler/control_node_parser.h" +#include "runtime/graph_scheduler/actor/actor_common.h" #include "utils/func_graph_analyzer.h" #include "utils/convert_utils.h" #include "abstract/utils.h" diff --git a/mindspore/ccsrc/runtime/framework/control_node_parser.h b/mindspore/ccsrc/runtime/graph_scheduler/control_node_parser.h similarity index 99% rename from mindspore/ccsrc/runtime/framework/control_node_parser.h rename to mindspore/ccsrc/runtime/graph_scheduler/control_node_parser.h index 67a885c68d..4936a44e6f 100644 --- a/mindspore/ccsrc/runtime/framework/control_node_parser.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/control_node_parser.h @@ -29,7 +29,7 @@ #include #include "utils/hash_map.h" #include "runtime/hardware/device_context.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/control_node_scheduler.cc b/mindspore/ccsrc/runtime/graph_scheduler/control_node_scheduler.cc similarity index 99% rename from mindspore/ccsrc/runtime/framework/control_node_scheduler.cc rename to mindspore/ccsrc/runtime/graph_scheduler/control_node_scheduler.cc index 2bd59e432f..ea2346b517 100644 --- a/mindspore/ccsrc/runtime/framework/control_node_scheduler.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/control_node_scheduler.cc @@ -14,8 +14,8 @@ * limitations under the License. */ -#include "runtime/framework/control_node_scheduler.h" -#include "runtime/framework/control_node_parser.h" +#include "runtime/graph_scheduler/control_node_scheduler.h" +#include "runtime/graph_scheduler/control_node_parser.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/control_node_scheduler.h b/mindspore/ccsrc/runtime/graph_scheduler/control_node_scheduler.h similarity index 98% rename from mindspore/ccsrc/runtime/framework/control_node_scheduler.h rename to mindspore/ccsrc/runtime/graph_scheduler/control_node_scheduler.h index a1b3958da0..117c9a83a5 100644 --- a/mindspore/ccsrc/runtime/framework/control_node_scheduler.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/control_node_scheduler.h @@ -26,8 +26,8 @@ #include #include #include -#include "runtime/framework/actor/actor_set.h" -#include "runtime/framework/graph_compiler.h" +#include "runtime/graph_scheduler/actor/actor_set.h" +#include "runtime/graph_scheduler/graph_compiler.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/framework/device_tensor_copy_store.h b/mindspore/ccsrc/runtime/graph_scheduler/device_tensor_copy_store.h similarity index 100% rename from mindspore/ccsrc/runtime/framework/device_tensor_copy_store.h rename to mindspore/ccsrc/runtime/graph_scheduler/device_tensor_copy_store.h diff --git a/mindspore/ccsrc/runtime/framework/device_tensor_store.h b/mindspore/ccsrc/runtime/graph_scheduler/device_tensor_store.h similarity index 100% rename from mindspore/ccsrc/runtime/framework/device_tensor_store.h rename to mindspore/ccsrc/runtime/graph_scheduler/device_tensor_store.h diff --git a/mindspore/ccsrc/runtime/framework/graph_compiler.cc b/mindspore/ccsrc/runtime/graph_scheduler/graph_compiler.cc similarity index 99% rename from mindspore/ccsrc/runtime/framework/graph_compiler.cc rename to mindspore/ccsrc/runtime/graph_scheduler/graph_compiler.cc index fc84c08646..e385856e68 100644 --- a/mindspore/ccsrc/runtime/framework/graph_compiler.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/graph_compiler.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "runtime/framework/graph_compiler.h" +#include "runtime/graph_scheduler/graph_compiler.h" #include #include #include #include -#include "runtime/framework/graph_scheduler.h" +#include "runtime/graph_scheduler/graph_scheduler.h" #include "runtime/op_builder/op_lazy_builder.h" #include "runtime/device/device_address.h" #include "utils/ms_device_shape_transfer.h" @@ -27,7 +27,7 @@ #include "utils/context/graph_kernel_flags.h" #include "utils/ms_context.h" #include "ir/tensor.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "base/base_ref_utils.h" #include "debug/dump_proto.h" #ifdef ENABLE_DEBUGGER diff --git a/mindspore/ccsrc/runtime/framework/graph_compiler.h b/mindspore/ccsrc/runtime/graph_scheduler/graph_compiler.h similarity index 98% rename from mindspore/ccsrc/runtime/framework/graph_compiler.h rename to mindspore/ccsrc/runtime/graph_scheduler/graph_compiler.h index d9fad0be5e..2c6d020a8e 100644 --- a/mindspore/ccsrc/runtime/framework/graph_compiler.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/graph_compiler.h @@ -24,10 +24,10 @@ #include #include "utils/hash_map.h" #include "runtime/hardware/device_context.h" -#include "runtime/framework/actor/actor_common.h" -#include "runtime/framework/control_node_parser.h" -#include "backend/session/session_basic.h" -#include "backend/session/session_factory.h" +#include "runtime/graph_scheduler/actor/actor_common.h" +#include "runtime/graph_scheduler/control_node_parser.h" +#include "backend/common/session/session_basic.h" +#include "backend/common/session/session_factory.h" #include "ir/tensor.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/graph_scheduler.cc b/mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.cc similarity index 99% rename from mindspore/ccsrc/runtime/framework/graph_scheduler.cc rename to mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.cc index 2cfc21962b..b9f65e8bef 100644 --- a/mindspore/ccsrc/runtime/framework/graph_scheduler.cc +++ b/mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.cc @@ -14,16 +14,16 @@ * limitations under the License. */ -#include "runtime/framework/graph_scheduler.h" +#include "runtime/graph_scheduler/graph_scheduler.h" #include -#include "runtime/framework/actor/memory_manager_actor.h" -#include "runtime/framework/actor/debug_actor.h" -#include "runtime/framework/actor/recorder_actor.h" +#include "runtime/graph_scheduler/actor/memory_manager_actor.h" +#include "runtime/graph_scheduler/actor/debug_actor.h" +#include "runtime/graph_scheduler/actor/recorder_actor.h" #include "runtime/hardware/device_context_manager.h" #include "mindrt/src/actor/actormgr.h" #include "mindrt/include/async/async.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/helper.h" #include "utils/anf_utils.h" #include "utils/config_manager.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/runtime/framework/graph_scheduler.h b/mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.h similarity index 98% rename from mindspore/ccsrc/runtime/framework/graph_scheduler.h rename to mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.h index 4b118faffb..894c47de21 100644 --- a/mindspore/ccsrc/runtime/framework/graph_scheduler.h +++ b/mindspore/ccsrc/runtime/graph_scheduler/graph_scheduler.h @@ -27,10 +27,10 @@ #include #include "utils/hash_map.h" #include "utils/hash_set.h" -#include "runtime/framework/control_node_scheduler.h" -#include "runtime/framework/actor/actor_set.h" -#include "runtime/framework/graph_compiler.h" -#include "runtime/framework/actor/actor_dump.h" +#include "runtime/graph_scheduler/control_node_scheduler.h" +#include "runtime/graph_scheduler/actor/actor_set.h" +#include "runtime/graph_scheduler/graph_compiler.h" +#include "runtime/graph_scheduler/actor/actor_dump.h" #include "thread/actor_threadpool.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/framework/host_tensor_queue.h b/mindspore/ccsrc/runtime/graph_scheduler/host_tensor_queue.h similarity index 100% rename from mindspore/ccsrc/runtime/framework/host_tensor_queue.h rename to mindspore/ccsrc/runtime/graph_scheduler/host_tensor_queue.h diff --git a/mindspore/ccsrc/runtime/hardware/CMakeLists.txt b/mindspore/ccsrc/runtime/hardware/CMakeLists.txt index 696361ebe8..73b3c5f3bf 100644 --- a/mindspore/ccsrc/runtime/hardware/CMakeLists.txt +++ b/mindspore/ccsrc/runtime/hardware/CMakeLists.txt @@ -1,49 +1,9 @@ file(GLOB_RECURSE HARDWARE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "device_context_manager.cc" "collective/*.cc") - -if(ENABLE_D) - file(GLOB_RECURSE HARDWARE_D_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "ascend/*.cc") -endif() - -if(ENABLE_GPU) - file(GLOB_RECURSE HARDWARE_GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "gpu/*.cc") - list(REMOVE_ITEM HARDWARE_GPU_SRC_LIST "gpu/nvidia_collective_comm_lib.cc" "gpu/nvidia_communication_group.cc") - if(ENABLE_MPI) - set(NVIDIA_COLLECTIVE_SRCS "gpu/nvidia_collective_comm_lib.cc" - "gpu/nvidia_communication_group.cc" - "collective/collective_communication_lib.cc" - "collective/communication_group.cc") - set_property(SOURCE ${NVIDIA_COLLECTIVE_SRCS} PROPERTY COMPILE_DEFINITIONS - SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) - add_library(nvidia_collective SHARED ${NVIDIA_COLLECTIVE_SRCS}) - target_link_libraries(nvidia_collective PRIVATE mindspore::nccl) - endif() -endif() - -if(ENABLE_CPU) - file(GLOB_RECURSE HARDWARE_CPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "cpu/*.cc") - list(REMOVE_ITEM HARDWARE_CPU_SRC_LIST "cpu/mpi_collective_comm_lib.cc" "cpu/mpi_communication_group.cc") - if(WIN32) - list(REMOVE_ITEM HARDWARE_CPU_SRC_LIST "cpu/ms_collective_comm_lib.cc") - endif() - if(ENABLE_MPI) - set(MPI_COLLECTIVE_SRCS "cpu/mpi_collective_comm_lib.cc" - "cpu/mpi_communication_group.cc" - "collective/collective_communication_lib.cc" - "collective/communication_group.cc") - set_property(SOURCE ${MPI_COLLECTIVE_SRCS} PROPERTY COMPILE_DEFINITIONS - SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) - add_library(mpi_collective SHARED ${MPI_COLLECTIVE_SRCS}) - target_link_libraries(mpi_collective PRIVATE mindspore::ompi) - endif() -endif() + "device_context_manager.cc") if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-delete-abstract-non-virtual-dtor") endif() - -set_property(SOURCE ${HARDWARE_SRC_LIST} ${HARDWARE_D_SRC_LIST} ${HARDWARE_GPU_SRC_LIST} ${HARDWARE_CPU_SRC_LIST} - PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) -add_library(_mindspore_runtime_hardware_obj OBJECT ${HARDWARE_SRC_LIST} ${HARDWARE_D_SRC_LIST} - ${HARDWARE_GPU_SRC_LIST} ${HARDWARE_CPU_SRC_LIST}) +set_property(SOURCE ${HARDWARE_SRC_LIST} PROPERTY SUBMODULE_ID=mindspore::SubModuleId::SM_DEVICE) +add_library(_mindspore_runtime_hardware_obj OBJECT ${HARDWARE_SRC_LIST}) diff --git a/mindspore/ccsrc/runtime/hardware/device_context.h b/mindspore/ccsrc/runtime/hardware/device_context.h index 380be0e5ba..b96e89af5e 100644 --- a/mindspore/ccsrc/runtime/hardware/device_context.h +++ b/mindspore/ccsrc/runtime/hardware/device_context.h @@ -23,11 +23,11 @@ #include #include "runtime/device/device_address.h" #include "runtime/device/bucket.h" -#include "runtime/hardware/collective/collective_communication_lib.h" -#include "runtime/hardware/collective/collective_comm_lib_loader.h" -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/common_backend_optimization.h" +#include "runtime/collective/collective_communication_lib.h" +#include "runtime/collective/collective_comm_lib_loader.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/common_backend_optimization.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware/gpu/optimizer.h b/mindspore/ccsrc/runtime/hardware/gpu/optimizer.h deleted file mode 100644 index 5812908706..0000000000 --- a/mindspore/ccsrc/runtime/hardware/gpu/optimizer.h +++ /dev/null @@ -1,58 +0,0 @@ -/** - * Copyright 2021 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_RUNTIME_HARDWARE_GPU_OPTIMIZER_H_ -#define MINDSPORE_CCSRC_RUNTIME_HARDWARE_GPU_OPTIMIZER_H_ - -#include "backend/optimizer/common/helper.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" -#include "backend/optimizer/common/common_backend_optimization.h" -#include "backend/optimizer/pass/adjust_depend_for_parallel_optimizer_recompute_all_gather.h" -#include "backend/optimizer/gpu/adam_weight_decay_fusion.h" -#include "backend/optimizer/gpu/adam_fusion.h" -#include "backend/optimizer/gpu/alltoall_fusion.h" -#include "backend/optimizer/gpu/apply_momentum_weight_scale_fusion.h" -#include "backend/optimizer/gpu/apply_momentum_scale_fusion.h" -#include "backend/optimizer/gpu/apply_momentum_weight_fusion.h" -#include "backend/optimizer/gpu/batch_norm_relu_fusion.h" -#include "backend/optimizer/gpu/batch_norm_relu_grad_fusion.h" -#include "backend/optimizer/gpu/batch_norm_add_relu_fusion.h" -#include "backend/optimizer/gpu/post_batch_norm_add_relu_fusion.h" -#include "backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.h" -#include "backend/optimizer/gpu/combine_momentum_fusion.h" -#include "backend/optimizer/gpu/combine_cast_fusion.h" -#include "backend/optimizer/gpu/cudnn_inplace_fusion.h" -#include "backend/optimizer/gpu/insert_format_transform_op.h" -#include "backend/optimizer/gpu/replace_momentum_cast_fusion.h" -#include "backend/optimizer/gpu/replace_addn_fusion.h" -#include "backend/optimizer/gpu/print_reduce_fusion.h" -#include "backend/optimizer/gpu/remove_format_transform_pair.h" -#include "backend/optimizer/gpu/remove_redundant_format_transform.h" -#include "backend/optimizer/gpu/reduce_precision_fusion.h" -#include "backend/optimizer/gpu/relu_v2_pass.h" -#include "backend/optimizer/gpu/add_relu_v2_fusion.h" -#include "backend/optimizer/gpu/add_relu_grad_v2_fusion.h" -#include "backend/optimizer/graph_kernel/adapter/graph_kernel_optimization.h" -#include "backend/optimizer/pass/communication_op_fusion.h" -#include "backend/optimizer/gpu/concat_outputs_for_all_gather.h" -#include "backend/optimizer/pass/getitem_tuple.h" -#include "backend/optimizer/gpu/matmul_biasadd_fusion.h" -#include "backend/optimizer/gpu/bce_with_logits_loss_fusion.h" -#include "backend/optimizer/gpu/insert_cast_gpu.h" -#include "backend/optimizer/gpu/neighbor_exchange_v2_fusion.h" - -#endif // MINDSPORE_CCSRC_RUNTIME_HARDWARE_GPU_OPTIMIZER_H_ diff --git a/mindspore/ccsrc/runtime/hccl_adapter/CMakeLists.txt b/mindspore/ccsrc/runtime/hccl_adapter/CMakeLists.txt deleted file mode 100644 index e42585b745..0000000000 --- a/mindspore/ccsrc/runtime/hccl_adapter/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -file(GLOB HCCL_ADAPTER_SRC_LIST ./*.cc) -set_property(SOURCE ${HCCL_ADAPTER_SRC_LIST} PROPERTY COMPILE_DEFINITIONS - SUBMODULE_ID=mindspore::SubModuleId::SM_HCCL_ADPT) -if(ENABLE_D) - add_library(_mindspore_runtime_hccl_adapter_obj OBJECT ${HCCL_ADAPTER_SRC_LIST}) - target_include_directories(_mindspore_runtime_hccl_adapter_obj PRIVATE ${CMAKE_BINARY_DIR}/proto/ge) - add_dependencies(_mindspore_runtime_hccl_adapter_obj graph) - add_subdirectory(plugin) -endif() \ No newline at end of file diff --git a/mindspore/ccsrc/runtime/op_builder/op_lazy_builder.h b/mindspore/ccsrc/runtime/op_builder/op_lazy_builder.h index 4ab2444376..236286601e 100644 --- a/mindspore/ccsrc/runtime/op_builder/op_lazy_builder.h +++ b/mindspore/ccsrc/runtime/op_builder/op_lazy_builder.h @@ -23,10 +23,10 @@ #include #include #include -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/hardware/device_context.h" -#include "runtime/framework/graph_scheduler.h" +#include "runtime/graph_scheduler/graph_scheduler.h" namespace mindspore::runtime { class OpLazyBuilderContext { diff --git a/mindspore/ccsrc/utils/comm_manager.cc b/mindspore/ccsrc/utils/comm_manager.cc index e93643a49a..a017977c52 100644 --- a/mindspore/ccsrc/utils/comm_manager.cc +++ b/mindspore/ccsrc/utils/comm_manager.cc @@ -21,13 +21,13 @@ #include "frontend/parallel/group_manager.h" #ifndef NO_DLIB -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" #include "hccl/hcom.h" -#include "runtime/device/ascend/distribute/ascend_collective.h" +#include "plugin/device/ascend/hal/device/distribute/ascend_collective.h" #endif #if defined(ENABLE_GPU) -#include "runtime/device/gpu/distribution/collective_init.h" +#include "plugin/device/gpu/hal/device/distribution/collective_init.h" using CollectiveInitializer = mindspore::device::gpu::CollectiveInitializer; using CreateCommGroupFunc = mindspore::device::gpu::CreateCommGroupFunc; using GetRankIDByGroupFunc = mindspore::device::gpu::GetRankIDByGroupFunc; diff --git a/mindspore/ccsrc/utils/convert_utils_py.cc b/mindspore/ccsrc/utils/convert_utils_py.cc index 155a144ede..73ad39c07c 100644 --- a/mindspore/ccsrc/utils/convert_utils_py.cc +++ b/mindspore/ccsrc/utils/convert_utils_py.cc @@ -37,7 +37,7 @@ #include "ir/dtype/tensor_type.h" #include "utils/ms_context.h" #include "utils/convert_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { py::object BuiltinsToPyData(const Any &value); diff --git a/mindspore/ccsrc/utils/ms_device_shape_transfer.h b/mindspore/ccsrc/utils/ms_device_shape_transfer.h index cb5915a63c..1b647fbc28 100644 --- a/mindspore/ccsrc/utils/ms_device_shape_transfer.h +++ b/mindspore/ccsrc/utils/ms_device_shape_transfer.h @@ -26,13 +26,13 @@ #include #include #include "ir/dtype.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/kernel.h" #include "ir/dtype/type.h" #include "utils/shape_utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_utils.h" #include "abstract/utils.h" -#include "backend/kernel_compiler/tbe/tbe_dynaminc_shape_util.h" +#include "plugin/device/ascend/kernel/tbe/tbe_dynaminc_shape_util.h" #include "runtime/device/convert_tensor_utils.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/utils/signal_util.cc b/mindspore/ccsrc/utils/signal_util.cc index 092bce0962..b4c5562ed1 100644 --- a/mindspore/ccsrc/utils/signal_util.cc +++ b/mindspore/ccsrc/utils/signal_util.cc @@ -17,7 +17,7 @@ #include "utils/signal_util.h" #include #include "utils/log_adapter.h" -#include "backend/session/kernel_build_client.h" +#include "backend/common/session/kernel_build_client.h" namespace mindspore { SignalGuard::SignalGuard(IntHandlerFunc IntHandler) { RegisterHandlers(IntHandler); } diff --git a/mindspore/lite/CMakeLists.txt b/mindspore/lite/CMakeLists.txt index 476b2a1898..9198fe13c8 100644 --- a/mindspore/lite/CMakeLists.txt +++ b/mindspore/lite/CMakeLists.txt @@ -412,7 +412,7 @@ endif() string(REPLACE "/mindspore/lite" "" TOP_DIR ${CMAKE_CURRENT_SOURCE_DIR}) set(CORE_DIR ${TOP_DIR}/mindspore/core) set(CCSRC_DIR ${TOP_DIR}/mindspore/ccsrc) -set(NNACL_DIR ${CCSRC_DIR}/backend/kernel_compiler/cpu/nnacl) +set(NNACL_DIR ${CCSRC_DIR}/plugin/device/cpu/kernel/nnacl) include_directories(${TOP_DIR}) include_directories(${CORE_DIR}) include_directories(${CORE_DIR}/ir) @@ -598,7 +598,7 @@ add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src/ops) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/micro/coder) add_subdirectory(${CMAKE_CURRENT_SOURCE_DIR}/src) -add_subdirectory(${CCSRC_DIR}/backend/kernel_compiler/cpu/nnacl build) +add_subdirectory(${CCSRC_DIR}/plugin/device/cpu/kernel/nnacl build) if(MSLITE_ENABLE_TOOLS) if(NOT MSLITE_COMPILE_TWICE) diff --git a/mindspore/lite/micro/coder/allocator/memory_manager.cc b/mindspore/lite/micro/coder/allocator/memory_manager.cc index 908394a404..293aeeefaa 100644 --- a/mindspore/lite/micro/coder/allocator/memory_manager.cc +++ b/mindspore/lite/micro/coder/allocator/memory_manager.cc @@ -16,7 +16,7 @@ #include "coder/allocator/memory_manager.h" #include -#include "mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/op_base.h" #include "coder/opcoders/op_coder.h" namespace mindspore::lite::micro { diff --git a/mindspore/lite/micro/coder/opcoders/base/detection_post_process_base_coder.cc b/mindspore/lite/micro/coder/opcoders/base/detection_post_process_base_coder.cc index 9eee557334..b2f50c51d6 100644 --- a/mindspore/lite/micro/coder/opcoders/base/detection_post_process_base_coder.cc +++ b/mindspore/lite/micro/coder/opcoders/base/detection_post_process_base_coder.cc @@ -15,7 +15,7 @@ */ #include "coder/opcoders/base/detection_post_process_base_coder.h" -#include "mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/op_base.h" #include "nnacl/int8/quant_dtype_cast_int8.h" #include "coder/opcoders/file_collector.h" #include "coder/log.h" diff --git a/mindspore/lite/src/CMakeLists.txt b/mindspore/lite/src/CMakeLists.txt index 120ca1299a..7224089e2b 100644 --- a/mindspore/lite/src/CMakeLists.txt +++ b/mindspore/lite/src/CMakeLists.txt @@ -2,7 +2,7 @@ add_compile_definitions(USE_ANDROID_LOG) if(MSLITE_ENABLE_V0) add_definitions(-DENABLE_V0) endif() -include_directories(${CCSRC_DIR}/backend/kernel_compiler/cpu) +include_directories(${CCSRC_DIR}/plugin/device/cpu/kernel) set(TOOLS_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../tools) diff --git a/mindspore/lite/src/delegate/npu/CMakeLists.txt b/mindspore/lite/src/delegate/npu/CMakeLists.txt index 54fc858aa5..0a110e0fe4 100644 --- a/mindspore/lite/src/delegate/npu/CMakeLists.txt +++ b/mindspore/lite/src/delegate/npu/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories(${DDK_PATH}) -include_directories($(CCSRC_DIR)/backend/kernel_compiler/cpu) +include_directories($(CCSRC_DIR)/plugin/device/cpu/kernel) file(GLOB_RECURSE NPU_RUNTIME_SRC ${CMAKE_CURRENT_SOURCE_DIR}/*.cc ${CMAKE_CURRENT_SOURCE_DIR}/op/*.cc diff --git a/mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.cc b/mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.cc index 004552e624..33bb97a1a9 100644 --- a/mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.cc +++ b/mindspore/lite/src/delegate/parameter_cache/gpu/gpu_cache_mem.cc @@ -17,7 +17,7 @@ #include "src/delegate/parameter_cache/gpu/gpu_cache_mem.h" #include #include "src/delegate/tensorrt/cuda_impl/hash.cuh" -#include "runtime/device/gpu/cuda_driver.h" +#include "plugin/device/gpu/hal/device/cuda_driver.h" #include "src/common/log_adapter.h" #include "src/delegate/parameter_cache/factory_mgr_base.h" namespace mindspore { diff --git a/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt b/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt index 655d5fac40..965d7ed7c2 100644 --- a/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt +++ b/mindspore/lite/src/delegate/tensorrt/CMakeLists.txt @@ -1,6 +1,6 @@ include_directories(${TENSORRT_PATH}/include) include_directories(${CUDA_PATH}/include) -include_directories($(CCSRC_DIR)/backend/kernel_compiler/cpu) +include_directories($(CCSRC_DIR)/plugin/device/cpu/kernel) if(DEFINED ENV{MS_ENABLE_CUDA_DISTRIBUTION}) set(MS_ENABLE_CUDA_DISTRIBUTION $ENV{MS_ENABLE_CUDA_DISTRIBUTION}) @@ -18,9 +18,9 @@ if(MS_ENABLE_CUDA_DISTRIBUTION STREQUAL "on") message("enable cuda gpu distribution collective") file(GLOB NCCL_MPI_SRC LIST_DIRECTORIES false ${CMAKE_CURRENT_SOURCE_DIR}/distribution/*.cc - ${CCSRC_DIR}/runtime/device/gpu/distribution/collective_wrapper.cc - ${CCSRC_DIR}/runtime/device/gpu/distribution/mpi_wrapper.cc - ${CCSRC_DIR}/runtime/device/gpu/distribution/nccl_wrapper.cc + ${CCSRC_DIR}/plugin/device/gpu/hal/device/distribution/collective_wrapper.cc + ${CCSRC_DIR}/plugin/device/gpu/hal/device/distribution/mpi_wrapper.cc + ${CCSRC_DIR}/plugin/device/gpu/hal/device/distribution/nccl_wrapper.cc ) list(REMOVE_ITEM NCCL_MPI_SRC ${NCCL_MPI_SRC_STUB}) diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_base_impl.cc b/mindspore/lite/src/delegate/tensorrt/distribution/distribution_base_impl.cc index 9153c4f7ea..35a24c047e 100644 --- a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_base_impl.cc +++ b/mindspore/lite/src/delegate/tensorrt/distribution/distribution_base_impl.cc @@ -18,7 +18,7 @@ #include #include #include -#include "runtime/device/gpu/distribution/collective_wrapper.h" +#include "plugin/device/gpu/hal/device/distribution/collective_wrapper.h" #include "src/delegate/tensorrt/tensorrt_utils.h" namespace mindspore::lite { diff --git a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective_impl.cc b/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective_impl.cc index 8fedeb7b09..54b265b437 100644 --- a/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective_impl.cc +++ b/mindspore/lite/src/delegate/tensorrt/distribution/distribution_collective_impl.cc @@ -18,7 +18,7 @@ #include #include #include -#include "runtime/device/gpu/distribution/collective_wrapper.h" +#include "plugin/device/gpu/hal/device/distribution/collective_wrapper.h" #include "src/delegate/tensorrt/distribution/distribution_utils.h" #include "src/delegate/tensorrt/distribution/distribution_base.h" diff --git a/mindspore/lite/src/ops/CMakeLists.txt b/mindspore/lite/src/ops/CMakeLists.txt index 7c0e379289..553c365153 100644 --- a/mindspore/lite/src/ops/CMakeLists.txt +++ b/mindspore/lite/src/ops/CMakeLists.txt @@ -1,5 +1,5 @@ include_directories(${CMAKE_CURRENT_SOURCE_DIR}/) -include_directories(${CCSRC_DIR}/backend/kernel_compiler/cpu) +include_directories(${CCSRC_DIR}/plugin/device/cpu/kernel) if(APPLE) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fstrict-aliasing -ffunction-sections \ -fdata-sections -ffast-math -fno-rtti -fno-exceptions -Wno-shorten-64-to-32 \ diff --git a/mindspore/lite/src/ops/populate/adam_populate.cc b/mindspore/lite/src/ops/populate/adam_populate.cc index da246ec993..6ef022fe0a 100644 --- a/mindspore/lite/src/ops/populate/adam_populate.cc +++ b/mindspore/lite/src/ops/populate/adam_populate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "src/ops/populate/populate_register.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" using mindspore::schema::PrimitiveType_Adam; namespace mindspore { diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/adam.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/adam.cc index 123cfd5b81..6b1194ae7d 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/adam.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/adam.cc @@ -20,7 +20,7 @@ #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.cc index 5d66c57d10..2ba07e5645 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_grad.cc @@ -20,7 +20,7 @@ #include "nnacl/fp32_grad/reduce_grad.h" #include "nnacl/fp32_grad/arithmetic_grad.h" #include "include/errorcode.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_self_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_self_grad.cc index 8f38ef3d84..016023e1a0 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_self_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/arithmetic_self_grad.cc @@ -20,7 +20,7 @@ #include "include/errorcode.h" #include "nnacl/fp32/arithmetic_fp32.h" #include "nnacl/fp32_grad/arithmetic_grad.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" using mindspore::kernel::KERNEL_ARCH; using mindspore::lite::KernelRegistrar; diff --git a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc index a89235b0bd..9ac42971ca 100644 --- a/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc +++ b/mindspore/lite/src/runtime/kernel/arm/fp32_grad/power_grad.cc @@ -15,7 +15,7 @@ */ #include "src/runtime/kernel/arm/fp32_grad/power_grad.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "schema/model_generated.h" #include "src/kernel_registry.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/runtime/kernel/ascend/src/custom_interface.cc b/mindspore/lite/src/runtime/kernel/ascend/src/custom_interface.cc index e8df01bb9c..29bfb6ad85 100644 --- a/mindspore/lite/src/runtime/kernel/ascend/src/custom_interface.cc +++ b/mindspore/lite/src/runtime/kernel/ascend/src/custom_interface.cc @@ -19,7 +19,7 @@ #include "include/errorcode.h" #include "include/registry/register_kernel_interface.h" #include "common/log_adapter.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" namespace mindspore::kernel { namespace acl { diff --git a/mindspore/lite/test/CMakeLists.txt b/mindspore/lite/test/CMakeLists.txt index a10b6bbd65..25ea6d7a4b 100644 --- a/mindspore/lite/test/CMakeLists.txt +++ b/mindspore/lite/test/CMakeLists.txt @@ -4,7 +4,7 @@ set(LITE_DIR ${TOP_DIR}/mindspore/lite) include_directories(${TOP_DIR}) include_directories(${TEST_DIR}) -include_directories(${TOP_DIR}/mindspore/ccsrc/backend/kernel_compiler/cpu) +include_directories(${TOP_DIR}/mindspore/ccsrc/plugin/device/cpu/kernel) include(${TOP_DIR}/cmake/external_libs/gtest.cmake) diff --git a/mindspore/lite/test/ut/src/runtime/kernel/common_utils_test.cc b/mindspore/lite/test/ut/src/runtime/kernel/common_utils_test.cc index 68e9973dcb..93329b0bda 100644 --- a/mindspore/lite/test/ut/src/runtime/kernel/common_utils_test.cc +++ b/mindspore/lite/test/ut/src/runtime/kernel/common_utils_test.cc @@ -16,7 +16,7 @@ #include #include "common/common_test.h" -#include "backend/kernel_compiler/common_utils.h" +#include "kernel/common_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/activation_fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/activation_fusion_inout_test.cc index 5c615672c2..c0cf764d5e 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/activation_fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/activation_fusion_inout_test.cc @@ -17,7 +17,7 @@ #include #include "tools/optimizer/fusion/activation_fusion.h" #include "test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "ops/fusion/activation.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/add_concat_act_fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/add_concat_act_fusion_inout_test.cc index 4847b77199..b0917c7163 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/add_concat_act_fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/add_concat_act_fusion_inout_test.cc @@ -17,11 +17,11 @@ #include #include "test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" #include "tools/optimizer/fusion/add_concat_activation_fusion.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "ops/fusion/activation.h" #include "ops/concat.h" #include "ops/fusion/add_fusion.h" diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_act_fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_act_fusion_inout_test.cc index 3d0e8d03ce..82f9e2afe7 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_act_fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_act_fusion_inout_test.cc @@ -17,7 +17,7 @@ #include #include "tools/optimizer/fusion/conv_activation_fusion.h" #include "test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "ops/fusion/activation.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_bias_fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_bias_fusion_inout_test.cc index 59785445ca..a4b7c97fa4 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_bias_fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_bias_fusion_inout_test.cc @@ -17,7 +17,7 @@ #include #include "tools/optimizer/fusion/conv_biasadd_fusion.h" #include "test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "ops/bias_add.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.cc index a004b4c865..556b8367f3 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.cc @@ -19,7 +19,7 @@ #include "src/common/log_adapter.h" #include "ir/func_graph.h" #include "ops/fusion/conv2d_fusion.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" namespace mindspore { ValueNodePtr ConvFusionInoutTest::CreateConvPrimitiveValue() { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.h b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.h index 26c808dd12..6336047f40 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.h +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.h @@ -20,9 +20,9 @@ #include #include "test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" namespace mindspore { class ConvFusionInoutTest : public FusionInoutTest { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.cc index 22b0f1c7d8..e8c0ff17f5 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.cc @@ -22,7 +22,7 @@ #include "ops/return.h" #include "ir/func_graph.h" #include "ops/fusion/conv2d_fusion.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "tools/optimizer/common/gllo_utils.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.h b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.h index 4e33b78473..74fc93a1a9 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.h +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.h @@ -21,9 +21,9 @@ #include #include "common/common_test.h" #include "ir/anf.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" namespace mindspore { class FusionInoutTest : public mindspore::CommonTest { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_act_fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_act_fusion_inout_test.cc index dba2c62ff6..4cf4a3a5fc 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_act_fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_act_fusion_inout_test.cc @@ -17,7 +17,7 @@ #include #include "tools/optimizer/fusion/matmul_activation_fusion.h" #include "test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "ops/fusion/mat_mul_fusion.h" #include "ops/fusion/activation.h" diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_fusion_inout_test.cc index 7c3b698e1e..2a6e74d0d3 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_fusion_inout_test.cc @@ -19,7 +19,7 @@ #include "src/common/log_adapter.h" #include "ir/func_graph.h" #include "ops/fusion/mat_mul_fusion.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" namespace mindspore { CNodePtr MatMulFusionInoutTest::AddMatMul(const FuncGraphPtr &graph, const AnfNodePtr &input1, const AnfNodePtr &input2, diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_fusion_inout_test.h b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_fusion_inout_test.h index b99cd4585e..2751d76c66 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_fusion_inout_test.h +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_fusion_inout_test.h @@ -21,9 +21,9 @@ #include "test/ut/tools/optimizer/fusion/fusion_inout_test/fusion_inout_test.h" #include "ir/anf.h" #include "nnacl/matmul_parameter.h" -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" #include "ops/fusion/activation.h" namespace mindspore { diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_mul_fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_mul_fusion_inout_test.cc index 64580395ce..53a4a16f4e 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_mul_fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_mul_fusion_inout_test.cc @@ -17,7 +17,7 @@ #include #include "tools/optimizer/fusion/matmul_mul_fusion.h" #include "test/ut/tools/optimizer/fusion/fusion_inout_test/conv_fusion_inout_test.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "ops/fusion/mul_fusion.h" #include "ops/fusion/mat_mul_fusion.h" diff --git a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/trans_matmul_fusion_inout_test.cc b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/trans_matmul_fusion_inout_test.cc index 9cf6dc1f8f..f85ccdd821 100644 --- a/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/trans_matmul_fusion_inout_test.cc +++ b/mindspore/lite/test/ut/tools/optimizer/fusion/fusion_inout_test/trans_matmul_fusion_inout_test.cc @@ -18,7 +18,7 @@ #include "tools/optimizer/fusion/transpose_matmul_fusion.h" #include "tools/optimizer/common/gllo_utils.h" #include "test/ut/tools/optimizer/fusion/fusion_inout_test/matmul_fusion_inout_test.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "ops/transpose.h" #include "ops/mat_mul.h" diff --git a/mindspore/lite/tools/benchmark/CMakeLists.txt b/mindspore/lite/tools/benchmark/CMakeLists.txt index d015c3664d..cf7abc34ed 100644 --- a/mindspore/lite/tools/benchmark/CMakeLists.txt +++ b/mindspore/lite/tools/benchmark/CMakeLists.txt @@ -44,13 +44,13 @@ else() endif() endif() -include_directories(${CCSRC_DIR}/backend/kernel_compiler/cpu) +include_directories(${CCSRC_DIR}/plugin/device/cpu/kernel) set(COMMON_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../common/flag_parser.cc ${CMAKE_CURRENT_SOURCE_DIR}/../common/string_util.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common/file_utils.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common/utils.cc - ${CMAKE_CURRENT_SOURCE_DIR}/../../../ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_common.c + ${CMAKE_CURRENT_SOURCE_DIR}/../../../ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_common.c ) if(MSLITE_ENABLE_SHARING_MEM_WITH_OPENGL) diff --git a/mindspore/lite/tools/converter/CMakeLists.txt b/mindspore/lite/tools/converter/CMakeLists.txt index c1e4d3bc77..1a0cbdbbdf 100644 --- a/mindspore/lite/tools/converter/CMakeLists.txt +++ b/mindspore/lite/tools/converter/CMakeLists.txt @@ -5,12 +5,12 @@ set(USE_GLOG on) set(SRC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../src) set(CCSRC_SRC - ${CCSRC_DIR}/backend/optimizer/common/pattern_engine.cc - ${CCSRC_DIR}/backend/optimizer/common/visit.cc - ${CCSRC_DIR}/backend/optimizer/common/optimizer.cc + ${CCSRC_DIR}/backend/common/optimizer/pattern_engine.cc + ${CCSRC_DIR}/backend/common/optimizer/visit.cc + ${CCSRC_DIR}/backend/common/optimizer/optimizer.cc ) -include_directories(${TOP_DIR}/mindspore/ccsrc/backend/kernel_compiler/cpu) +include_directories(${TOP_DIR}/mindspore/ccsrc/plugin/device/cpu/kernel) if(NOT WIN32 AND NOT MSLITE_ENABLE_ACL) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -rdynamic -fvisibility=hidden") diff --git a/mindspore/lite/tools/converter/adapter/acl/acl_pass.h b/mindspore/lite/tools/converter/adapter/acl/acl_pass.h index 0e0d4b5d59..9a92cb5d10 100644 --- a/mindspore/lite/tools/converter/adapter/acl/acl_pass.h +++ b/mindspore/lite/tools/converter/adapter/acl/acl_pass.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_TOOLS_CONVERTER_ADAPTER_ACL_PASS_H #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/adapter/acl/infer/custom_infer.cc b/mindspore/lite/tools/converter/adapter/acl/infer/custom_infer.cc index f4211a9794..459f17daa2 100644 --- a/mindspore/lite/tools/converter/adapter/acl/infer/custom_infer.cc +++ b/mindspore/lite/tools/converter/adapter/acl/infer/custom_infer.cc @@ -19,7 +19,7 @@ #include "include/registry/register_kernel_interface.h" #include "common/log_adapter.h" #include "tools/converter/adapter/acl/common/acl_types.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" namespace mindspore { namespace lite { diff --git a/mindspore/lite/tools/converter/adapter/acl/mapper/primitive_mapper.cc b/mindspore/lite/tools/converter/adapter/acl/mapper/primitive_mapper.cc index 65fde39994..c3cc4c9c06 100644 --- a/mindspore/lite/tools/converter/adapter/acl/mapper/primitive_mapper.cc +++ b/mindspore/lite/tools/converter/adapter/acl/mapper/primitive_mapper.cc @@ -24,7 +24,7 @@ #include "include/registry/converter_context.h" #include "ops/op_utils.h" #include "ops/fusion/avg_pool_fusion.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "src/common/log_util.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/adapter/acl/src/acl_pass_impl.cc b/mindspore/lite/tools/converter/adapter/acl/src/acl_pass_impl.cc index da79f111db..9ce82447d1 100644 --- a/mindspore/lite/tools/converter/adapter/acl/src/acl_pass_impl.cc +++ b/mindspore/lite/tools/converter/adapter/acl/src/acl_pass_impl.cc @@ -31,7 +31,7 @@ #include "ops/tuple_get_item.h" #include "base/core_ops.h" #include "cxx_api/model/acl/model_converter.h" -#include "backend/kernel_compiler/cpu/nnacl/op_base.h" +#include "plugin/device/cpu/kernel/nnacl/op_base.h" #include "src/common/log_util.h" namespace mindspore { diff --git a/mindspore/lite/tools/converter/adapter/acl/src/acl_pass_impl.h b/mindspore/lite/tools/converter/adapter/acl/src/acl_pass_impl.h index 6bd03144d9..4fedc5e3e6 100644 --- a/mindspore/lite/tools/converter/adapter/acl/src/acl_pass_impl.h +++ b/mindspore/lite/tools/converter/adapter/acl/src/acl_pass_impl.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "include/errorcode.h" #include "include/api/types.h" #include "include/registry/converter_context.h" diff --git a/mindspore/lite/tools/converter/anf_transform.h b/mindspore/lite/tools/converter/anf_transform.h index fa9b567447..76f628e1ec 100644 --- a/mindspore/lite/tools/converter/anf_transform.h +++ b/mindspore/lite/tools/converter/anf_transform.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "schema/inner/model_generated.h" #include "tools/common/meta_graph_serializer.h" #include "tools/converter/converter_flags.h" diff --git a/mindspore/lite/tools/converter/export_model.cc b/mindspore/lite/tools/converter/export_model.cc index 1a37092177..a49b739800 100644 --- a/mindspore/lite/tools/converter/export_model.cc +++ b/mindspore/lite/tools/converter/export_model.cc @@ -21,7 +21,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "include/errorcode.h" #include "include/version.h" #include "ir/func_graph.h" diff --git a/mindspore/lite/tools/converter/import/primitive_adjust.h b/mindspore/lite/tools/converter/import/primitive_adjust.h index 8596059fdb..349a252cf7 100644 --- a/mindspore/lite/tools/converter/import/primitive_adjust.h +++ b/mindspore/lite/tools/converter/import/primitive_adjust.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/tools/converter/optimizer_manager.cc b/mindspore/lite/tools/converter/optimizer_manager.cc index 048b5d9dd5..6b4a4388f2 100644 --- a/mindspore/lite/tools/converter/optimizer_manager.cc +++ b/mindspore/lite/tools/converter/optimizer_manager.cc @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "src/common/log_util.h" #include "tools/converter/parser/parser_utils.h" #include "include/registry/pass_base.h" diff --git a/mindspore/lite/tools/converter/optimizer_manager.h b/mindspore/lite/tools/converter/optimizer_manager.h index c1e016f952..fc8a7d8e0b 100644 --- a/mindspore/lite/tools/converter/optimizer_manager.h +++ b/mindspore/lite/tools/converter/optimizer_manager.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "include/errorcode.h" #include "include/registry/pass_registry.h" #include "ir/func_graph.h" diff --git a/mindspore/lite/tools/converter/parser/conv1d_inout_adjust.h b/mindspore/lite/tools/converter/parser/conv1d_inout_adjust.h index 2435c87b08..6f4191ad56 100644 --- a/mindspore/lite/tools/converter/parser/conv1d_inout_adjust.h +++ b/mindspore/lite/tools/converter/parser/conv1d_inout_adjust.h @@ -18,8 +18,8 @@ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_CONV1D_INOUT_ADJUST_PASS_H_ #include #include -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/converter_flags.h" namespace mindspore::lite { diff --git a/mindspore/lite/tools/converter/parser/lstm_adjust_pass.h b/mindspore/lite/tools/converter/parser/lstm_adjust_pass.h index 79296d20c0..cfec1caf83 100644 --- a/mindspore/lite/tools/converter/parser/lstm_adjust_pass.h +++ b/mindspore/lite/tools/converter/parser/lstm_adjust_pass.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/format_utils.h" diff --git a/mindspore/lite/tools/converter/parser/onnx/onnx_inputs_adjust.h b/mindspore/lite/tools/converter/parser/onnx/onnx_inputs_adjust.h index 4e8753cdd3..4c16382012 100644 --- a/mindspore/lite/tools/converter/parser/onnx/onnx_inputs_adjust.h +++ b/mindspore/lite/tools/converter/parser/onnx/onnx_inputs_adjust.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_TOOLS_CONVERTER_PARSER_ONNX_ONNX_INPUTS_ADJUST_H_ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/tools/converter/parser/onnx/onnx_nonzero_adjust.h b/mindspore/lite/tools/converter/parser/onnx/onnx_nonzero_adjust.h index 293a54967a..2ad50ce76a 100644 --- a/mindspore/lite/tools/converter/parser/onnx/onnx_nonzero_adjust.h +++ b/mindspore/lite/tools/converter/parser/onnx/onnx_nonzero_adjust.h @@ -16,8 +16,8 @@ #ifndef LITE_ONNX_NONZERO_ADJUST_H #define LITE_ONNX_NONZERO_ADJUST_H -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::lite { class OnnxNonZeroAdjust { diff --git a/mindspore/lite/tools/converter/parser/onnx/onnx_pad_adjust.h b/mindspore/lite/tools/converter/parser/onnx/onnx_pad_adjust.h index 0911ac7f62..485c7186b0 100644 --- a/mindspore/lite/tools/converter/parser/onnx/onnx_pad_adjust.h +++ b/mindspore/lite/tools/converter/parser/onnx/onnx_pad_adjust.h @@ -18,8 +18,8 @@ #define MINDSPORE_LITE_TOOLS_CONVERTER_PARSER_ONNX_ONNX_PAD_ADJUST_H_ #include #include -#include "backend/optimizer/common/pass.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/pass.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::lite { class OnnxPadAdjust { diff --git a/mindspore/lite/tools/converter/parser/tf/functionalize_cond.h b/mindspore/lite/tools/converter/parser/tf/functionalize_cond.h index 856d12c2cf..ef1e461505 100644 --- a/mindspore/lite/tools/converter/parser/tf/functionalize_cond.h +++ b/mindspore/lite/tools/converter/parser/tf/functionalize_cond.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/gllo_utils.h" #include "tools/converter/parser/tf/functionalize_control_op_pass.h" diff --git a/mindspore/lite/tools/converter/parser/tf/functionalize_control_op_pass.h b/mindspore/lite/tools/converter/parser/tf/functionalize_control_op_pass.h index e1872173f4..1258b7fa4f 100644 --- a/mindspore/lite/tools/converter/parser/tf/functionalize_control_op_pass.h +++ b/mindspore/lite/tools/converter/parser/tf/functionalize_control_op_pass.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" #include "tools/converter/ops/ops_def.h" #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/tools/converter/parser/tf/functionalize_while.h b/mindspore/lite/tools/converter/parser/tf/functionalize_while.h index 3e58daaec3..100ccfced6 100644 --- a/mindspore/lite/tools/converter/parser/tf/functionalize_while.h +++ b/mindspore/lite/tools/converter/parser/tf/functionalize_while.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/gllo_utils.h" #include "tools/converter/parser/tf/functionalize_control_op_pass.h" diff --git a/mindspore/lite/tools/converter/parser/tf_bidirection_gru_cf_fusion.h b/mindspore/lite/tools/converter/parser/tf_bidirection_gru_cf_fusion.h index 9f08c06946..e785608d08 100644 --- a/mindspore/lite/tools/converter/parser/tf_bidirection_gru_cf_fusion.h +++ b/mindspore/lite/tools/converter/parser/tf_bidirection_gru_cf_fusion.h @@ -21,7 +21,7 @@ #include #include "tools/optimizer/fusion/tf_bidirection_gru_fusion.h" #include "schema/inner/model_generated.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "include/errorcode.h" diff --git a/mindspore/lite/tools/converter/parser/unused_node_remove_pass.h b/mindspore/lite/tools/converter/parser/unused_node_remove_pass.h index 35595547ca..f7235a2c89 100644 --- a/mindspore/lite/tools/converter/parser/unused_node_remove_pass.h +++ b/mindspore/lite/tools/converter/parser/unused_node_remove_pass.h @@ -18,7 +18,7 @@ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" #include "mindspore/lite/include/errorcode.h" diff --git a/mindspore/lite/tools/converter/quantizer/quantization_optimizer.h b/mindspore/lite/tools/converter/quantizer/quantization_optimizer.h index f71947bfed..8f6a2e8da8 100644 --- a/mindspore/lite/tools/converter/quantizer/quantization_optimizer.h +++ b/mindspore/lite/tools/converter/quantizer/quantization_optimizer.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" namespace mindspore::lite::quant { diff --git a/mindspore/lite/tools/cropper/build_cropper_config.sh b/mindspore/lite/tools/cropper/build_cropper_config.sh index 71da545c24..f3595bf61a 100644 --- a/mindspore/lite/tools/cropper/build_cropper_config.sh +++ b/mindspore/lite/tools/cropper/build_cropper_config.sh @@ -48,7 +48,7 @@ HEADER_LOCATION="-I${MINDSPORE_HOME} -I${FLATBUFFERS} -I${MINDSPORE_HOME}/mindspore/lite/build/schema -I${MINDSPORE_HOME}/mindspore/lite/build/schema/inner --I${MINDSPORE_HOME}/mindspore/ccsrc/backend/kernel_compiler/cpu +-I${MINDSPORE_HOME}/mindspore/ccsrc/plugin/device/cpu/kernel -I${MINDSPORE_HOME}/mindspore/ccsrc/minddata/dataset" REMOVE_LISTS_STR="" @@ -158,18 +158,18 @@ getCommonFile() { while IFS='' read -r line; do train_files_h+=("$line"); done < <(ls mindspore/lite/src/train/*.h) others_files_h=( mindspore/lite/src/runtime/infer_manager.h - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer_register.h - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_utils.h + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer_register.h + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_utils.h mindspore/lite/src/ops/populate/populate_register.h - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/op_base.h + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/op_base.h mindspore/core/ir/dtype/type_id.h mindspore/core/utils/overload.h mindspore/lite/tools/common/option.h - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_instructions.h - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/intrinsics/ms_simd_instructions_fp16.h - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer.h - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/tensor_c.h - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/errorcode.h + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_instructions.h + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/intrinsics/ms_simd_instructions_fp16.h + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer.h + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/tensor_c.h + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/errorcode.h ) all_files_h=("${include_h[@]}" "${regist_include_h[@]}" "${src_files_h[@]}" "${common_files_h[@]}" "${runtime_files_h[@]}" "${others_files_h[@]}" @@ -202,12 +202,12 @@ getCommonFile() { while IFS='' read -r line; do runtime_files_cc+=("$line"); done < <(ls mindspore/lite/src/runtime/*.cc) # sava all assembly files assembly_files=() - while IFS='' read -r line; do assembly_files+=("$line"); done < <(ls mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/assembly/*/*.S) + while IFS='' read -r line; do assembly_files+=("$line"); done < <(ls mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/assembly/*/*.S) others_files_c=( - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/nnacl_utils.c + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/nnacl_utils.c mindspore/lite/src/runtime/infer_manager.cc mindspore/lite/src/ops/populate/populate_register.cc - mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer/infer_register.c + mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer/infer_register.c mindspore/core/utils/status.cc ) # save train files @@ -298,7 +298,7 @@ wait sleep 1 # get src/ops getOpsFile "REG_POPULATE\(PrimitiveType_" "mindspore/lite/src/ops/populate" "prototype" & -getOpsFile "REG_INFER\(.*?, PrimType_" "mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/infer" "prototype" & +getOpsFile "REG_INFER\(.*?, PrimType_" "mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/infer" "prototype" & # support for cpu getOpsFile "REG_KERNEL\(.*?, kNumberTypeFloat32, PrimitiveType_" "mindspore/lite/src/runtime/kernel/arm" "kNumberTypeFloat32" & getOpsFile "REG_KERNEL\(.*?, kNumberTypeFloat16, PrimitiveType_" "mindspore/lite/src/runtime/kernel/arm" "kNumberTypeFloat16" & diff --git a/mindspore/lite/tools/optimizer/common/gllo_utils.cc b/mindspore/lite/tools/optimizer/common/gllo_utils.cc index 442729ae4c..bc55f6500a 100644 --- a/mindspore/lite/tools/optimizer/common/gllo_utils.cc +++ b/mindspore/lite/tools/optimizer/common/gllo_utils.cc @@ -28,7 +28,7 @@ #include "ops/tuple_get_item.h" #include "tools/common/tensor_util.h" #include "frontend/operator/ops.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "tools/converter/quant_param_holder.h" #include "nnacl/op_base.h" #include "src/common/log_util.h" diff --git a/mindspore/lite/tools/optimizer/common/gllo_utils.h b/mindspore/lite/tools/optimizer/common/gllo_utils.h index fc39fc12b1..707fcc06d1 100644 --- a/mindspore/lite/tools/optimizer/common/gllo_utils.h +++ b/mindspore/lite/tools/optimizer/common/gllo_utils.h @@ -25,7 +25,7 @@ #include "ir/anf.h" #include "ir/func_graph.h" #include "src/common/utils.h" -#include "backend/optimizer/common/pattern_engine.h" +#include "backend/common/optimizer/pattern_engine.h" #include "ops/fusion/conv2d_backprop_input_fusion.h" #include "schema/inner/model_generated.h" #include "tools/converter/converter_context.h" diff --git a/mindspore/lite/tools/optimizer/common/helper.cc b/mindspore/lite/tools/optimizer/common/helper.cc index 68b3ea39fc..7b62298ea3 100644 --- a/mindspore/lite/tools/optimizer/common/helper.cc +++ b/mindspore/lite/tools/optimizer/common/helper.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include #include #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/tools/optimizer/common/multiple_pattern_process_pass.h b/mindspore/lite/tools/optimizer/common/multiple_pattern_process_pass.h index a8aecd0290..5ef79407af 100644 --- a/mindspore/lite/tools/optimizer/common/multiple_pattern_process_pass.h +++ b/mindspore/lite/tools/optimizer/common/multiple_pattern_process_pass.h @@ -21,9 +21,9 @@ #include #include #include -#include "backend/optimizer/common/node_pass.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/node_pass.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/helper.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/common/node_pass_extends.cc b/mindspore/lite/tools/optimizer/common/node_pass_extends.cc index be1c8baa77..670ce500b3 100644 --- a/mindspore/lite/tools/optimizer/common/node_pass_extends.cc +++ b/mindspore/lite/tools/optimizer/common/node_pass_extends.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/common/node_pass.h" +#include "backend/common/optimizer/node_pass.h" #include #include #include diff --git a/mindspore/lite/tools/optimizer/common/pass_manager_extends.cc b/mindspore/lite/tools/optimizer/common/pass_manager_extends.cc index 744519327d..3dca8e7d1b 100644 --- a/mindspore/lite/tools/optimizer/common/pass_manager_extends.cc +++ b/mindspore/lite/tools/optimizer/common/pass_manager_extends.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/optimizer/pass_manager.h" #ifndef _MSC_VER #include #endif diff --git a/mindspore/lite/tools/optimizer/const_fold/constant_folding_fusion.h b/mindspore/lite/tools/optimizer/const_fold/constant_folding_fusion.h index 3b63226f92..70306d9b94 100644 --- a/mindspore/lite/tools/optimizer/const_fold/constant_folding_fusion.h +++ b/mindspore/lite/tools/optimizer/const_fold/constant_folding_fusion.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_TOOLS_OPTIMIZER_CONST_FOLD_CONSTANT_FOLDING_FUSION_H_ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_CONST_FOLD_CONSTANT_FOLDING_FUSION_H_ -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "include/registry/converter_context.h" #include "tools/optimizer/const_fold/fold_along_infershape.h" #include "tools/optimizer/const_fold/fold_with_infershape.h" diff --git a/mindspore/lite/tools/optimizer/const_fold/fold_utils.cc b/mindspore/lite/tools/optimizer/const_fold/fold_utils.cc index 9c25eaf523..6cbf45e38b 100644 --- a/mindspore/lite/tools/optimizer/const_fold/fold_utils.cc +++ b/mindspore/lite/tools/optimizer/const_fold/fold_utils.cc @@ -18,7 +18,7 @@ #include #include #include -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "ir/anf.h" #include "tools/converter/quant_param_holder.h" #include "tools/optimizer/common/format_utils.h" diff --git a/mindspore/lite/tools/optimizer/const_fold/fold_with_infershape.h b/mindspore/lite/tools/optimizer/const_fold/fold_with_infershape.h index 598d022850..d314158c4c 100644 --- a/mindspore/lite/tools/optimizer/const_fold/fold_with_infershape.h +++ b/mindspore/lite/tools/optimizer/const_fold/fold_with_infershape.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "include/registry/converter_context.h" #include "tools/optimizer/graph/node_infershape.h" #include "tools/optimizer/const_fold/fold_utils.h" diff --git a/mindspore/lite/tools/optimizer/fisson/eliminate_concat_split.h b/mindspore/lite/tools/optimizer/fisson/eliminate_concat_split.h index 541453c4a9..343c95cd53 100644 --- a/mindspore/lite/tools/optimizer/fisson/eliminate_concat_split.h +++ b/mindspore/lite/tools/optimizer/fisson/eliminate_concat_split.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_TOOLS_OPTIMIZER_FUSION_ELIMINATE_CONCAT_SPLIT_H_ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_FUSION_ELIMINATE_CONCAT_SPLIT_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/optimizer/fisson/fisson_util.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fisson/iter_node_outputs.h b/mindspore/lite/tools/optimizer/fisson/iter_node_outputs.h index 269d97e7fd..cb83e61e69 100644 --- a/mindspore/lite/tools/optimizer/fisson/iter_node_outputs.h +++ b/mindspore/lite/tools/optimizer/fisson/iter_node_outputs.h @@ -15,7 +15,7 @@ */ #include "ir/anf.h" -#include "mindspore/ccsrc/backend/optimizer/common/node_pass.h" +#include "mindspore/ccsrc/backend/common/optimizer/node_pass.h" #ifndef MINDSPORE_LITE_TOOLS_OPTIMIZER_FISSON_ITER_NODE_OUTPUTS_H_ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_FISSON_ITER_NODE_OUTPUTS_H_ diff --git a/mindspore/lite/tools/optimizer/fisson/multi_conv_split_pass.h b/mindspore/lite/tools/optimizer/fisson/multi_conv_split_pass.h index 4b049226db..23bf8076f8 100644 --- a/mindspore/lite/tools/optimizer/fisson/multi_conv_split_pass.h +++ b/mindspore/lite/tools/optimizer/fisson/multi_conv_split_pass.h @@ -22,7 +22,7 @@ #include #include #include "schema/model_generated.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/optimizer/fisson/fisson_util.h" #include "tools/optimizer/parallel/split_strategy.h" #include "tools/optimizer/parallel/multi_node_split.h" diff --git a/mindspore/lite/tools/optimizer/fisson/node_out_shapes.h b/mindspore/lite/tools/optimizer/fisson/node_out_shapes.h index e551f0e629..4341ad770a 100644 --- a/mindspore/lite/tools/optimizer/fisson/node_out_shapes.h +++ b/mindspore/lite/tools/optimizer/fisson/node_out_shapes.h @@ -15,7 +15,7 @@ */ #include "ir/anf.h" -#include "mindspore/ccsrc/backend/optimizer/common/node_pass.h" +#include "mindspore/ccsrc/backend/common/optimizer/node_pass.h" #ifndef MINDSPORE_LITE_TOOLS_OPTIMIZER_FISSON_NODE_OUT_SHAPES_H_ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_FISSON_NODE_OUT_SHAPES_H_ diff --git a/mindspore/lite/tools/optimizer/format/delete_redundant_transpose.h b/mindspore/lite/tools/optimizer/format/delete_redundant_transpose.h index 1ce9a8d6a3..8ec4e63a78 100644 --- a/mindspore/lite/tools/optimizer/format/delete_redundant_transpose.h +++ b/mindspore/lite/tools/optimizer/format/delete_redundant_transpose.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_TOOLS_OPTIMIZER_FORMAT_DELETE_REDUNDANT_TRANSPOSE_H_ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_FORMAT_DELETE_REDUNDANT_TRANSPOSE_H_ -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/optimizer/common/gllo_utils.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/format/to_format_base.h b/mindspore/lite/tools/optimizer/format/to_format_base.h index 6a3f3a3849..2c5f81dff2 100644 --- a/mindspore/lite/tools/optimizer/format/to_format_base.h +++ b/mindspore/lite/tools/optimizer/format/to_format_base.h @@ -22,7 +22,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/format_utils.h" #include "tools/optimizer/graph/infershape_pass.h" diff --git a/mindspore/lite/tools/optimizer/fusion/activation_fusion.h b/mindspore/lite/tools/optimizer/fusion/activation_fusion.h index 69ca31f1e4..4edb4be63e 100644 --- a/mindspore/lite/tools/optimizer/fusion/activation_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/activation_fusion.h @@ -17,9 +17,9 @@ #ifndef MINDSPORE_LITE_SRC_PASS_FUSION_ACTIVATION_FUSION_H_ #define MINDSPORE_LITE_SRC_PASS_FUSION_ACTIVATION_FUSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/converter_context.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/fusion/add_concat_activation_fusion.h b/mindspore/lite/tools/optimizer/fusion/add_concat_activation_fusion.h index 7af773fcdc..fdad6507f7 100644 --- a/mindspore/lite/tools/optimizer/fusion/add_concat_activation_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/add_concat_activation_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_FUSION_ADD_CONCAT_ACTIVATION_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt { class AddConcatActivationFusion : public PatternProcessPass { diff --git a/mindspore/lite/tools/optimizer/fusion/affine_activation_fusion.h b/mindspore/lite/tools/optimizer/fusion/affine_activation_fusion.h index 7f2d458d5c..f7aed4b58f 100644 --- a/mindspore/lite/tools/optimizer/fusion/affine_activation_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/affine_activation_fusion.h @@ -19,7 +19,7 @@ #include #include "schema/inner/model_generated.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/fusion/affine_fusion.h b/mindspore/lite/tools/optimizer/fusion/affine_fusion.h index a4a0712ce4..52b310c0c8 100644 --- a/mindspore/lite/tools/optimizer/fusion/affine_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/affine_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_AFFINE_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "schema/inner/model_generated.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/batchmatmul_fusion.h b/mindspore/lite/tools/optimizer/fusion/batchmatmul_fusion.h index c7ddccaa75..96cf04ae45 100644 --- a/mindspore/lite/tools/optimizer/fusion/batchmatmul_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/batchmatmul_fusion.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_PASS_FUSION_BATCHMATMUL_FUSION_H_ #define MINDSPORE_LITE_SRC_PASS_FUSION_BATCHMATMUL_FUSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/converter_context.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/batchnorm_to_scale_fusion.h b/mindspore/lite/tools/optimizer/fusion/batchnorm_to_scale_fusion.h index 457a23e0cf..50c2b4d010 100644 --- a/mindspore/lite/tools/optimizer/fusion/batchnorm_to_scale_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/batchnorm_to_scale_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_BN_TO_SCALE_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt { class BatchNormToScaleFusion : public Pass { diff --git a/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.h index d3bf68794b..3ac6fadebb 100644 --- a/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_activation_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_CONV_ACTIVATION_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.h index de5c675e70..e1b2e1fe50 100644 --- a/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_biasadd_fusion.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_PASS_FUSION_CONV_BIASADD_FUSION_H_ #define MINDSPORE_LITE_SRC_PASS_FUSION_CONV_BIASADD_FUSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/converter_context.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/conv_conv_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_conv_fusion.h index c36689c77b..70fb49ae3f 100644 --- a/mindspore/lite/tools/optimizer/fusion/conv_conv_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_conv_fusion.h @@ -19,7 +19,7 @@ #include #include "schema/inner/model_generated.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/fusion/conv_pad_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_pad_fusion.h index 282f151d62..bab2604d52 100644 --- a/mindspore/lite/tools/optimizer/fusion/conv_pad_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_pad_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/optimizer/common/multiple_pattern_process_pass.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.h index 80b40f0717..8c9d3d37dc 100644 --- a/mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_transform_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_CONV_TRANSFORM_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/converter_flags.h" using mindspore::converter::FmkType; diff --git a/mindspore/lite/tools/optimizer/fusion/conv_tuple_activation_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_tuple_activation_fusion.h index c5c6c04f1c..1a0ad5349b 100644 --- a/mindspore/lite/tools/optimizer/fusion/conv_tuple_activation_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_tuple_activation_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_CONV_TUPLE_ACTIVATION_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/fusion/conv_tuplegetitem_fusion.h b/mindspore/lite/tools/optimizer/fusion/conv_tuplegetitem_fusion.h index 90a124591f..1e324e26dd 100644 --- a/mindspore/lite/tools/optimizer/fusion/conv_tuplegetitem_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/conv_tuplegetitem_fusion.h @@ -16,7 +16,7 @@ #ifndef LITE_MINDSPORE_LITE_TOOLS_OPTIMIZER_FUSION_CONV_TUPLEGETITEM_FUSION_H_ #define LITE_MINDSPORE_LITE_TOOLS_OPTIMIZER_FUSION_CONV_TUPLEGETITEM_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt { class ConvTupleGetItemFusion : public PatternProcessPass { public: diff --git a/mindspore/lite/tools/optimizer/fusion/fullconnected_add_fusion.h b/mindspore/lite/tools/optimizer/fusion/fullconnected_add_fusion.h index 3bc2b88da9..fd184536c2 100644 --- a/mindspore/lite/tools/optimizer/fusion/fullconnected_add_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/fullconnected_add_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/optimizer/common/multiple_pattern_process_pass.h" namespace mindspore::opt { diff --git a/mindspore/lite/tools/optimizer/fusion/fullconnected_fusion.h b/mindspore/lite/tools/optimizer/fusion/fullconnected_fusion.h index 1c7b0e1c35..57fea4544f 100644 --- a/mindspore/lite/tools/optimizer/fusion/fullconnected_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/fullconnected_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/optimizer/fusion/conv_transform_fusion.h" #include "tools/optimizer/common/multiple_pattern_process_pass.h" #include "schema/inner/model_generated.h" diff --git a/mindspore/lite/tools/optimizer/fusion/gelu_fusion.h b/mindspore/lite/tools/optimizer/fusion/gelu_fusion.h index 51eab3d82e..196928b57b 100644 --- a/mindspore/lite/tools/optimizer/fusion/gelu_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/gelu_fusion.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/tools/optimizer/fusion/glu_fusion.h b/mindspore/lite/tools/optimizer/fusion/glu_fusion.h index c75b9c482c..a596d69f61 100644 --- a/mindspore/lite/tools/optimizer/fusion/glu_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/glu_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/tools/optimizer/fusion/matmul_activation_fusion.h b/mindspore/lite/tools/optimizer/fusion/matmul_activation_fusion.h index bb031c12a1..2ea93df448 100644 --- a/mindspore/lite/tools/optimizer/fusion/matmul_activation_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/matmul_activation_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_MATMUL_ACTIVATION_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/converter_context.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/matmul_add_fusion.h b/mindspore/lite/tools/optimizer/fusion/matmul_add_fusion.h index e5e967b991..78e8b1992f 100644 --- a/mindspore/lite/tools/optimizer/fusion/matmul_add_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/matmul_add_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/optimizer/common/multiple_pattern_process_pass.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/matmul_mul_fusion.h b/mindspore/lite/tools/optimizer/fusion/matmul_mul_fusion.h index a1304d7fa7..0c45b45ff0 100644 --- a/mindspore/lite/tools/optimizer/fusion/matmul_mul_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/matmul_mul_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_FUSION_MATMUL_MUL_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt { class MatMulMulFusion : public PatternProcessPass { diff --git a/mindspore/lite/tools/optimizer/fusion/matmul_scale_fusion.h b/mindspore/lite/tools/optimizer/fusion/matmul_scale_fusion.h index d809419adf..c90a3f4a65 100644 --- a/mindspore/lite/tools/optimizer/fusion/matmul_scale_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/matmul_scale_fusion.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/optimizer/fusion/scale_base_fusion.h" #include "ops/mat_mul.h" diff --git a/mindspore/lite/tools/optimizer/fusion/mul_add_fusion.h b/mindspore/lite/tools/optimizer/fusion/mul_add_fusion.h index 63398459fe..65a0d833a3 100644 --- a/mindspore/lite/tools/optimizer/fusion/mul_add_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/mul_add_fusion.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/quant_param_holder.h" #include "tools/optimizer/common/multiple_pattern_process_pass.h" #include "ops/fusion/scale_fusion.h" diff --git a/mindspore/lite/tools/optimizer/fusion/norm_fusion.h b/mindspore/lite/tools/optimizer/fusion/norm_fusion.h index 3054f46bf5..a03512584a 100644 --- a/mindspore/lite/tools/optimizer/fusion/norm_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/norm_fusion.h @@ -22,7 +22,7 @@ #include #include #include "schema/inner/model_generated.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/tools/optimizer/fusion/reshape_reshape_fusion.h b/mindspore/lite/tools/optimizer/fusion/reshape_reshape_fusion.h index 795a736e55..12a42c65ec 100644 --- a/mindspore/lite/tools/optimizer/fusion/reshape_reshape_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/reshape_reshape_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/check_convert_utils.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/scale_activation_fusion.h b/mindspore/lite/tools/optimizer/fusion/scale_activation_fusion.h index 4764569f7a..9be173dd40 100644 --- a/mindspore/lite/tools/optimizer/fusion/scale_activation_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/scale_activation_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_SCALE_ACTIVATION_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/fusion/scale_base_fusion.h b/mindspore/lite/tools/optimizer/fusion/scale_base_fusion.h index 20790aa9a8..2029132344 100644 --- a/mindspore/lite/tools/optimizer/fusion/scale_base_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/scale_base_fusion.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "ops/fusion/scale_fusion.h" #include "tools/optimizer/common/gllo_utils.h" diff --git a/mindspore/lite/tools/optimizer/fusion/scale_scale_fusion.h b/mindspore/lite/tools/optimizer/fusion/scale_scale_fusion.h index 9c5cda584d..748025c067 100644 --- a/mindspore/lite/tools/optimizer/fusion/scale_scale_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/scale_scale_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore::opt { class ScaleScaleFusion : public PatternProcessPass { diff --git a/mindspore/lite/tools/optimizer/fusion/sigmoid_mul_fusion.h b/mindspore/lite/tools/optimizer/fusion/sigmoid_mul_fusion.h index 1e4ee2893b..d8ac022b3d 100644 --- a/mindspore/lite/tools/optimizer/fusion/sigmoid_mul_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/sigmoid_mul_fusion.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_PASS_FUSION_SIGMOID_MUL_FUSION_H_ #define MINDSPORE_LITE_SRC_PASS_FUSION_SIGMOID_MUL_FUSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/converter_context.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/squeeze_fusion.h b/mindspore/lite/tools/optimizer/fusion/squeeze_fusion.h index 8dc7edd7cf..67fa6f63a3 100644 --- a/mindspore/lite/tools/optimizer/fusion/squeeze_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/squeeze_fusion.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_FUSION_SQUEEZE_FUSION_H_ #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "schema/inner/model_generated.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/tensor_dot_fusion.h b/mindspore/lite/tools/optimizer/fusion/tensor_dot_fusion.h index 8733c589aa..fc2c655a09 100644 --- a/mindspore/lite/tools/optimizer/fusion/tensor_dot_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/tensor_dot_fusion.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/quant_param_holder.h" #include "tools/optimizer/common/multiple_pattern_process_pass.h" #include "ops/fusion/scale_fusion.h" diff --git a/mindspore/lite/tools/optimizer/fusion/tf_bidirection_gru_fusion.h b/mindspore/lite/tools/optimizer/fusion/tf_bidirection_gru_fusion.h index 6bbedce244..42dd8dc28f 100644 --- a/mindspore/lite/tools/optimizer/fusion/tf_bidirection_gru_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/tf_bidirection_gru_fusion.h @@ -21,7 +21,7 @@ #include "tools/optimizer/fusion/tflite_lstm_cell_fusion.h" #include "tools/optimizer/common/gllo_utils.h" #include "schema/inner/model_generated.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "include/errorcode.h" diff --git a/mindspore/lite/tools/optimizer/fusion/tf_lstm_cell_fusion.h b/mindspore/lite/tools/optimizer/fusion/tf_lstm_cell_fusion.h index ac1d5e93ec..95d9ed9943 100644 --- a/mindspore/lite/tools/optimizer/fusion/tf_lstm_cell_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/tf_lstm_cell_fusion.h @@ -20,7 +20,7 @@ #include #include "schema/inner/model_generated.h" #include "tools/optimizer/fusion/tflite_lstm_cell_fusion.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "include/errorcode.h" diff --git a/mindspore/lite/tools/optimizer/fusion/tflite_lstm_cell_fusion.h b/mindspore/lite/tools/optimizer/fusion/tflite_lstm_cell_fusion.h index 973b7ba143..a69c6823a4 100644 --- a/mindspore/lite/tools/optimizer/fusion/tflite_lstm_cell_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/tflite_lstm_cell_fusion.h @@ -19,7 +19,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "include/errorcode.h" diff --git a/mindspore/lite/tools/optimizer/fusion/tflite_rel_pos_multi_head_attention_fusion.h b/mindspore/lite/tools/optimizer/fusion/tflite_rel_pos_multi_head_attention_fusion.h index 29c6498e6d..792fa1602a 100644 --- a/mindspore/lite/tools/optimizer/fusion/tflite_rel_pos_multi_head_attention_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/tflite_rel_pos_multi_head_attention_fusion.h @@ -20,7 +20,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "include/errorcode.h" #include "tools/optimizer/fusion/multi_head_attention_fusion.h" diff --git a/mindspore/lite/tools/optimizer/fusion/transpose_fusion.h b/mindspore/lite/tools/optimizer/fusion/transpose_fusion.h index c693bcbf97..67d1b24612 100644 --- a/mindspore/lite/tools/optimizer/fusion/transpose_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/transpose_fusion.h @@ -19,7 +19,7 @@ #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/optimizer/common/multiple_pattern_process_pass.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/fusion/transpose_matmul_fusion.h b/mindspore/lite/tools/optimizer/fusion/transpose_matmul_fusion.h index 538a72f51e..ed0668b5d0 100644 --- a/mindspore/lite/tools/optimizer/fusion/transpose_matmul_fusion.h +++ b/mindspore/lite/tools/optimizer/fusion/transpose_matmul_fusion.h @@ -17,9 +17,9 @@ #ifndef MINDSPORE_LITE_SRC_PASS_FUSION_TRANSPOSE_MATMUL_FUSION_H_ #define MINDSPORE_LITE_SRC_PASS_FUSION_TRANSPOSE_MATMUL_FUSION_H_ -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "tools/converter/converter_context.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/graph/add_tensor_array.h b/mindspore/lite/tools/optimizer/graph/add_tensor_array.h index d61ed0cb44..0f3cd8207e 100644 --- a/mindspore/lite/tools/optimizer/graph/add_tensor_array.h +++ b/mindspore/lite/tools/optimizer/graph/add_tensor_array.h @@ -19,7 +19,7 @@ #include #include "schema/inner/model_generated.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/graph/clip_convert_activation_pass.h b/mindspore/lite/tools/optimizer/graph/clip_convert_activation_pass.h index b73de3de91..fff2fb3634 100644 --- a/mindspore/lite/tools/optimizer/graph/clip_convert_activation_pass.h +++ b/mindspore/lite/tools/optimizer/graph/clip_convert_activation_pass.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_CLIP_CONVERT_ACTIVATION_PASS_H_ #include #include "tools/converter/converter_flags.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" using mindspore::converter::FmkType; using mindspore::schema::QuantType; diff --git a/mindspore/lite/tools/optimizer/graph/control_flow_pass.h b/mindspore/lite/tools/optimizer/graph/control_flow_pass.h index 3a284342e9..e7028640a9 100644 --- a/mindspore/lite/tools/optimizer/graph/control_flow_pass.h +++ b/mindspore/lite/tools/optimizer/graph/control_flow_pass.h @@ -23,7 +23,7 @@ #include #include "schema/inner/model_generated.h" #include "tools/converter/converter_flags.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore::opt { class ControlFlowPass : public Pass { diff --git a/mindspore/lite/tools/optimizer/graph/conv1d_weight_expanding_pass.h b/mindspore/lite/tools/optimizer/graph/conv1d_weight_expanding_pass.h index 1ef5e2dba2..655a8dd816 100644 --- a/mindspore/lite/tools/optimizer/graph/conv1d_weight_expanding_pass.h +++ b/mindspore/lite/tools/optimizer/graph/conv1d_weight_expanding_pass.h @@ -19,7 +19,7 @@ #include #include "schema/inner/model_generated.h" #include "tools/converter/converter_flags.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/optimizer/common/gllo_utils.h" namespace mindspore::opt { diff --git a/mindspore/lite/tools/optimizer/graph/decrease_transpose_algo.h b/mindspore/lite/tools/optimizer/graph/decrease_transpose_algo.h index f3a6048f0f..175512fe09 100644 --- a/mindspore/lite/tools/optimizer/graph/decrease_transpose_algo.h +++ b/mindspore/lite/tools/optimizer/graph/decrease_transpose_algo.h @@ -22,7 +22,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/format_utils.h" diff --git a/mindspore/lite/tools/optimizer/graph/dump_graph.h b/mindspore/lite/tools/optimizer/graph/dump_graph.h index c1477b9f28..6833b0d978 100644 --- a/mindspore/lite/tools/optimizer/graph/dump_graph.h +++ b/mindspore/lite/tools/optimizer/graph/dump_graph.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_DUMP_GRAPH_H_ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_DUMP_GRAPH_H_ -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/export_model.h" #include "include/registry/pass_base.h" diff --git a/mindspore/lite/tools/optimizer/graph/group_depthwise_op_convert_pass.h b/mindspore/lite/tools/optimizer/graph/group_depthwise_op_convert_pass.h index ffe1d0df2d..d9db238c15 100644 --- a/mindspore/lite/tools/optimizer/graph/group_depthwise_op_convert_pass.h +++ b/mindspore/lite/tools/optimizer/graph/group_depthwise_op_convert_pass.h @@ -17,7 +17,7 @@ #define LITE_GROUP_DEPTHWISE_OP_CONVERT_PASS_H #include #include "tools/converter/converter_flags.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore::opt { class GroupDepthwiseOpConvertPass : public Pass { diff --git a/mindspore/lite/tools/optimizer/graph/infershape_pass.h b/mindspore/lite/tools/optimizer/graph/infershape_pass.h index 46a6ab4a4e..a8f2640a27 100644 --- a/mindspore/lite/tools/optimizer/graph/infershape_pass.h +++ b/mindspore/lite/tools/optimizer/graph/infershape_pass.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/optimizer/graph/node_infershape.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/graph/reduce_same_act_pass.h b/mindspore/lite/tools/optimizer/graph/reduce_same_act_pass.h index e4b917f8c2..7d4b5d3255 100644 --- a/mindspore/lite/tools/optimizer/graph/reduce_same_act_pass.h +++ b/mindspore/lite/tools/optimizer/graph/reduce_same_act_pass.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/format_utils.h" diff --git a/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.h b/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.h index 9e71026176..7416e7af37 100644 --- a/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.h +++ b/mindspore/lite/tools/optimizer/graph/redundant_op_remove_pass.h @@ -18,7 +18,7 @@ #define MINDSPORE_LITE_SRC_PASS_REDUNDANT_OP_REMOVE_PASS_H_ #include #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/gllo_utils.h" #include "tools/anf_exporter/fetch_content.h" diff --git a/mindspore/lite/tools/optimizer/graph/slice_prepose_pass.cc b/mindspore/lite/tools/optimizer/graph/slice_prepose_pass.cc index 00ccc59992..0bbdb5d8a8 100644 --- a/mindspore/lite/tools/optimizer/graph/slice_prepose_pass.cc +++ b/mindspore/lite/tools/optimizer/graph/slice_prepose_pass.cc @@ -25,7 +25,7 @@ #include "ops/op_utils.h" #include "include/errorcode.h" #include "tools/optimizer/common/gllo_utils.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/helper.h" #include "src/common/log_adapter.h" #include "nnacl/op_base.h" diff --git a/mindspore/lite/tools/optimizer/graph/slice_prepose_pass.h b/mindspore/lite/tools/optimizer/graph/slice_prepose_pass.h index e6ef9161fe..cc3d8a49dc 100644 --- a/mindspore/lite/tools/optimizer/graph/slice_prepose_pass.h +++ b/mindspore/lite/tools/optimizer/graph/slice_prepose_pass.h @@ -21,7 +21,7 @@ #include #include #include "tools/converter/converter_flags.h" -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "include/errorcode.h" #include "mindspore/core/ir/manager.h" diff --git a/mindspore/lite/tools/optimizer/graph/special_node_postprocess.h b/mindspore/lite/tools/optimizer/graph/special_node_postprocess.h index 781969abba..614ac46f24 100644 --- a/mindspore/lite/tools/optimizer/graph/special_node_postprocess.h +++ b/mindspore/lite/tools/optimizer/graph/special_node_postprocess.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_PASS_SPECIAL_NODE_POSTPROCESS_H_ #define MINDSPORE_LITE_SRC_PASS_SPECIAL_NODE_POSTPROCESS_H_ -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" namespace mindspore { namespace opt { diff --git a/mindspore/lite/tools/optimizer/graph/specify_graph_input_format.h b/mindspore/lite/tools/optimizer/graph/specify_graph_input_format.h index 63f7a54a6c..bfc982f93d 100644 --- a/mindspore/lite/tools/optimizer/graph/specify_graph_input_format.h +++ b/mindspore/lite/tools/optimizer/graph/specify_graph_input_format.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_SPECIFY_GRAPH_INPUT_FORMAT_H_ #define MINDSPORE_LITE_TOOLS_OPTIMIZER_GRAPH_SPECIFY_GRAPH_INPUT_FORMAT_H_ -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/optimizer/common/gllo_utils.h" namespace mindspore { diff --git a/mindspore/lite/tools/optimizer/graph/split_one_pass.h b/mindspore/lite/tools/optimizer/graph/split_one_pass.h index 848983999b..18845e3276 100644 --- a/mindspore/lite/tools/optimizer/graph/split_one_pass.h +++ b/mindspore/lite/tools/optimizer/graph/split_one_pass.h @@ -21,7 +21,7 @@ #include #include #include -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #include "utils/utils.h" #include "tools/converter/converter_flags.h" #include "tools/optimizer/common/format_utils.h" diff --git a/mindspore/lite/tools/optimizer/graph/unused_transpose_node_remove_pass.h b/mindspore/lite/tools/optimizer/graph/unused_transpose_node_remove_pass.h index 954d64a4c8..10b87e4d11 100644 --- a/mindspore/lite/tools/optimizer/graph/unused_transpose_node_remove_pass.h +++ b/mindspore/lite/tools/optimizer/graph/unused_transpose_node_remove_pass.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_PASS_REMOVE_UNUSED_TRANSPOSE_PASS_H_ #define MINDSPORE_LITE_SRC_PASS_REMOVE_UNUSED_TRANSPOSE_PASS_H_ #include -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/converter/converter_flags.h" using mindspore::converter::FmkType; diff --git a/mindspore/lite/tools/optimizer/graph/update_conv2d_param_pass.h b/mindspore/lite/tools/optimizer/graph/update_conv2d_param_pass.h index 5310285063..3bcdb2ecdf 100644 --- a/mindspore/lite/tools/optimizer/graph/update_conv2d_param_pass.h +++ b/mindspore/lite/tools/optimizer/graph/update_conv2d_param_pass.h @@ -17,7 +17,7 @@ #ifndef MINDSPORE_LITE_SRC_PASS_UPDATE_CONV2D_PARAM_PASS_H_ #define MINDSPORE_LITE_SRC_PASS_UPDATE_CONV2D_PARAM_PASS_H_ -#include "backend/optimizer/common/pass.h" +#include "backend/common/optimizer/pass.h" #include "tools/optimizer/common/gllo_utils.h" namespace mindspore::opt { diff --git a/mindspore/lite/tools/optimizer/parallel/parallel_pass.h b/mindspore/lite/tools/optimizer/parallel/parallel_pass.h index cd94686c2f..abdf0544e2 100644 --- a/mindspore/lite/tools/optimizer/parallel/parallel_pass.h +++ b/mindspore/lite/tools/optimizer/parallel/parallel_pass.h @@ -21,7 +21,7 @@ #include #include "ir/anf.h" #include "tools/optimizer/common/gllo_utils.h" -#include "backend/optimizer/common/node_pass.h" +#include "backend/common/optimizer/node_pass.h" #include "tools/optimizer/parallel/split_strategy.h" #include "tools/optimizer/parallel/operator_info.h" diff --git a/tests/ut/cpp/CMakeLists.txt b/tests/ut/cpp/CMakeLists.txt index d90e6a8de8..a27b985703 100644 --- a/tests/ut/cpp/CMakeLists.txt +++ b/tests/ut/cpp/CMakeLists.txt @@ -31,7 +31,7 @@ include_directories(${CMAKE_BINARY_DIR}) include_directories(${CMAKE_BINARY_DIR}/proto/graphengine_protos) include_directories(${CMAKE_BINARY_DIR}/proto/metadef_protos) include_directories(${CUDA_INCLUDE_DIRS}) -include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc/backend/kernel_compiler/cpu) +include_directories(${CMAKE_SOURCE_DIR}/mindspore/ccsrc/plugin/device/cpu/kernel) MESSAGE("check ut_test ${CMAKE_BINARY_DIR}") link_directories(${MS_CCSRC_BUILD_PATH}) @@ -112,7 +112,7 @@ file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} # dont remove the 4 lines above "../../../mindspore/ccsrc/debug/data_dump/dump_json_parser.cc" "../../../mindspore/ccsrc/debug/common.cc" - "../../../mindspore/ccsrc/runtime/hccl_adapter/all_to_all_v_calc_param.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.cc" "../../../mindspore/ccsrc/runtime/device/kernel_runtime.cc" "../../../mindspore/ccsrc/runtime/device/memory_manager.cc" "../../../mindspore/ccsrc/runtime/device/memory_scheduler.cc" @@ -121,56 +121,59 @@ file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../../../mindspore/ccsrc/runtime/device/kernel_info.cc" "../../../mindspore/ccsrc/runtime/device/bucket.cc" "../../../mindspore/ccsrc/runtime/device/launch_kernel.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/profiling/*.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/ge_runtime/*.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/ascend_launch_kernel.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/ascend_launch_mul.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/ascend_launch_atomic_clean.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/ascend_launch_transdata.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/kernel_select_graph_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/profiling/*.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ge_runtime/*.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_ascend.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_mul.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_atomic_clean.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_launch_transdata.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_select_graph_kernel.cc" "../../../mindspore/ccsrc/runtime/device/convert_tensor_utils.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/ascend_bucket.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/ascend_event.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_adapter.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/runtime/device/ascend/lic_manager.cc" - "../../../mindspore/ccsrc/runtime/hardware/ascend/ascend_device_context.cc" - "../../../mindspore/ccsrc/runtime/hardware/ascend/ascend_graph_optimization.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" - "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/unique_cpu_kernel.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/adam_delta_cpu_kernel.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/fused_ada_factor_cpu_kernel.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/akg/*.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/aicpu/aicpu_attr_to_input_registry.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/tbe/*.cc" - "../../../mindspore/ccsrc/backend/optimizer/ascend/*.cc" - "../../../mindspore/ccsrc/backend/optimizer/graph_kernel/*.cc" - "../../../mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc" - "../../../mindspore/ccsrc/backend/session/ascend_session.cc" - "../../../mindspore/ccsrc/backend/session/ascend_auto_monad.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/executor.cc" - "../../../mindspore/ccsrc/backend/session/executor_manager.cc" - "../../../mindspore/ccsrc/backend/session/session_factory.cc" - "../../../mindspore/ccsrc/backend/session/kernel_build_client.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_bucket.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_event.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/kernel_build_ascend.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_kernel_runtime.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_adapter.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_manager.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_device_address.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ascend_memory_pool.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/lic_manager.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_device_context.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/hardware/ascend_graph_optimization.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/cpu_kernel_factory.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_adam_cpu_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_ftrl_cpu_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_lazy_adam_cpu_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/unique_cpu_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/unique_with_pad_cpu_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/adam_delta_cpu_kernel.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/fused_ada_factor_cpu_kernel.cc" + "../../../mindspore/ccsrc/kernel/akg/*.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/kernel/akg/*.cc" + "../../../mindspore/ccsrc/plugin/device/gpu/kernel/akg/*.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/akg/*.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/kernel/rts/*.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/kernel/hccl/*.cc" + "../../../mindspore/ccsrc/kernel/kernel_query.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_attr_to_input_registry.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_kernel_metadata.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/kernel/rts/rt_kernel_info.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/kernel/tbe/*.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/optimizer/*.cc" + "../../../mindspore/ccsrc/common/graph_kernel/*.cc" + "../../../mindspore/ccsrc/backend/common/session/anf_runtime_algorithm.cc" + "../../../mindspore/ccsrc/backend/common/session/ascend_session.cc" + "../../../mindspore/ccsrc/backend/common/session/ascend_auto_monad.cc" + "../../../mindspore/ccsrc/backend/common/session/ascend_control_parser.cc" + "../../../mindspore/ccsrc/backend/common/session/kernel_graph.cc" + "../../../mindspore/ccsrc/backend/common/session/session_basic.cc" + "../../../mindspore/ccsrc/backend/common/session/executor.cc" + "../../../mindspore/ccsrc/backend/common/session/executor_manager.cc" + "../../../mindspore/ccsrc/backend/common/session/session_factory.cc" + "../../../mindspore/ccsrc/backend/common/session/kernel_build_client.cc" "../../../mindspore/ccsrc/transform/graph_ir/*.cc" "../../../mindspore/ccsrc/transform/graph_ir/op_declare/*.cc" "../../../mindspore/ccsrc/ps/*.cc" @@ -179,14 +182,14 @@ file(GLOB_RECURSE MINDSPORE_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "../../../mindspore/ccsrc/distributed/rpc/tcp/*.cc" "../../../mindspore/ccsrc/profiler/device/ascend/*.cc" "../../../mindspore/ccsrc/profiler/device/profiling.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/cpu/nnacl/fp32/adam_fp32.c" - "../../../mindspore/ccsrc/backend/kernel_compiler/kernel.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.cc" - "../../../mindspore/ccsrc/backend/optimizer/common/helper.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/executor/tiling/op_tiling_adapter.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/executor/aicpu_ext_info_handle.cc" - "../../../mindspore/ccsrc/runtime/device/ascend/ge_types_convert.cc" - "../../../mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.cc" + "../../../mindspore/ccsrc/plugin/device/cpu/kernel/nnacl/fp32/adam_fp32.c" + "../../../mindspore/ccsrc/kernel/kernel.cc" + "../../../mindspore/ccsrc/kernel/ascend_kernel_mod.cc" + "../../../mindspore/ccsrc/backend/common/optimizer/helper.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/executor/tiling/op_tiling_adapter.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/executor/aicpu_ext_info_handle.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/ge_types_convert.cc" + "../../../mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/aicpu_util.cc" ) list(REMOVE_ITEM MINDSPORE_SRC_LIST @@ -202,21 +205,25 @@ list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/ps/ps_cache/ascend list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/ps/ps_cache/ps_cache_manager.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/fl/server/kernel/sgd_kernel.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/fl/server/kernel/apply_momentum_kernel.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_fusion.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/gpu/post_batch_norm_add_relu_fusion.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/gpu/batch_norm_add_relu_grad_fusion.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_fusion.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/gpu/batch_norm_relu_grad_fusion.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/akg_build.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST - "../../../mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/callback_impl.cc") + "../../../mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_fusion.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST - "../../../mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_optimization.cc") + "../../../mindspore/ccsrc/plugin/device/gpu/optimizer/post_batch_norm_add_relu_fusion.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST - "../../../mindspore/ccsrc/backend/optimizer/graph_kernel/lite_adapter/graph_kernel_pass_manager.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_compile.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_mod.cc") -list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/backend/kernel_compiler/akg/cpu/akg_cpu_kernel_build.cc") + "../../../mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_add_relu_grad_fusion.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_fusion.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST + "../../../mindspore/ccsrc/plugin/device/gpu/optimizer/batch_norm_relu_grad_fusion.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/common/graph_kernel/lite_adapter/akg_build.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST + "../../../mindspore/ccsrc/common/graph_kernel/lite_adapter/callback_impl.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST + "../../../mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_optimization.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST + "../../../mindspore/ccsrc/common/graph_kernel/lite_adapter/graph_kernel_pass_manager.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/plugin/device/ascend/kernel/tbe/tbe_kernel_compile.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_mod.cc") +list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/plugin/device/cpu/kernel/akg/akg_cpu_kernel_build.cc") if(ENABLE_SECURITY) list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/profiler/device/profiling.cc") list(REMOVE_ITEM MINDSPORE_SRC_LIST "../../../mindspore/ccsrc/profiler/device/ascend/memory_profiling.cc") @@ -238,13 +245,13 @@ if(ENABLE_MINDDATA) endif() add_executable(ut_tests ${ut_objects}) -include_directories("${CMAKE_BINARY_DIR}/backend/kernel_compiler/aicpu") +include_directories("${CMAKE_BINARY_DIR}/plugin/device/ascend/kernel/aicpu") file(GLOB_RECURSE PROTO_IN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "../../../mindspore/ccsrc/backend/kernel_compiler/aicpu/proto/*.proto") + "../../../mindspore/ccsrc/plugin/device/ascend/kernel/aicpu/proto/*.proto") ms_protobuf_generate(PROTOSRCS PROTOHDRS ${PROTO_IN}) file(GLOB_RECURSE PROTO_DUMP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} - "../../../mindspore/ccsrc/runtime/device/ascend/dump/proto/*.proto") + "../../../mindspore/ccsrc/plugin/device/ascend/hal/device/dump/proto/*.proto") ms_protobuf_generate(DUMP_PROTOSRCS PROTOHDRS ${PROTO_DUMP}) list(APPEND MINDSPORE_PROTO_LIST ${PROTOSRCS}) diff --git a/tests/ut/cpp/common/backend_common_test.cc b/tests/ut/cpp/common/backend_common_test.cc index 3710349298..d55aea2a18 100644 --- a/tests/ut/cpp/common/backend_common_test.cc +++ b/tests/ut/cpp/common/backend_common_test.cc @@ -22,7 +22,7 @@ #include "utils/log_adapter.h" #include "frontend/operator/ops.h" #include "debug/anf_ir_dump.h" -#include "backend/session/ascend_session.h" +#include "backend/common/session/ascend_session.h" #include "pipeline/jit/resource.h" #include "pipeline/jit/action.h" #include "ir/anf.h" diff --git a/tests/ut/cpp/common/backend_common_test.h b/tests/ut/cpp/common/backend_common_test.h index aeeccef2bc..7ccc6fcbcb 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/ms_context.h" -#include "backend/session/kernel_graph.h" +#include "backend/common/session/kernel_graph.h" namespace mindspore { class BackendCommon : public UT::Common { diff --git a/tests/ut/cpp/device/ge_runtime_test.cc b/tests/ut/cpp/device/ge_runtime_test.cc index eeb47ca94d..ab0de4ad5c 100644 --- a/tests/ut/cpp/device/ge_runtime_test.cc +++ b/tests/ut/cpp/device/ge_runtime_test.cc @@ -16,22 +16,22 @@ #include #include "common/common_test.h" #define private public -#include "runtime/device/ascend/ge_runtime/model_runner.h" -#include "runtime/device/ascend/ge_runtime/runtime_model.h" -#include "runtime/device/ascend/ge_runtime/task/task_factory.h" -#include "runtime/device/ascend/ge_runtime/task/aicpu_task.h" -#include "runtime/device/ascend/ge_runtime/task/event_record_task.h" -#include "runtime/device/ascend/ge_runtime/task/event_wait_task.h" -#include "runtime/device/ascend/ge_runtime/task/hccl_task.h" -#include "runtime/device/ascend/ge_runtime/task/label_goto_task.h" -#include "runtime/device/ascend/ge_runtime/task/label_manager.h" -#include "runtime/device/ascend/ge_runtime/task/label_set_task.h" -#include "runtime/device/ascend/ge_runtime/task/label_switch_task.h" -#include "runtime/device/ascend/ge_runtime/task/memcpy_async_task.h" -#include "runtime/device/ascend/ge_runtime/task/profiler_task.h" -#include "runtime/device/ascend/ge_runtime/task/stream_active_task.h" -#include "runtime/device/ascend/ge_runtime/task/stream_switch_task.h" -#include "runtime/device/ascend/ge_runtime/task/tbe_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/model_runner.h" +#include "plugin/device/ascend/hal/device/ge_runtime/runtime_model.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/task_factory.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/aicpu_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/event_record_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/event_wait_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/hccl_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_goto_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_manager.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_set_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/label_switch_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/memcpy_async_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/profiler_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/stream_active_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/stream_switch_task.h" +#include "plugin/device/ascend/hal/device/ge_runtime/task/tbe_task.h" #undef private #include "common/opskernel/ops_kernel_info_store.h" diff --git a/tests/ut/cpp/device/hccl_adapter_test.cc b/tests/ut/cpp/device/hccl_adapter_test.cc index 7095f148df..c6e5d19156 100644 --- a/tests/ut/cpp/device/hccl_adapter_test.cc +++ b/tests/ut/cpp/device/hccl_adapter_test.cc @@ -15,8 +15,8 @@ */ #include #include "common/common_test.h" -#include "runtime/hccl_adapter/all_to_all_v_calc_param.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/hal/hccl_adapter/all_to_all_v_calc_param.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "mindspore/core/ir/dtype/type_id.h" namespace mindspore::hccl { diff --git a/tests/ut/cpp/kernel/cpu/adam_delta_cpu_kernel_test.cc b/tests/ut/cpp/kernel/cpu/adam_delta_cpu_kernel_test.cc index d18898d549..c4435b131c 100644 --- a/tests/ut/cpp/kernel/cpu/adam_delta_cpu_kernel_test.cc +++ b/tests/ut/cpp/kernel/cpu/adam_delta_cpu_kernel_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #define private public #define protected public -#include "backend/kernel_compiler/cpu/adam_delta_cpu_kernel.h" +#include "plugin/device/cpu/kernel/adam_delta_cpu_kernel.h" #undef private #undef protected diff --git a/tests/ut/cpp/kernel/cpu/fused_ada_factor_cpu_kernel_test.cc b/tests/ut/cpp/kernel/cpu/fused_ada_factor_cpu_kernel_test.cc index d9b22a0b8d..4c886976a2 100644 --- a/tests/ut/cpp/kernel/cpu/fused_ada_factor_cpu_kernel_test.cc +++ b/tests/ut/cpp/kernel/cpu/fused_ada_factor_cpu_kernel_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #define private public #define protected public -#include "backend/kernel_compiler/cpu/fused_ada_factor_cpu_kernel.h" +#include "plugin/device/cpu/kernel/fused_ada_factor_cpu_kernel.h" #undef private #undef protected 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 3c13934a2e..aebbf876e3 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 "backend/kernel_compiler/cpu/sparse_apply_adam_cpu_kernel.h" +#include "plugin/device/cpu/kernel/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 d34ab924b6..d458a15b93 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 "backend/kernel_compiler/cpu/sparse_apply_ftrl_cpu_kernel.h" +#include "plugin/device/cpu/kernel/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 5d802e9fac..22923aff6f 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 "backend/kernel_compiler/cpu/sparse_apply_lazy_adam_cpu_kernel.h" +#include "plugin/device/cpu/kernel/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 ec076a2ec5..df3b15bacd 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 "backend/kernel_compiler/cpu/sparse_apply_proximal_adagrad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sparse_apply_proximal_adagrad_cpu_kernel.h" #undef private #undef protected diff --git a/tests/ut/cpp/kernel/cpu/sparse_optimizer_cpu_kernel_test.cc b/tests/ut/cpp/kernel/cpu/sparse_optimizer_cpu_kernel_test.cc index b313301952..828b22f040 100644 --- a/tests/ut/cpp/kernel/cpu/sparse_optimizer_cpu_kernel_test.cc +++ b/tests/ut/cpp/kernel/cpu/sparse_optimizer_cpu_kernel_test.cc @@ -16,7 +16,7 @@ #include #include "common/common_test.h" -#include "backend/kernel_compiler/cpu/sparse_optimizer_cpu_kernel.h" +#include "plugin/device/cpu/kernel/sparse_optimizer_cpu_kernel.h" namespace mindspore { namespace kernel { diff --git a/tests/ut/cpp/kernel/cpu/unique_cpu_kernel_test.cc b/tests/ut/cpp/kernel/cpu/unique_cpu_kernel_test.cc index 7279ff62bf..96629d3854 100644 --- a/tests/ut/cpp/kernel/cpu/unique_cpu_kernel_test.cc +++ b/tests/ut/cpp/kernel/cpu/unique_cpu_kernel_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #define private public #define protected public -#include "backend/kernel_compiler/cpu/unique_cpu_kernel.h" +#include "plugin/device/cpu/kernel/unique_cpu_kernel.h" #undef private #undef protected diff --git a/tests/ut/cpp/kernel/cpu/unique_with_pad_cpu_kernel_test.cc b/tests/ut/cpp/kernel/cpu/unique_with_pad_cpu_kernel_test.cc index c5e6e4ebdd..b47a7f4606 100644 --- a/tests/ut/cpp/kernel/cpu/unique_with_pad_cpu_kernel_test.cc +++ b/tests/ut/cpp/kernel/cpu/unique_with_pad_cpu_kernel_test.cc @@ -18,7 +18,7 @@ #include "common/common_test.h" #define private public #define protected public -#include "backend/kernel_compiler/cpu/unique_with_pad_cpu_kernel.h" +#include "plugin/device/cpu/kernel/unique_with_pad_cpu_kernel.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ascend_pass_control_test.cc b/tests/ut/cpp/pre_activate/ascend/ascend_pass_control_test.cc index 1279965be7..d5fc997ba7 100644 --- a/tests/ut/cpp/pre_activate/ascend/ascend_pass_control_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ascend_pass_control_test.cc @@ -15,7 +15,7 @@ */ #include "common/backend_common_test.h" #define private public -#include "backend/optimizer/ascend/ascend_pass_control.h" +#include "plugin/device/ascend/optimizer/ascend_pass_control.h" #undef private namespace { 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 24caa16577..aef96348db 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 "backend/kernel_compiler/kernel.h" +#include "kernel/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" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv_single_in_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv_double_in_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/matmul_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/depthwiseconv_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/conv_bnreduce_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/reduce_eltwise_fusion_pass.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/segment_eltwise_fusion_pass.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/dynamic_shape/dynamic_shape_pass_test.cc b/tests/ut/cpp/pre_activate/ascend/dynamic_shape/dynamic_shape_pass_test.cc index a5e0f992d4..8f5a9ba815 100644 --- a/tests/ut/cpp/pre_activate/ascend/dynamic_shape/dynamic_shape_pass_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/dynamic_shape/dynamic_shape_pass_test.cc @@ -14,10 +14,10 @@ * limitations under the License. */ #include -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/ascend/dynamic_shape/ascend_dynamic_shape_helper.h" -#include "backend/optimizer/ascend/ascend_backend_optimization.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/dynamic_shape/ascend_dynamic_shape_helper.h" +#include "plugin/device/ascend/optimizer/ascend_backend_optimization.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_mod.h" #include "common/backend_common_test.h" #include "debug/anf_ir_dump.h" #include "debug/dump_proto.h" diff --git a/tests/ut/cpp/pre_activate/ascend/enhancer/getnext_tensor_move_elimination_test.cc b/tests/ut/cpp/pre_activate/ascend/enhancer/getnext_tensor_move_elimination_test.cc index 6af31ebcf5..da5c760fba 100644 --- a/tests/ut/cpp/pre_activate/ascend/enhancer/getnext_tensor_move_elimination_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/enhancer/getnext_tensor_move_elimination_test.cc @@ -15,14 +15,14 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/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 "backend/kernel_compiler/kernel_build_info.h" -#include "backend/optimizer/common/optimizer.h" -#include "mindspore/ccsrc/backend/optimizer/ascend/enhancer/getnext_tensor_move_elimination.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/enhancer/getnext_tensor_move_elimination.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/enhancer/insert_tensor_move_for_getnext_test.cc b/tests/ut/cpp/pre_activate/ascend/enhancer/insert_tensor_move_for_getnext_test.cc index fb325adf6d..8fbefaf41a 100644 --- a/tests/ut/cpp/pre_activate/ascend/enhancer/insert_tensor_move_for_getnext_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/enhancer/insert_tensor_move_for_getnext_test.cc @@ -15,16 +15,16 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "backend/session/ascend_session.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/ascend_session.h" +#include "backend/common/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 "backend/kernel_compiler/kernel_build_info.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/enhancer/insert_tensor_move_for_getnext.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_tensor_move_for_getnext.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/ascend/enhancer/insert_tensor_move_for_hccl_op_test.cc b/tests/ut/cpp/pre_activate/ascend/enhancer/insert_tensor_move_for_hccl_op_test.cc index a0934dba09..e38f69bdd0 100644 --- a/tests/ut/cpp/pre_activate/ascend/enhancer/insert_tensor_move_for_hccl_op_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/enhancer/insert_tensor_move_for_hccl_op_test.cc @@ -15,17 +15,17 @@ */ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/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 "backend/kernel_compiler/kernel_build_info.h" -#include "backend/optimizer/common/optimizer.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/optimizer/optimizer.h" #include "ir/param_info.h" #define private public #define protected public -#include "backend/optimizer/ascend/enhancer/insert_tensor_move_for_hccl_op.h" +#include "plugin/device/ascend/optimizer/enhancer/insert_tensor_move_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 20c431e7ea..8ceafca11e 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,8 +16,8 @@ #include "common/common_test.h" #include "common/py_func_graph_fetcher.h" #include "common/backend_common_test.h" -#include "backend/session/ascend_session.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/ascend_session.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "pipeline/jit/resource.h" #include "pipeline/jit/action.h" #include "frontend/operator/ops.h" @@ -25,9 +25,9 @@ #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "utils/utils.h" -#include "backend/kernel_compiler/kernel_build_info.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/format_type/check_consistency.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 a3eba577bf..f2608506c2 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 @@ -19,12 +19,12 @@ #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/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 "plugin/device/ascend/optimizer/format_type/insert_cast.h" +#include "kernel/kernel_build_info.h" #include "utils/utils.h" #include "utils/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 fa79554a22..bc545e2b9f 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 @@ -17,15 +17,15 @@ #include "frontend/operator/ops.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "utils/ms_context.h" #define private public #define protected public -#include "backend/optimizer/ascend/format_type/insert_trans_op.h" +#include "plugin/device/ascend/optimizer/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 257d28b8bf..4dfde82374 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 "backend/session/anf_runtime_algorithm.h" +#include "backend/common/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 "backend/kernel_compiler/kernel_build_info.h" -#include "backend/optimizer/common/optimizer.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/optimizer/optimizer.h" #define private public #define protected public -#include "backend/optimizer/ascend/format_type/merge_cast_to_op.h" +#include "plugin/device/ascend/optimizer/format_type/merge_cast_to_op.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/format_type/remove_internal_output_test.cc b/tests/ut/cpp/pre_activate/ascend/format_type/remove_internal_output_test.cc index 7be62aa5c2..c70baa893d 100644 --- a/tests/ut/cpp/pre_activate/ascend/format_type/remove_internal_output_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/format_type/remove_internal_output_test.cc @@ -16,11 +16,11 @@ #include "common/backend_common_test.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "backend/optimizer/ascend/format_type/remove_internal_output.h" +#include "plugin/device/ascend/optimizer/format_type/remove_internal_output.h" #define private public #define protected public -#include "backend/optimizer/ascend/format_type/insert_trans_op.h" +#include "plugin/device/ascend/optimizer/format_type/insert_trans_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 092ff9f82c..b4b447f225 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 "backend/optimizer/ascend/ir_fission/addn_fission.h" +#include "plugin/device/ascend/optimizer/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 52baa8076b..bcc3ea3617 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 "backend/optimizer/ascend/ir_fission/batch_norm_bert_fission.h" +#include "plugin/device/ascend/optimizer/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 45668a2671..9bb5371e92 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,8 +14,8 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/batch_norm_grad_infer_fission.h" -#include "backend/optimizer/ascend/mindir/bn_grad_unify_mindir.h" +#include "plugin/device/ascend/optimizer/ir_fission/batch_norm_grad_infer_fission.h" +#include "plugin/device/ascend/optimizer/mindir/bn_grad_unify_mindir.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 81bfecd73b..fb6474b446 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 "backend/session/anf_runtime_algorithm.h" +#include "backend/common/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 "backend/kernel_compiler/kernel_build_info.h" -#include "backend/optimizer/common/optimizer.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/optimizer/optimizer.h" #define private public #define protected public -#include "backend/optimizer/ascend/ir_fission/bn_grad_split.h" +#include "plugin/device/ascend/optimizer/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 939d752dbf..1bbeb49a40 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 "backend/session/ascend_session.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/ascend_session.h" +#include "backend/common/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 "backend/kernel_compiler/kernel_build_info.h" -#include "backend/optimizer/common/optimizer.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/optimizer/optimizer.h" #define private public #define protected public -#include "backend/optimizer/ascend/ir_fission/bn_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/bn_split.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/concat_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/concat_fission_test.cc index 8cf6f95cc4..275e5bb4b5 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/concat_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/concat_fission_test.cc @@ -18,7 +18,7 @@ #include "common/py_func_graph_fetcher.h" #define private public #define protected public -#include "backend/optimizer/ascend/ir_fission/concat_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/concat_fission.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 579c23c844..6237e040ce 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 "backend/optimizer/ascend/ir_fission/lars_v2_fission.h" +#include "plugin/device/ascend/optimizer/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 509c2f6228..f83d611dca 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 "backend/session/anf_runtime_algorithm.h" +#include "backend/common/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 "backend/kernel_compiler/kernel_build_info.h" -#include "backend/optimizer/common/optimizer.h" +#include "kernel/kernel_build_info.h" +#include "backend/common/optimizer/optimizer.h" #define private public #define protected public -#include "backend/optimizer/ascend/ir_fission/layer_norm_grad_split.h" +#include "plugin/device/ascend/optimizer/ir_fission/layer_norm_grad_split.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/pack_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/pack_fission_test.cc index 3c3da57f43..0111612b9a 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/pack_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/pack_fission_test.cc @@ -18,7 +18,7 @@ #include "common/py_func_graph_fetcher.h" #define private public #define protected public -#include "backend/optimizer/ascend/ir_fission/pack_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/pack_fission.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/reduce_min_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/reduce_min_fission_test.cc index 6c017c4f51..8b13a297cf 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/reduce_min_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/reduce_min_fission_test.cc @@ -19,7 +19,7 @@ #include "debug/anf_ir_dump.h" #define private public #define protected public -#include "backend/optimizer/ascend/ir_fission/reduce_min_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/reduce_min_fission.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 b564140e5e..9f05238c86 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 "backend/optimizer/ascend/ir_fission/single_batch_norm_fission.h" +#include "plugin/device/ascend/optimizer/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 94062b0085..052c42af0b 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 "backend/optimizer/ascend/ir_fission/split_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/split_fission.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/tensor_scatter_update_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/tensor_scatter_update_fission_test.cc index 6b2dc15d6e..67a6a7e583 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/tensor_scatter_update_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/tensor_scatter_update_fission_test.cc @@ -16,7 +16,7 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" -#include "backend/optimizer/ascend/ir_fission/tensor_scatter_update_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/tensor_scatter_update_fission.h" #include "debug/anf_ir_dump.h" namespace mindspore { 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 2db2e77f9c..1f0c5eebbf 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 @@ -17,12 +17,12 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "runtime/device/kernel_info.h" -#include "backend/optimizer/pass/convert_const_input_to_attr.h" +#include "backend/common/pass/convert_const_input_to_attr.h" #include "debug/anf_ir_dump.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #define private public #define protected public -#include "backend/optimizer/ascend/ir_fission/topk_split.h" +#include "plugin/device/ascend/optimizer/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 7e815449da..9501da0027 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 @@ -17,15 +17,15 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/oplib/oplib.h" #include "debug/anf_ir_dump.h" #include "utils/ms_context.h" #define private public #define protected public -#include "backend/optimizer/ascend/format_type/insert_trans_op.h" -#include "backend/optimizer/ascend/ir_fission/transdata_split.h" +#include "plugin/device/ascend/optimizer/format_type/insert_trans_op.h" +#include "plugin/device/ascend/optimizer/ir_fission/transdata_split.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/ir_fission/unsorted_segment_sum_fission_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fission/unsorted_segment_sum_fission_test.cc index ec820810cb..9a82245af2 100644 --- a/tests/ut/cpp/pre_activate/ascend/ir_fission/unsorted_segment_sum_fission_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/ir_fission/unsorted_segment_sum_fission_test.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "backend/optimizer/ascend/ir_fission/unsorted_segment_sum_fission.h" +#include "plugin/device/ascend/optimizer/ir_fission/unsorted_segment_sum_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_fusion/adam_apply_one_fusion_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/adam_apply_one_fusion_test.cc index 112754b420..23774c6271 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 "backend/optimizer/ascend/ir_fusion/adam_apply_one_fusion.h" +#include "plugin/device/ascend/optimizer/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 777c30f2a4..655a072511 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/adam_apply_one_with_decay_rule.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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/batchnorm_to_bninfer_test.cc b/tests/ut/cpp/pre_activate/ascend/ir_fusion/batchnorm_to_bninfer_test.cc index 8bacb20914..5917caf3d7 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/batchnorm_to_bninfer.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 46b1101348..d4d7f8f6a3 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/batchnormgrad_to_bninfergrad.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 39d9d00e44..343efa1d8b 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 8c70079e23..7137cacbab 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/clip_by_value_fusion.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 c433454aca..c79804d767 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/confusion_mul_grad_fusion.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 adbc5de670..3bce7d393b 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/confusion_softmax_grad_rule.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 f490847be1..770d569661 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/derelu_fusion.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 b2120a4848..5eaa241a9d 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 "backend/optimizer/ascend/ir_fusion/fused_batch_norm_fusion.h" +#include "plugin/device/ascend/optimizer/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 55c554c4b4..e1a74ff7c5 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 "backend/optimizer/ascend/ir_fusion/lamb_next_mv_rule.h" +#include "plugin/device/ascend/optimizer/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 06c68ddde4..afd51d3bc6 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 "backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_rule.h" +#include "plugin/device/ascend/optimizer/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 073b047b3d..7ce6bbcc2b 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 "backend/optimizer/ascend/ir_fusion/lamb_next_mv_with_decay_v1_rule.h" +#include "plugin/device/ascend/optimizer/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 c8c460c555..f5f4a31fca 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 "backend/optimizer/ascend/ir_fusion/lamb_next_right_rule.h" +#include "plugin/device/ascend/optimizer/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 2057982f3b..ae6f64a15e 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 a5e00201a2..3fd39d25ed 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 "backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_v2.h" +#include "plugin/device/ascend/optimizer/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 2b27f154e0..8f215c116d 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 @@ -17,11 +17,11 @@ #include "common/py_func_graph_fetcher.h" #include "runtime/device/kernel_info.h" #include "debug/anf_ir_dump.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #define private public #define protected public -#include "backend/optimizer/ascend/ir_fusion/layer_norm_beta_gamma_backprop_fusion.h" +#include "plugin/device/ascend/optimizer/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 a7f2a6600d..d911ea4fc1 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 "backend/optimizer/ascend/ir_fusion/matmul_biasadd_fusion.h" +#include "plugin/device/ascend/optimizer/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 6068ea1348..61c1637f64 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 "backend/optimizer/ascend/ir_fusion/momentum_lossscale_fusion.h" +#include "plugin/device/ascend/optimizer/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 24f981f57c..624417bb18 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 "backend/optimizer/ascend/ir_fusion/mul_add_fusion.h" +#include "plugin/device/ascend/optimizer/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 b62bf0842c..ff5b7fc5ee 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/backend/optimizer/ascend/ir_fusion/mul_addn_fusion.h" +#include "plugin/device/ascend/optimizer/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 512b711afc..82530489ce 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 "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/ascend/ir_fusion/reshape_transpose_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/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 9ba9730491..8a8dba80a0 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/softmax_grad_ext_fusion.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 11beccafd7..6e7fe8593d 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/ascend/ir_fusion/square_sum_fusion.h" +#include "backend/common/optimizer/optimizer.h" +#include "plugin/device/ascend/optimizer/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 f5d725949e..58448a07a6 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 "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/ascend/ir_fusion/transpose_reshape_fusion.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/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 504499d20e..df40ea7413 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 @@ -17,13 +17,13 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "runtime/device/kernel_info.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/kernel_compiler/oplib/oplib.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "kernel/oplib/oplib.h" #include "utils/ms_context.h" #define private public #define protected public -#include "backend/optimizer/ascend/format_type/insert_trans_op.h" -#include "backend/optimizer/ascend/ir_fusion/transpose_transdata_fusion.h" +#include "plugin/device/ascend/optimizer/format_type/insert_trans_op.h" +#include "plugin/device/ascend/optimizer/ir_fusion/transpose_transdata_fusion.h" #undef private #undef protected diff --git a/tests/ut/cpp/pre_activate/ascend/mindir/all_to_all_unify_mindir_test.cc b/tests/ut/cpp/pre_activate/ascend/mindir/all_to_all_unify_mindir_test.cc index b5460d1eb3..373eedc4a4 100644 --- a/tests/ut/cpp/pre_activate/ascend/mindir/all_to_all_unify_mindir_test.cc +++ b/tests/ut/cpp/pre_activate/ascend/mindir/all_to_all_unify_mindir_test.cc @@ -17,10 +17,10 @@ #include "frontend/operator/ops.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.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 "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/pass/convert_const_input_to_attr.h" #include "utils/utils.h" #include "utils/ms_utils.h" 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 dc3c3edd2a..132c7adc7a 100644 --- a/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc +++ b/tests/ut/cpp/pre_activate/common/pattern_engine_test.cc @@ -21,9 +21,9 @@ #include #include "common/common_test.h" -#include "backend/optimizer/common/pattern_engine.h" -#include "backend/optimizer/common/visit.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/pattern_engine.h" +#include "backend/common/optimizer/visit.h" +#include "backend/common/optimizer/helper.h" #include "base/base_ref.h" #include "base/core_ops.h" #include "ir/anf.h" diff --git a/tests/ut/cpp/pre_activate/common/pattern_process_pass_test.cc b/tests/ut/cpp/pre_activate/common/pattern_process_pass_test.cc index f0496f98d8..8ec8d8d247 100644 --- a/tests/ut/cpp/pre_activate/common/pattern_process_pass_test.cc +++ b/tests/ut/cpp/pre_activate/common/pattern_process_pass_test.cc @@ -22,7 +22,7 @@ #include "common/common_test.h" #define private public #define protected public -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/optimizer/optimizer.h" #undef private #undef protected @@ -30,7 +30,7 @@ #include "ir/anf.h" #include "ir/value.h" #include "utils/utils.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/pre_activate/common/restore_abs_input_in_backed_infer_test.cc b/tests/ut/cpp/pre_activate/common/restore_abs_input_in_backed_infer_test.cc index 4f829a368b..b1b8bfdf52 100644 --- a/tests/ut/cpp/pre_activate/common/restore_abs_input_in_backed_infer_test.cc +++ b/tests/ut/cpp/pre_activate/common/restore_abs_input_in_backed_infer_test.cc @@ -20,8 +20,8 @@ #include "utils/utils.h" #include "abstract/abstract_value.h" #include "abstract/primitive_infer_map.h" -#include "backend/optimizer/common/const_input_to_attr_registry.h" -#include "backend/optimizer/common/helper.h" +#include "backend/common/optimizer/const_input_to_attr_registry.h" +#include "backend/common/optimizer/helper.h" #include "common/common_test.h" namespace mindspore { namespace opt { 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 8b6d3e061a..ef022b6136 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 "backend/optimizer/mem_reuse/kernel_refcount.h" +#include "common/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_test.cc b/tests/ut/cpp/pre_activate/mem_reuse/mem_reuse_test.cc index ac37838a2b..4ac6c92392 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,18 +16,18 @@ #include #include #include -#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/common/session/kernel_graph.h" +#include "backend/common/session/session_basic.h" +#include "backend/common/session/ascend_session.h" +#include "common/mem_reuse/kernel_refcount.h" #include "runtime/device/kernel_info.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_mod.h" #include "frontend/operator/ops.h" #include "utils/log_adapter.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "utils/ms_utils.h" #include "pipeline/jit/resource.h" -#include "backend/optimizer/mem_reuse/mem_reuse.h" +#include "common/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 e42973e694..0c64c766f3 100644 --- a/tests/ut/cpp/pre_activate/pass/allreduce_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/pass/allreduce_fusion_test.cc @@ -19,12 +19,12 @@ #include "ir/tensor.h" #include "ir/manager.h" #include "debug/anf_ir_dump.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/pass/communication_op_fusion.h" -#include "backend/optimizer/common/optimizer.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/pass/communication_op_fusion.h" +#include "backend/common/optimizer/optimizer.h" #include "runtime/device/kernel_info.h" -#include "backend/optimizer/common/pass_manager.h" -#include "backend/kernel_compiler/kernel_build_info.h" +#include "backend/common/optimizer/pass_manager.h" +#include "kernel/kernel_build_info.h" #include "utils/utils.h" #include "utils/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 586cb05c93..7dc2b4ffe7 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 @@ -19,12 +19,12 @@ #include "ir/manager.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.h" -#include "backend/session/anf_runtime_algorithm.h" -#include "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/common/pass_manager.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/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 "backend/common/pass/common_subexpression_elimination.h" +#include "kernel/kernel_build_info.h" #include "utils/utils.h" #include "utils/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 4a0a4d40a8..cd39a2d4c9 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 @@ -17,10 +17,10 @@ #include "frontend/operator/ops.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.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 "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/pass/const_to_attr_strided_slice_grad.h" #include "utils/utils.h" #include "utils/ms_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 4c4ab1f15d..b7c0da9114 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 @@ -17,10 +17,10 @@ #include "frontend/operator/ops.h" #include "debug/anf_ir_dump.h" #include "common/py_func_graph_fetcher.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 "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/pass/convert_const_input_to_attr.h" #include "utils/utils.h" #include "utils/ms_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 561d6b0f23..5b215cefe0 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 "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 "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/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 4a3a5e9d5b..a51e311892 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 "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 "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/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 53658d00cd..2017bd240d 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 "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 "backend/common/session/anf_runtime_algorithm.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" +#include "backend/common/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 867be93334..8c50500e31 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 "backend/kernel_compiler/kernel.h" +#include "kernel/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 "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 "plugin/device/ascend/optimizer/format_type/insert_cast.h" +#include "backend/common/pass/eliminate_redundant_op.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/optimizer/pass_manager.h" #include "utils/utils.h" #include "utils/ms_context.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "utils/ms_context.h" #define private public #define protected public -#include "backend/optimizer/ascend/format_type/insert_trans_op.h" +#include "plugin/device/ascend/optimizer/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 555dd95426..740f04da41 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 "backend/session/ascend_session.h" +#include "backend/common/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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/pass/getitem_tuple.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/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 ae2e000b28..a305741756 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 "backend/optimizer/common/optimizer.h" -#include "backend/optimizer/pass/optimize_dependence.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/pass/optimize_dependence.h" namespace mindspore { namespace opt { diff --git a/tests/ut/cpp/session/anf_runtime_algorithm_test.cc b/tests/ut/cpp/session/anf_runtime_algorithm_test.cc index d8ff703dfe..369ea80a6f 100644 --- a/tests/ut/cpp/session/anf_runtime_algorithm_test.cc +++ b/tests/ut/cpp/session/anf_runtime_algorithm_test.cc @@ -17,10 +17,10 @@ #include "common/common_test.h" #include "ir/param_info.h" #include "frontend/operator/ops.h" -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "mindspore/ccsrc/runtime/device/kernel_info.h" -#include "mindspore/ccsrc/runtime/device/ascend/ascend_device_address.h" +#include "mindspore/ccsrc/plugin/device/ascend/hal/device/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 684ece7a63..db8529290f 100644 --- a/tests/ut/cpp/session/kernel_graph_test.cc +++ b/tests/ut/cpp/session/kernel_graph_test.cc @@ -17,8 +17,8 @@ #include "common/common_test.h" #include "ir/param_info.h" #include "frontend/operator/ops.h" -#include "backend/session/kernel_graph.h" -#include "backend/session/anf_runtime_algorithm.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/session/anf_runtime_algorithm.h" #include "mindspore/ccsrc/runtime/device/kernel_info.h" #include "utils/utils.h" diff --git a/tests/ut/cpp/session/session_basic_test.cc b/tests/ut/cpp/session/session_basic_test.cc index ac5dc5cbb9..bcb024c85f 100644 --- a/tests/ut/cpp/session/session_basic_test.cc +++ b/tests/ut/cpp/session/session_basic_test.cc @@ -16,9 +16,9 @@ #include "common/common_test.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 "backend/common/session/ascend_session.h" +#include "backend/common/session/kernel_graph.h" +#include "backend/common/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 7d2b3a3c6e..67403a11aa 100644 --- a/tests/ut/cpp/stub/aicpu/aicpu_stub.cc +++ b/tests/ut/cpp/stub/aicpu/aicpu_stub.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "backend/kernel_compiler/kernel.h" -#include "backend/kernel_compiler/aicpu/aicpu_kernel_load.h" +#include "kernel/kernel.h" +#include "plugin/device/ascend/kernel/aicpu/aicpu_kernel_load.h" namespace mindspore { namespace kernel { diff --git a/tests/ut/cpp/stub/dynamic_shape/dynamic_shape_stub.cc b/tests/ut/cpp/stub/dynamic_shape/dynamic_shape_stub.cc index 83f6e95cc9..ffc52dc67d 100644 --- a/tests/ut/cpp/stub/dynamic_shape/dynamic_shape_stub.cc +++ b/tests/ut/cpp/stub/dynamic_shape/dynamic_shape_stub.cc @@ -14,12 +14,12 @@ * limitations under the License. */ -#include "runtime/device/ascend/executor/hccl_dynamic_kernel.h" -#include "runtime/device/ascend/executor/rts/memcpy_rts_dynamic_kernel.h" -#include "runtime/device/ascend/executor/rts/profiling_rts_dynamic_kernel.h" -#include "runtime/device/ascend/executor/ai_core_dynamic_kernel.h" -#include "backend/kernel_compiler/host/host_kernel_metadata.h" -#include "backend/kernel_compiler/host/host_kernel_build.h" +#include "plugin/device/ascend/hal/device/executor/hccl_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/rts/memcpy_rts_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/rts/profiling_rts_dynamic_kernel.h" +#include "plugin/device/ascend/hal/device/executor/ai_core_dynamic_kernel.h" +#include "plugin/device/ascend/kernel/host/host_kernel_metadata.h" +#include "plugin/device/ascend/kernel/host/host_kernel_build.h" namespace mindspore { namespace device { 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 0ea58ce3b0..45f96e1f69 100644 --- a/tests/ut/cpp/stub/ge/ge_task_launch_stub.cc +++ b/tests/ut/cpp/stub/ge/ge_task_launch_stub.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include -#include "runtime/hccl_adapter/hccl_adapter.h" +#include "plugin/device/ascend/hal/hccl_adapter/hccl_adapter.h" namespace mindspore { namespace hccl { diff --git a/tests/ut/cpp/stub/hccl/collective_stub.cc b/tests/ut/cpp/stub/hccl/collective_stub.cc index 1dad2d51b6..f6c7fa1f63 100644 --- a/tests/ut/cpp/stub/hccl/collective_stub.cc +++ b/tests/ut/cpp/stub/hccl/collective_stub.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/device/ascend/distribute/ascend_collective.h" +#include "plugin/device/ascend/hal/device/distribute/ascend_collective.h" namespace mindspore { namespace device { diff --git a/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc b/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc index e5417c5ccd..b91f3ab553 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 "backend/kernel_compiler/tbe/tbe_kernel_mod.h" -#include "backend/kernel_compiler/tbe/tbe_kernel_compile.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_mod.h" +#include "plugin/device/ascend/kernel/tbe/tbe_kernel_compile.h" namespace mindspore { namespace kernel { 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 f7458237bd..a18129e28e 100644 --- a/tests/ut/cpp/stub/tasksink/ascend_stream_assign_stub.cc +++ b/tests/ut/cpp/stub/tasksink/ascend_stream_assign_stub.cc @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/device/ascend/ascend_stream_assign.h" -#include "runtime/device/ascend/ascend_label_assign.h" +#include "plugin/device/ascend/hal/device/ascend_stream_assign.h" +#include "plugin/device/ascend/hal/device/ascend_label_assign.h" #include "runtime/device/kernel_adjust.h" namespace mindspore { diff --git a/tests/ut/cpp/stub/tasksink/task_sink_stub.cc b/tests/ut/cpp/stub/tasksink/task_sink_stub.cc index 12d0e2e5f3..7efd2720f3 100644 --- a/tests/ut/cpp/stub/tasksink/task_sink_stub.cc +++ b/tests/ut/cpp/stub/tasksink/task_sink_stub.cc @@ -14,9 +14,9 @@ * limitations under the License. */ -#include "runtime/device/ascend/tasksink/task_generator.h" +#include "plugin/device/ascend/hal/device/tasksink/task_generator.h" #ifndef ENABLE_SECURITY -#include "runtime/device/ascend/dump/data_dumper.h" +#include "plugin/device/ascend/hal/device/dump/data_dumper.h" #endif namespace mindspore { diff --git a/tests/ut/cpp/tbe/tbe_json_creator_test.cc b/tests/ut/cpp/tbe/tbe_json_creator_test.cc index f821b8287c..13040a1ee6 100644 --- a/tests/ut/cpp/tbe/tbe_json_creator_test.cc +++ b/tests/ut/cpp/tbe/tbe_json_creator_test.cc @@ -18,13 +18,13 @@ #include "common/backend_common_test.h" #include "common/py_func_graph_fetcher.h" #include "debug/anf_ir_dump.h" -#include "backend/kernel_compiler/kernel.h" +#include "kernel/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/kernel_compiler/tbe/tbe_json/single_tbe_json_creator.h" -#include "backend/kernel_compiler/tbe/tbe_json/fusion_tbe_json_creator.h" +#include "backend/common/optimizer/optimizer.h" +#include "backend/common/session/anf_runtime_algorithm.h" +#include "plugin/device/ascend/optimizer/buffer_fusion/ub_pattern_fusion.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/single_tbe_json_creator.h" +#include "plugin/device/ascend/kernel/tbe/tbe_json/fusion_tbe_json_creator.h" namespace mindspore::kernel { diff --git a/tests/ut/cpp/vm/segment_runner_test.cc b/tests/ut/cpp/vm/segment_runner_test.cc index d41030c75c..418ab3f88f 100644 --- a/tests/ut/cpp/vm/segment_runner_test.cc +++ b/tests/ut/cpp/vm/segment_runner_test.cc @@ -25,8 +25,8 @@ #include "pipeline/jit/resource.h" #include "debug/draw.h" #include "frontend/operator/ops.h" -#include "vm/segment_runner.h" -#include "vm/transform.h" +#include "backend/graph_compiler/segment_runner.h" +#include "backend/graph_compiler/transform.h" #include "ir/tensor.h" #include "utils/convert_utils.h" #include "utils/convert_utils_py.h" diff --git a/tests/ut/cpp/vm/vm_test.cc b/tests/ut/cpp/vm/vm_test.cc index a373d35cd0..2fba67964c 100644 --- a/tests/ut/cpp/vm/vm_test.cc +++ b/tests/ut/cpp/vm/vm_test.cc @@ -13,10 +13,10 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "vm/vm.h" +#include "backend/graph_compiler/vm.h" #include "common/common_test.h" #include "frontend/operator/ops.h" -#include "vm/backend.h" +#include "backend/graph_compiler/backend.h" namespace mindspore { namespace compile {