From d81862a916e294ab4a517ce4bd3d5d15885ddc4b Mon Sep 17 00:00:00 2001 From: liubuyu Date: Tue, 4 Aug 2020 21:35:48 +0800 Subject: [PATCH] decoupling core and context --- .../aicpu/aicpu_kernel_build.cc | 2 +- .../kernel_compiler/aicpu/aicpu_kernel_mod.cc | 2 +- .../kernel_compiler/akg/akg_kernel_build.cc | 2 +- .../akg/ascend/akg_ascend_kernel_mod.cc | 2 +- .../akg/gpu/akg_gpu_kernel_build.cc | 2 +- .../akg/gpu/akg_gpu_kernel_mod.cc | 2 +- .../backend/kernel_compiler/common_utils.cc | 2 +- .../cpu/apply_momentum_cpu_kernel.cc | 2 +- .../kernel_compiler/cpu/cpu_kernel_factory.h | 2 +- .../kernel_compiler/cpu/debug_cpu_kernel.cc | 2 +- .../cpu/mkldnn/conv2d_cpu_kernel.cc | 2 +- .../mkldnn/conv2d_grad_filter_cpu_kernel.cc | 2 +- .../mkldnn/conv2d_grad_input_cpu_kernel.cc | 2 +- .../cpu/mkldnn/lstm_cpu_kernel.cc | 2 +- .../cpu/mkldnn/lstm_grad_cpu_kernel.cc | 2 +- .../cpu/mkldnn/matmul_cpu_kernel.cc | 2 +- .../cpu/mkldnn/mkl_cpu_kernel.cc | 2 +- .../cpu/mkldnn/mkl_kernel_engine.h | 2 +- .../cpu/mkldnn/mul_cpu_kernel.cc | 2 +- .../cpu/mkldnn/pooling_cpu_kernel.cc | 2 +- .../cpu/mkldnn/pooling_grad_cpu_kernel.cc | 2 +- .../cpu/mkldnn/relu_cpu_kernel.cc | 2 +- .../cpu/mkldnn/relu_grad_cpu_kernel.cc | 2 +- .../cpu/mkldnn/softmax_cpu_kernel.cc | 2 +- ...ax_cross_entropy_with_logits_cpu_kernel.cc | 2 +- ...ax_cross_entropy_with_logits_cpu_kernel.cc | 2 +- .../kernel_compiler/gpu/gpu_kernel_factory.cc | 2 +- .../kernel_compiler/hccl/hccl_kernel.cc | 2 +- .../kernel_compiler/hccl/hccl_kernel.h | 2 +- .../hccl/hcom_all_broadcast.cc | 2 +- .../kernel_compiler/hccl/hcom_all_gather.cc | 2 +- .../kernel_compiler/hccl/hcom_all_reduce.cc | 2 +- .../hccl/hcom_all_reduce_scatter.cc | 2 +- .../backend/kernel_compiler/kernel_fusion.cc | 2 +- .../backend/kernel_compiler/kernel_query.cc | 2 +- .../backend/kernel_compiler/oplib/oplib.cc | 2 +- .../backend/kernel_compiler/oplib/oplib.h | 2 +- .../backend/kernel_compiler/rts/assign.cc | 2 +- .../backend/kernel_compiler/rts/label_goto.cc | 2 +- .../backend/kernel_compiler/rts/label_set.cc | 2 +- .../kernel_compiler/rts/label_switch.cc | 2 +- .../kernel_compiler/rts/memcpy_async.cc | 4 +- .../ccsrc/backend/kernel_compiler/rts/recv.cc | 4 +- .../kernel_compiler/rts/rt_kernel_info.cc | 2 +- .../ccsrc/backend/kernel_compiler/rts/send.cc | 2 +- .../kernel_compiler/rts/stream_active.cc | 2 +- .../kernel_compiler/rts/stream_switch.cc | 2 +- .../kernel_compiler/tbe/tbe_convert_utils.cc | 2 +- .../kernel_compiler/tbe/tbe_kernel_mod.cc | 2 +- .../tbe/tbe_kernel_parallel_build.cc | 2 +- .../tbe_kernel_select/tbe_kernel_select.cc | 2 +- .../backend/kernel_compiler/tbe/tbe_utils.cc | 2 +- .../ascend/ascend_backend_optimization.cc | 2 +- .../backend/optimizer/ascend/ascend_helper.cc | 4 +- .../bnupdate_eltwise_eltwise_fusion_pass.cc | 2 +- .../bnupdate_eltwise_fusion_pass.cc | 2 +- ...v2dbackprop_eltwise_eltwise_fusion_pass.cc | 2 +- .../conv2dbackprop_eltwise_fusion_pass.cc | 2 +- .../conv_bnreduce_fusion_pass.cc | 2 +- .../conv_double_in_fusion_pass.cc | 2 +- .../conv_single_in_fusion_pass.cc | 2 +- .../depthwiseconv_eltwise_fusion_pass.cc | 2 +- .../buffer_fusion/eltwise_fusion_pass.cc | 2 +- .../ascend/buffer_fusion/fusion_base_pass.cc | 2 +- .../matmul_eltwise_fusion_pass.cc | 2 +- .../buffer_fusion/multi_output_fusion_pass.cc | 2 +- .../reduce_eltwise_fusion_pass.cc | 2 +- .../segment_eltwise_fusion_pass.cc | 2 +- ...ridedread_conv_stridedwrite_fusion_pass.cc | 2 +- .../ascend/buffer_fusion/ub_pattern_fusion.cc | 2 +- .../chang_axis_of_reduce_kernel.cc | 2 +- .../ascend/format_type/check_consistency.cc | 2 +- .../ascend/format_type/insert_trans_op.cc | 2 +- .../rectify_do_mask_kernel_info.cc | 2 +- .../ir_fission/batch_norm_grad_split.cc | 4 +- .../ascend/ir_fission/bn_grad_split.cc | 4 +- .../optimizer/ascend/ir_fission/bn_split.cc | 2 +- .../ir_fission/layer_norm_grad_split.cc | 2 +- .../optimizer/ascend/ir_fission/topk_split.cc | 2 +- .../clip_by_norm_no_div_square_sum_fusion.cc | 2 +- .../ir_fusion/input_to_output_registry.h | 2 +- .../lamb_update_with_lr_rule_fusion.cc | 2 +- .../common/common_backend_optimization.cc | 2 +- .../ccsrc/backend/optimizer/common/helper.cc | 4 +- .../ccsrc/backend/optimizer/common/helper.h | 2 +- .../backend/optimizer/common/optimizer.h | 2 +- .../backend/optimizer/common/pass_manager.cc | 2 +- .../mem_reuse/mem_dynamic_allocator.cc | 2 +- .../pass/const_input_to_attr_registry.h | 2 +- .../pass/const_to_attr_strided_slice_grad.cc | 2 +- .../pass/convert_const_input_to_attr.cc | 2 +- .../backend/session/anf_runtime_algorithm.cc | 2 +- .../backend/session/ascend_control_parser.cc | 2 +- .../session/ascend_inference_session.cc | 2 +- .../ccsrc/backend/session/ascend_session.cc | 2 +- .../ccsrc/backend/session/cpu_session.cc | 2 +- .../ccsrc/backend/session/gpu_session.cc | 4 +- .../ccsrc/backend/session/infer_session.cc | 15 +- .../ccsrc/backend/session/session_basic.cc | 2 +- .../ccsrc/backend/session/session_basic.h | 2 +- .../ccsrc/backend/session/session_context.h | 2 +- .../ccsrc/backend/session/session_factory.h | 2 +- mindspore/ccsrc/common/trans.cc | 2 +- mindspore/ccsrc/debug/anf_ir_utils.cc | 2 +- mindspore/ccsrc/debug/common.cc | 2 +- mindspore/ccsrc/debug/data_dump_parser.cc | 2 +- mindspore/ccsrc/debug/data_dump_parser.h | 2 +- mindspore/ccsrc/debug/draw.cc | 8 + mindspore/ccsrc/debug/e2e_dump.cc | 2 +- .../frontend/operator/cc_implementations.cc | 2 +- .../operator/composite/do_signature.h | 2 +- .../operator/composite/multitype_funcgraph.cc | 2 +- .../frontend/operator/composite/unpack_call.h | 2 +- .../ccsrc/frontend/operator/prim_maths.cc | 2 +- .../ccsrc/frontend/operator/prim_others.cc | 4 +- .../ccsrc/frontend/optimizer/ad/dfunctor.cc | 2 +- mindspore/ccsrc/frontend/optimizer/ad/grad.cc | 2 +- .../ccsrc/frontend/optimizer/ad/kprim.cc | 2 +- .../optimizer/irpass/gradient_eliminate.h | 2 +- .../ccsrc/frontend/optimizer/optimizer.h | 2 +- .../frontend/optimizer/py_pass_manager.h | 2 +- .../parallel/auto_parallel/edge_costmodel.h | 2 +- .../parallel/auto_parallel/graph_costmodel.h | 21 +- mindspore/ccsrc/frontend/parallel/context.cc | 2 +- .../frontend/parallel/costmodel_context.cc | 12 +- .../frontend/parallel/costmodel_context.h | 19 + .../ccsrc/frontend/parallel/device_manager.h | 2 +- .../parallel/graph_util/get_parallel_info.cc | 2 +- .../parallel/graph_util/graph_info.cc | 2 +- .../frontend/parallel/ops_info/matmul_info.h | 2 +- .../parallel/ops_info/operator_info.cc | 2 +- .../parallel/ops_info/operator_info.h | 2 +- .../frontend/parallel/ps/parameter_server.h | 2 +- mindspore/ccsrc/frontend/parallel/ps/util.cc | 2 +- .../parallel_strategy_checkpoint.cc | 2 +- .../parallel/tensor_layout/arrangement.cc | 2 +- .../parallel/tensor_layout/layout_transfer.cc | 2 +- .../frontend/parallel/tensor_layout/map.cc | 2 +- .../parallel/tensor_layout/tensor_layout.cc | 2 +- .../tensor_layout/tensor_redistribution.cc | 2 +- .../ccsrc/minddata/dataset/api/de_pipeline.cc | 2 +- .../ccsrc/minddata/dataset/core/tensor.cc | 2 +- .../ccsrc/minddata/dataset/core/tensor.h | 2 +- .../minddata/dataset/core/tensor_shape.cc | 2 +- .../minddata/dataset/engine/data_schema.cc | 2 +- .../dataset/engine/datasetops/batch_op.cc | 2 +- .../dataset/engine/datasetops/concat_op.cc | 2 +- .../engine/datasetops/source/cifar_op.cc | 2 +- .../engine/datasetops/source/coco_op.cc | 2 +- .../datasetops/source/image_folder_op.cc | 2 +- .../engine/datasetops/source/manifest_op.cc | 2 +- .../engine/datasetops/source/mindrecord_op.cc | 2 +- .../engine/datasetops/source/mnist_op.cc | 2 +- .../engine/datasetops/source/text_file_op.cc | 2 +- .../engine/datasetops/source/tf_reader_op.cc | 2 +- .../engine/datasetops/source/voc_op.cc | 2 +- .../dataset/engine/datasetops/take_op.cc | 2 +- .../minddata/dataset/engine/perf/profiling.cc | 2 +- .../minddata/dataset/engine/tdt/tdt_plugin.cc | 2 +- .../ccsrc/minddata/dataset/include/tensor.h | 2 +- .../dataset/kernels/image/center_crop_op.cc | 2 +- .../dataset/kernels/image/image_utils.cc | 2 +- .../kernels/sentence_piece_tokenizer_op.cc | 2 +- .../dataset/text/sentence_piece_vocab.cc | 2 +- .../ccsrc/minddata/dataset/util/cache_pool.cc | 2 +- .../minddata/dataset/util/intrp_service.cc | 2 +- mindspore/ccsrc/minddata/dataset/util/path.cc | 2 +- mindspore/ccsrc/minddata/dataset/util/queue.h | 2 +- .../ccsrc/minddata/dataset/util/status.cc | 2 +- .../dataset/util/storage_container.cc | 2 +- .../minddata/dataset/util/storage_manager.cc | 2 +- mindspore/ccsrc/minddata/dataset/util/task.cc | 2 +- .../mindrecord/common/shard_pybind.cc | 2 +- .../minddata/mindrecord/common/shard_utils.cc | 2 +- .../mindrecord/io/shard_index_generator.cc | 2 +- .../minddata/mindrecord/io/shard_reader.cc | 2 +- .../minddata/mindrecord/io/shard_segment.cc | 2 +- .../minddata/mindrecord/io/shard_writer.cc | 2 +- .../minddata/mindrecord/meta/shard_column.cc | 2 +- .../minddata/mindrecord/meta/shard_header.cc | 2 +- .../minddata/mindrecord/meta/shard_schema.cc | 2 +- .../minddata/mindrecord/meta/shard_task.cc | 2 +- mindspore/ccsrc/pipeline/jit/action.cc | 2 +- mindspore/ccsrc/pipeline/jit/base.h | 2 +- mindspore/ccsrc/pipeline/jit/init.cc | 2 - .../pipeline/jit/parse/data_converter.cc | 2 +- mindspore/ccsrc/pipeline/jit/parse/parse.cc | 2 +- mindspore/ccsrc/pipeline/jit/pipeline.cc | 17 +- .../pipeline/jit/static_analysis/evaluator.cc | 2 +- .../pipeline/jit/static_analysis/evaluator.h | 2 +- .../pipeline/jit/static_analysis/prim.cc | 4 +- .../pipeline/pynative/pynative_execute.cc | 5 +- .../pipeline/pynative/pynative_execute.h | 2 +- .../pipeline/pynative/pynative_execute_ge.cc | 2 +- .../pipeline/pynative/pynative_execute_ge.h | 2 +- .../device/ascend/ascend_device_address.cc | 2 +- .../device/ascend/ascend_kernel_runtime.cc | 5 +- .../device/ascend/ascend_memory_manager.cc | 2 +- .../device/ascend/ascend_stream_assign.cc | 4 +- .../runtime/device/ascend/dump/data_dumper.cc | 2 +- .../device/ascend/kernel_select_ascend.cc | 4 +- .../ascend/profiling/profiling_manager.cc | 4 +- .../ascend/profiling/profiling_manager.h | 2 +- .../ascend/profiling/profiling_utils.cc | 4 +- .../device/ascend/tasksink/task_generator.cc | 4 +- .../runtime/device/cpu/cpu_kernel_runtime.cc | 4 +- .../runtime/device/gpu/blocking_queue.cc | 2 +- .../runtime/device/gpu/gpu_buffer_mgr.cc | 2 +- .../runtime/device/gpu/gpu_kernel_runtime.cc | 4 +- .../device/gpu/gpu_memory_allocator.cc | 2 +- .../runtime/device/gpu/gpu_memory_manager.cc | 2 +- .../runtime/device/gpu/kernel_info_setter.cc | 2 +- .../ccsrc/runtime/device/kernel_adjust.cc | 4 +- .../ccsrc/runtime/device/kernel_runtime.cc | 4 +- .../ccsrc/runtime/device/kernel_runtime.h | 2 +- .../runtime/device/kernel_runtime_manager.h | 2 +- .../ccsrc/runtime/device/memory_manager.cc | 2 +- mindspore/ccsrc/transform/graph_ir/convert.cc | 2 +- .../{ms_context.cc => context_extends.cc} | 384 +++++++----------- .../ccsrc/utils/context/context_extends.h | 51 +++ mindspore/ccsrc/utils/primitive_utils.cc | 2 +- mindspore/ccsrc/utils/tensorprint_utils.cc | 2 +- mindspore/ccsrc/utils/tensorprint_utils.h | 2 +- mindspore/ccsrc/vm/backend.cc | 2 +- mindspore/ccsrc/vm/transform.cc | 2 +- mindspore/core/ir/anf.cc | 2 +- mindspore/core/ir/func_graph.h | 3 + mindspore/core/ir/func_graph_cloner.cc | 2 +- mindspore/core/ir/func_graph_extends.cc | 9 +- mindspore/core/ir/graph_utils.cc | 2 +- mindspore/core/ir/graph_utils_extends.cc | 2 +- mindspore/core/ir/meta_func_graph.cc | 2 +- mindspore/core/ir/value.h | 2 +- mindspore/core/utils/CMakeLists.txt | 2 +- mindspore/core/utils/ms_context.cc | 158 +++++++ .../utils/context => core/utils}/ms_context.h | 42 +- .../utils.cc => core/utils/ms_utils.cc} | 2 +- .../common/utils.h => core/utils/ms_utils.h} | 0 mindspore/lite/src/train/train_session.cc | 2 +- mindspore/lite/test/CMakeLists.txt | 3 +- mindspore/lite/tools/converter/CMakeLists.txt | 3 +- tests/ut/cpp/common/backend_common_test.h | 2 +- tests/ut/cpp/dataset/batch_op_test.cc | 2 +- tests/ut/cpp/dataset/c_api_test.cc | 2 +- tests/ut/cpp/dataset/cifar_op_test.cc | 2 +- tests/ut/cpp/dataset/circular_pool_test.cc | 2 +- tests/ut/cpp/dataset/clue_op_test.cc | 2 +- tests/ut/cpp/dataset/coco_op_test.cc | 2 +- tests/ut/cpp/dataset/common/bboxop_common.cc | 2 +- tests/ut/cpp/dataset/common/cvop_common.cc | 2 +- tests/ut/cpp/dataset/concat_op_test.cc | 2 +- tests/ut/cpp/dataset/csv_op_test.cc | 2 +- tests/ut/cpp/dataset/image_folder_op_test.cc | 2 +- tests/ut/cpp/dataset/manifest_op_test.cc | 2 +- tests/ut/cpp/dataset/mind_record_op_test.cc | 2 +- tests/ut/cpp/dataset/mnist_op_test.cc | 2 +- tests/ut/cpp/dataset/project_op_test.cc | 2 +- tests/ut/cpp/dataset/rename_op_test.cc | 2 +- tests/ut/cpp/dataset/schema_test.cc | 2 +- tests/ut/cpp/dataset/shuffle_op_test.cc | 2 +- tests/ut/cpp/dataset/take_op_test.cc | 2 +- tests/ut/cpp/dataset/tensorshape_test.cc | 2 +- tests/ut/cpp/dataset/text_file_op_test.cc | 2 +- tests/ut/cpp/dataset/tfReader_op_test.cc | 2 +- tests/ut/cpp/dataset/voc_op_test.cc | 2 +- tests/ut/cpp/dataset/zip_op_test.cc | 2 +- tests/ut/cpp/mindrecord/ut_common.h | 2 +- .../cpp/mindrecord/ut_shard_operator_test.cc | 2 +- .../ut/cpp/mindrecord/ut_shard_reader_test.cc | 2 +- .../cpp/mindrecord/ut_shard_segment_test.cc | 2 +- .../ut/cpp/mindrecord/ut_shard_writer_test.cc | 2 +- .../ascend/format_type/insert_cast_test.cc | 2 +- .../format_type/insert_trans_op_test.cc | 2 +- .../ascend/ir_fission/transdata_split_test.cc | 2 +- .../transpose_transdata_fusion_test.cc | 2 +- .../pre_activate/mem_reuse/mem_reuse_test.cc | 2 +- .../pass/allreduce_fusion_test.cc | 2 +- .../common_subexpression_elimination_test.cc | 2 +- .../const_to_attr_strided_slice_grad_test.cc | 2 +- .../pass/convert_const_input_to_attr_test.cc | 2 +- .../pass/eliminate_redundant_op_test.cc | 4 +- .../ut/cpp/pynative/pynative_execute_test.cc | 2 +- .../ut/cpp/stub/kernel/kernel_fusion_stub.cc | 2 +- 283 files changed, 735 insertions(+), 590 deletions(-) rename mindspore/ccsrc/utils/context/{ms_context.cc => context_extends.cc} (54%) create mode 100644 mindspore/ccsrc/utils/context/context_extends.h create mode 100644 mindspore/core/utils/ms_context.cc rename mindspore/{ccsrc/utils/context => core/utils}/ms_context.h (88%) rename mindspore/{ccsrc/common/utils.cc => core/utils/ms_utils.cc} (97%) rename mindspore/{ccsrc/common/utils.h => core/utils/ms_utils.h} (100%) diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc index 7e7fd20f3..1e855f8fc 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc @@ -30,7 +30,7 @@ #include "proto/attr.pb.h" #include "proto/node_def.pb.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/aicpu/aicpu_util.h" #include "backend/session/kernel_graph.h" #include "backend/kernel_compiler/common_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc index e18b3169f..b2f992fc8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc @@ -26,7 +26,7 @@ #include "backend/kernel_compiler/aicpu/aicpu_kernel_build.h" #include "utils/convert_utils.h" #include "backend/kernel_compiler/aicpu/aicpu_util.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" using AicpuTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc index 9c13629b1..033dfcf3d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc @@ -31,7 +31,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/convert_utils.h" #include "utils/any.h" #include "utils/utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc index 8bb494077..8affa12c3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc @@ -26,7 +26,7 @@ #include "runtime/rt.h" #include "utils/log_adapter.h" #include "utils/convert_utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc index 96fcd1869..e2cae2873 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.cc @@ -20,7 +20,7 @@ #include "backend/kernel_compiler/kernel.h" #include "backend/kernel_compiler/akg/akg_kernel_build.h" #include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc index d527f8ec7..65ba8b0b7 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc @@ -18,7 +18,7 @@ #include #include #include "nlohmann/json.hpp" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc b/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc index 1e029f989..38cb6afcd 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc @@ -24,7 +24,7 @@ #include #include "nlohmann/json.hpp" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "ir/manager.h" #include "ir/meta_tensor.h" #include "ir/func_graph.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc index c1ff8d54b..76acf852d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc @@ -16,7 +16,7 @@ #include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h index 2ee2e8d30..90ab6f3ff 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h @@ -23,7 +23,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/cpu/cpu_kernel.h" #include "runtime/device/cpu/kernel_select_cpu.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc index 344f03cc5..6bbf6c8a5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc @@ -15,7 +15,7 @@ */ #include "backend/kernel_compiler/cpu/debug_cpu_kernel.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #ifdef ENABLE_DEBUGGER #include "debug/debugger/debugger.h" #endif diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.cc index 834f489d7..25a01fdca 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.cc @@ -15,7 +15,7 @@ */ #include "backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.h" #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc index e2aff0c18..077cf9a61 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.cc @@ -15,7 +15,7 @@ */ #include "backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h" #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc index a1677905b..2073c5bf2 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc @@ -17,7 +17,7 @@ #include #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc index 3f4ba127b..72ce1fd9c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.cc @@ -15,7 +15,7 @@ */ #include "backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h" #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc index 9ffd67235..ea2ea9824 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc @@ -18,7 +18,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc index 4bbaa6459..ee9c4eb30 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc @@ -17,7 +17,7 @@ #include #include #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "runtime/device/cpu/cpu_device_address.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc index 49510d29e..7f66b81b8 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc @@ -17,7 +17,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h index 99e7ecdfe..7e14b6681 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h @@ -23,7 +23,7 @@ #include #include #include "dnnl.hpp" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.cc index fddd76904..a59cc3c4b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.cc @@ -16,7 +16,7 @@ #include "backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc index 0bb1edde4..ad0ff274c 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.cc @@ -16,7 +16,7 @@ #include "backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h" #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.cc index 1466b5445..bd9bbe7b1 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.cc @@ -17,7 +17,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.cc index 29ac9a106..558b2d706 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.cc @@ -16,7 +16,7 @@ #include "backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.cc index 9139aa786..3188b0622 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.cc @@ -16,7 +16,7 @@ #include "backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc index 94271b8a6..de9a8890d 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.cc @@ -16,7 +16,7 @@ #include "backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h" #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "common/utils.h" +#include "utils/ms_utils.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/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc index 889e2abde..d6aadad43 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc @@ -19,7 +19,7 @@ #include #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "common/utils.h" +#include "utils/ms_utils.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/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc index b8bf7b318..b1299f1ae 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc @@ -19,7 +19,7 @@ #include #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc b/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc index 4a0191abd..8cd5a3c4e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc @@ -19,7 +19,7 @@ #include #include -#include "common/utils.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" diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc index 5ec4f5257..bf948498a 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc @@ -18,7 +18,7 @@ #include "runtime/device/ascend/tasksink/runtime_utils.h" #include "backend/session/anf_runtime_algorithm.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" using HcclTaskInfoPtr = std::shared_ptr; using ge::model_runner::HcclTaskInfo; diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h index 971caa27f..330692e46 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.h @@ -26,7 +26,7 @@ #include "backend/kernel_compiler/ascend_kernel_mod.h" #include "backend/kernel_compiler/hccl/hcom_util.h" #include "hccl/hcom.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc index e9fb4c931..29f3e9548 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc @@ -20,7 +20,7 @@ #include #include -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc index 201071dcb..2502ec799 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc @@ -20,7 +20,7 @@ #include #include -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc index 533ce1b08..70857d6a6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc @@ -20,7 +20,7 @@ #include #include -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc index 32c6dacb0..ca38f3e73 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc @@ -20,7 +20,7 @@ #include #include -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.cc b/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.cc index 60a95f5c1..d4ef90572 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.cc @@ -21,7 +21,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/tbe/tbe_kernel_build.h" #include "backend/kernel_compiler/tbe/tbe_kernel_parallel_build.h" #include "backend/kernel_compiler/tbe/tbe_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc b/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc index 81b5d0f99..a1218f03d 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc @@ -23,7 +23,7 @@ #include "backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.h" #include "backend/kernel_compiler/akg/akg_kernel_metadata.h" #include "backend/session/anf_runtime_algorithm.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc index 69c4ca7db..9a23e0def 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc @@ -22,7 +22,7 @@ #include #include "utils/log_adapter.h" #include "utils/overload.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h index ed647be34..a27fae3df 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h +++ b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h @@ -20,7 +20,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/oplib/opinfo.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc index 552468bb7..49666293b 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc @@ -19,7 +19,7 @@ #include #include "runtime/mem.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using ge::model_runner::MemcpyAsyncTaskInfo; using MemcpyAsyncTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc index 8ec460fe0..81c85bd37 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc @@ -20,7 +20,7 @@ #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using ge::model_runner::LabelGotoTaskInfo; using LabelGotoTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc index 909885ff1..5945dc9f5 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc @@ -20,7 +20,7 @@ #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using ge::model_runner::LabelSetTaskInfo; using LabelSetTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc index ccb49d949..8e0656937 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc @@ -21,7 +21,7 @@ #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using ge::model_runner::LabelSwitchTaskInfo; using LabelSwitchTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc index ca1114a83..9546f38e6 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc @@ -20,10 +20,10 @@ #include #include "runtime/mem.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/session/anf_runtime_algorithm.h" #include "common/trans.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" using ge::model_runner::MemcpyAsyncTaskInfo; using MemcpyAsyncTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc index cee0ef2fd..d51663f35 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc @@ -17,11 +17,11 @@ #include "backend/kernel_compiler/rts/recv.h" #include #include "runtime/stream.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "runtime/device/ascend/ascend_stream_assign.h" #include "framework/ge_runtime/task_info.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc index 9501aed5f..59ac61fd8 100755 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc @@ -19,7 +19,7 @@ #include #include "utils/convert_utils.h" #include "utils/utils.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/session/anf_runtime_algorithm.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc index 11c0a7d66..3b284abe3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc @@ -19,7 +19,7 @@ #include "runtime/event.h" #include "framework/ge_runtime/task_info.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using ge::model_runner::EventRecordTaskInfo; using EventRecordTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc index e33549973..4e48366f4 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc @@ -20,7 +20,7 @@ #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using ge::model_runner::StreamActiveTaskInfo; using StreamActiveTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc index 5fe03b196..aecd7f69e 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc @@ -22,7 +22,7 @@ #include "runtime/stream.h" #include "framework/ge_runtime/task_info.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using ge::model_runner::StreamSwitchTaskInfo; using StreamSwitchTaskInfoPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc index e7fd94ef8..34165c479 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc @@ -21,7 +21,7 @@ #include #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc index e6cb4cf30..933fcb156 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc @@ -17,7 +17,7 @@ #include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" #include #include "runtime/rt.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "graphengine/inc/framework/ge_runtime/task_info.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc index f69414276..05d1aed78 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc @@ -23,7 +23,7 @@ #include #include -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/kernel_compiler/tbe/tbe_adapter.h" #include "backend/kernel_compiler/tbe/tbe_kernel_build.h" #include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc index 8e923f744..4455ce9f3 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_select/tbe_kernel_select.cc @@ -23,7 +23,7 @@ #include "backend/kernel_compiler/oplib/oplib.h" #include "backend/kernel_compiler/tbe/tbe_kernel_build.h" #include "nlohmann/json.hpp" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/helper.h" #include "backend/kernel_compiler/tbe/tbe_convert_utils.h" #include "frontend/parallel/ops_info/ops_utils.h" diff --git a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc index 76ef7b08d..b68d30633 100644 --- a/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc +++ b/mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_utils.cc @@ -30,7 +30,7 @@ #include "backend/kernel_compiler/oplib/oplib.h" #include "utils/utils.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "runtime/device/kernel_info.h" #include "ir/dtype/type.h" #include "backend/kernel_compiler/tbe/tbe_convert_utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc b/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc index b273244bc..44aba2c39 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ascend_backend_optimization.cc @@ -103,7 +103,7 @@ #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 "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/config_manager.h" #include "debug/anf_ir_dump.h" #include "debug/anf_ir_utils.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc b/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc index 74f4f249e..1adce131b 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc @@ -17,7 +17,7 @@ #include "backend/optimizer/ascend/ascend_helper.h" #include #include "common/trans.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/optimizer/common/helper.h" #include "utils/utils.h" #include "runtime/device/kernel_info.h" @@ -26,7 +26,7 @@ #include "frontend/operator/ops.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/session/kernel_graph.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc index 22183c905..dd0d61e1a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_eltwise_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc index 59915d43d..74ef83dcf 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/bnupdate_eltwise_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc index 1bfff1b50..eecda879d 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_eltwise_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc index 144ab4b53..d9d6c3784 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv2dbackprop_eltwise_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc index a2ebfbe79..d32269fab 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_bnreduce_fusion_pass.cc @@ -23,7 +23,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc index 1a67e3c39..d5626bc41 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_double_in_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc index 1eb26b12b..f31d8f758 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/conv_single_in_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc index 285b8f6c0..6e48048b2 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/depthwiseconv_eltwise_fusion_pass.cc @@ -23,7 +23,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc index 1e24cce0e..865ae5734 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/eltwise_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc index 27a7a786d..f66dbeda9 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc @@ -17,7 +17,7 @@ #include #include #include "debug/anf_ir_dump.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" #include "backend/session/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc index 7fcc6e45e..f026bc8b0 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/matmul_eltwise_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc index 58a219aec..bf29ca141 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/multi_output_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc index 95955818e..741be4835 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/reduce_eltwise_fusion_pass.cc @@ -23,7 +23,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc index f2117f937..6ae541c8c 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/segment_eltwise_fusion_pass.cc @@ -22,7 +22,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc index d93b47b66..a6222a13a 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/stridedread_conv_stridedwrite_fusion_pass.cc @@ -23,7 +23,7 @@ #include "debug/anf_ir_dump.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/fusion_id_allocator.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc index 968553070..83fa647e1 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/ub_pattern_fusion.cc @@ -28,7 +28,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" #include "runtime/device/kernel_info.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.cc index f508bb286..03c461806 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/chang_axis_of_reduce_kernel.cc @@ -22,7 +22,7 @@ #include "utils/utils.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/common_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc index 7da002731..bdebc0bc1 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/check_consistency.cc @@ -21,7 +21,7 @@ #include "utils/utils.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/common_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc index 8f0d5dd48..9788db677 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/insert_trans_op.cc @@ -22,7 +22,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "backend/kernel_compiler/oplib/oplib.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc b/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc index 91b9326cc..cff8ce567 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/format_type/rectify_do_mask_kernel_info.cc @@ -25,7 +25,7 @@ #include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" #include "backend/kernel_compiler/common_utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/helper.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc index 97122386c..00adc7211 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc @@ -20,8 +20,8 @@ #include #include "utils/utils.h" -#include "utils/context/ms_context.h" -#include "common/utils.h" +#include "utils/ms_context.h" +#include "utils/ms_utils.h" #include "backend/optimizer/common/helper.h" #include "runtime/device/kernel_info.h" #include "backend/session/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc index 6c4e22612..45d629d4e 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc @@ -20,8 +20,8 @@ #include #include "utils/utils.h" -#include "utils/context/ms_context.h" -#include "common/utils.h" +#include "utils/ms_context.h" +#include "utils/ms_utils.h" #include "backend/optimizer/common/helper.h" #include "runtime/device/kernel_info.h" #include "backend/session/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc index 33670e570..8ebbd9269 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc @@ -20,7 +20,7 @@ #include #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/optimizer/common/helper.h" #include "runtime/device/kernel_info.h" #include "backend/session/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc index 1d19def78..55124b875 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/layer_norm_grad_split.cc @@ -22,7 +22,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "ir/primitive.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc index 6eeb7a61f..8e1856026 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fission/topk_split.cc @@ -24,7 +24,7 @@ #include "backend/session/kernel_graph.h" #include "backend/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.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/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc index 1d89bfd38..de6d4e6a5 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/clip_by_norm_no_div_square_sum_fusion.cc @@ -21,7 +21,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.h b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.h index 2a8416559..b38f89c76 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.h +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.h @@ -20,7 +20,7 @@ #include #include #include "ir/anf.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc index 8e38c3cc2..550301dc1 100644 --- a/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc +++ b/mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/lamb_update_with_lr_rule_fusion.cc @@ -21,7 +21,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc b/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc index 3513c216e..236535ef3 100644 --- a/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc +++ b/mindspore/ccsrc/backend/optimizer/common/common_backend_optimization.cc @@ -23,7 +23,7 @@ #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 "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/common/helper.cc b/mindspore/ccsrc/backend/optimizer/common/helper.cc index 695e18009..0c4585155 100644 --- a/mindspore/ccsrc/backend/optimizer/common/helper.cc +++ b/mindspore/ccsrc/backend/optimizer/common/helper.cc @@ -26,9 +26,9 @@ #include "base/base_ref.h" #include "backend/session/anf_runtime_algorithm.h" #include "frontend/operator/ops.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "runtime/device/kernel_info.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/common/helper.h b/mindspore/ccsrc/backend/optimizer/common/helper.h index 1e5f3ef93..16bdeb79f 100644 --- a/mindspore/ccsrc/backend/optimizer/common/helper.h +++ b/mindspore/ccsrc/backend/optimizer/common/helper.h @@ -24,7 +24,7 @@ #include #include "ir/func_graph.h" #include "backend/session/kernel_graph.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/optimizer/common/pattern_engine.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/common/optimizer.h b/mindspore/ccsrc/backend/optimizer/common/optimizer.h index 86822e354..9277d19d6 100644 --- a/mindspore/ccsrc/backend/optimizer/common/optimizer.h +++ b/mindspore/ccsrc/backend/optimizer/common/optimizer.h @@ -27,7 +27,7 @@ #include "backend/optimizer/common/pass_manager.h" #include "backend/optimizer/common/pattern_engine.h" #include "ir/graph_utils.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/optimizer/common/helper.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/common/pass_manager.cc b/mindspore/ccsrc/backend/optimizer/common/pass_manager.cc index f9f41237e..a0f03e85a 100644 --- a/mindspore/ccsrc/backend/optimizer/common/pass_manager.cc +++ b/mindspore/ccsrc/backend/optimizer/common/pass_manager.cc @@ -25,7 +25,7 @@ #include "ir/func_graph.h" #include "ir/manager.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "debug/anf_ir_dump.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc index 50c67af94..990a9d9c2 100644 --- a/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc +++ b/mindspore/ccsrc/backend/optimizer/mem_reuse/mem_dynamic_allocator.cc @@ -15,7 +15,7 @@ */ #include "backend/optimizer/mem_reuse/mem_dynamic_allocator.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.h b/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.h index 2fda84fa8..5f6b65937 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.h +++ b/mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.h @@ -19,7 +19,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc b/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc index 51d399bbc..7d4b54b23 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc @@ -18,7 +18,7 @@ #include #include "backend/session/anf_runtime_algorithm.h" #include "ir/primitive.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/utils.h" #include "abstract/abstract_value.h" #include "backend/optimizer/common/helper.h" diff --git a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc index f2e35351b..2c24687c9 100644 --- a/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc +++ b/mindspore/ccsrc/backend/optimizer/pass/convert_const_input_to_attr.cc @@ -23,7 +23,7 @@ #include "backend/optimizer/pass/const_input_to_attr_registry.h" #include "backend/optimizer/common/helper.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "frontend/operator/ops.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/kernel_compiler/common_utils.h" diff --git a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc index 771c0d014..e260f7011 100644 --- a/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc +++ b/mindspore/ccsrc/backend/session/anf_runtime_algorithm.cc @@ -27,7 +27,7 @@ #include "backend/optimizer/common/helper.h" #include "backend/kernel_compiler/kernel.h" #include "backend/kernel_compiler/kernel_build_info.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "common/trans.h" namespace mindspore { diff --git a/mindspore/ccsrc/backend/session/ascend_control_parser.cc b/mindspore/ccsrc/backend/session/ascend_control_parser.cc index 48a6a2325..81516d948 100644 --- a/mindspore/ccsrc/backend/session/ascend_control_parser.cc +++ b/mindspore/ccsrc/backend/session/ascend_control_parser.cc @@ -22,7 +22,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "utils/union_find_set.h" #include "runtime/device/ascend/ascend_label_assign.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "debug/anf_ir_dump.h" static constexpr size_t kCNodePrim = 0; diff --git a/mindspore/ccsrc/backend/session/ascend_inference_session.cc b/mindspore/ccsrc/backend/session/ascend_inference_session.cc index ef796ff4f..67eae6fba 100644 --- a/mindspore/ccsrc/backend/session/ascend_inference_session.cc +++ b/mindspore/ccsrc/backend/session/ascend_inference_session.cc @@ -22,7 +22,7 @@ #include "ir/param_value.h" #include "runtime/device/kernel_runtime.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "common/trans.h" #include "utils/config_manager.h" #include "utils/base_ref_extends.h" diff --git a/mindspore/ccsrc/backend/session/ascend_session.cc b/mindspore/ccsrc/backend/session/ascend_session.cc index 027abdea0..59fc84675 100644 --- a/mindspore/ccsrc/backend/session/ascend_session.cc +++ b/mindspore/ccsrc/backend/session/ascend_session.cc @@ -39,7 +39,7 @@ #include "debug/anf_ir_dump.h" #include "debug/anf_ir_utils.h" #include "debug/draw.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/optimizer/common/helper.h" #include "runtime/device/kernel_runtime_manager.h" #include "utils/config_manager.h" diff --git a/mindspore/ccsrc/backend/session/cpu_session.cc b/mindspore/ccsrc/backend/session/cpu_session.cc index 743a17b45..4ba62e53b 100644 --- a/mindspore/ccsrc/backend/session/cpu_session.cc +++ b/mindspore/ccsrc/backend/session/cpu_session.cc @@ -20,7 +20,7 @@ #include "ir/tensor.h" #include "ir/anf.h" #include "backend/kernel_compiler/kernel.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_runtime.h" #include "backend/kernel_compiler/cpu/cpu_kernel_factory.h" diff --git a/mindspore/ccsrc/backend/session/gpu_session.cc b/mindspore/ccsrc/backend/session/gpu_session.cc index 77d229275..6e720babc 100644 --- a/mindspore/ccsrc/backend/session/gpu_session.cc +++ b/mindspore/ccsrc/backend/session/gpu_session.cc @@ -31,9 +31,9 @@ #include "backend/optimizer/gpu/replace_momentum_cast_fusion.h" #include "backend/optimizer/gpu/replace_addn_fusion.h" #include "runtime/device/kernel_runtime_manager.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "common/trans.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/base_ref_extends.h" #include "debug/tensor_load.h" diff --git a/mindspore/ccsrc/backend/session/infer_session.cc b/mindspore/ccsrc/backend/session/infer_session.cc index cec532fc8..7fa41905d 100644 --- a/mindspore/ccsrc/backend/session/infer_session.cc +++ b/mindspore/ccsrc/backend/session/infer_session.cc @@ -23,9 +23,10 @@ #include "backend/session/session_factory.h" #include "base/base_ref_utils.h" #include "backend/kernel_compiler/oplib/oplib.h" +#include "utils/context/context_extends.h" #ifdef ENABLE_D -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #endif using std::string; @@ -223,7 +224,7 @@ Status MSInferSession::FinalizeEnv() { MS_LOG(ERROR) << "Get Context failed!"; return FAILED; } - if (!ms_context->CloseTsd()) { + if (!context::CloseTsd(ms_context)) { MS_LOG(ERROR) << "Inference CloseTsd failed!"; return FAILED; } @@ -330,6 +331,10 @@ string MSInferSession::AjustTargetName(const std::string &device) { Status MSInferSession::InitEnv(const std::string &device, uint32_t device_id) { RegAllOp(); auto ms_context = MsContext::GetInstance(); + if (ms_context == nullptr) { + MS_LOG(ERROR) << "Get Context failed!"; + return FAILED; + } ms_context->set_execution_mode(kGraphMode); ms_context->set_device_id(device_id); auto ajust_device = AjustTargetName(device); @@ -343,11 +348,7 @@ Status MSInferSession::InitEnv(const std::string &device, uint32_t device_id) { return FAILED; } session_impl_->Init(device_id); - if (ms_context == nullptr) { - MS_LOG(ERROR) << "Get Context failed!"; - return FAILED; - } - if (!ms_context->OpenTsd()) { + if (!context::OpenTsd(ms_context)) { MS_LOG(ERROR) << "Session init OpenTsd failed!"; return FAILED; } diff --git a/mindspore/ccsrc/backend/session/session_basic.cc b/mindspore/ccsrc/backend/session/session_basic.cc index 21ff3180e..eb2147069 100644 --- a/mindspore/ccsrc/backend/session/session_basic.cc +++ b/mindspore/ccsrc/backend/session/session_basic.cc @@ -30,7 +30,7 @@ #include "backend/optimizer/common/common_backend_optimization.h" #include "backend/optimizer/pass/const_input_to_attr_registry.h" #include "backend/optimizer/common/helper.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "ir/dtype.h" #include "ir/anf.h" #include "ir/func_graph_cloner.h" diff --git a/mindspore/ccsrc/backend/session/session_basic.h b/mindspore/ccsrc/backend/session/session_basic.h index 5f3a0cab9..3e9296c5d 100755 --- a/mindspore/ccsrc/backend/session/session_basic.h +++ b/mindspore/ccsrc/backend/session/session_basic.h @@ -32,7 +32,7 @@ #include "utils/contract.h" #include "pipeline/pynative/pynative_execute.h" #include "runtime/device/kernel_info.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #ifdef ENABLE_DEBUGGER #include "debug/debugger/debugger.h" #endif diff --git a/mindspore/ccsrc/backend/session/session_context.h b/mindspore/ccsrc/backend/session/session_context.h index 2148d1b35..6acb3ae18 100644 --- a/mindspore/ccsrc/backend/session/session_context.h +++ b/mindspore/ccsrc/backend/session/session_context.h @@ -24,7 +24,7 @@ #include "ir/tensor.h" #include "pipeline/jit/resource.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace session { const char kInputCtrlTensors[] = "input_ctrl_tensors"; diff --git a/mindspore/ccsrc/backend/session/session_factory.h b/mindspore/ccsrc/backend/session/session_factory.h index a5a7dfd24..6e4833fc2 100644 --- a/mindspore/ccsrc/backend/session/session_factory.h +++ b/mindspore/ccsrc/backend/session/session_factory.h @@ -21,7 +21,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/session/session_basic.h" namespace mindspore { namespace session { diff --git a/mindspore/ccsrc/common/trans.cc b/mindspore/ccsrc/common/trans.cc index 1841826ca..1b10a7d2f 100644 --- a/mindspore/ccsrc/common/trans.cc +++ b/mindspore/ccsrc/common/trans.cc @@ -17,7 +17,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/kernel_compiler/kernel.h" #include "runtime/device/convert_tensor_utils.h" diff --git a/mindspore/ccsrc/debug/anf_ir_utils.cc b/mindspore/ccsrc/debug/anf_ir_utils.cc index 7d4380c4d..261e811c9 100644 --- a/mindspore/ccsrc/debug/anf_ir_utils.cc +++ b/mindspore/ccsrc/debug/anf_ir_utils.cc @@ -37,7 +37,7 @@ #include "utils/utils.h" #include "debug/trace.h" #include "utils/label.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "frontend/operator/ops.h" using mindspore::tensor::TensorPy; diff --git a/mindspore/ccsrc/debug/common.cc b/mindspore/ccsrc/debug/common.cc index a75b99582..1683a3f80 100644 --- a/mindspore/ccsrc/debug/common.cc +++ b/mindspore/ccsrc/debug/common.cc @@ -21,7 +21,7 @@ #include "utils/system/env.h" #include "utils/system/file_system.h" #include "utils/log_adapter.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { std::optional Common::GetRealPath(const std::string &input_path) { diff --git a/mindspore/ccsrc/debug/data_dump_parser.cc b/mindspore/ccsrc/debug/data_dump_parser.cc index ce7f955d4..abe9938ed 100644 --- a/mindspore/ccsrc/debug/data_dump_parser.cc +++ b/mindspore/ccsrc/debug/data_dump_parser.cc @@ -17,7 +17,7 @@ #include "debug/data_dump_parser.h" #include -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "debug/common.h" static constexpr auto kDataDumpConfigPtah = "DATA_DUMP_CONFIG_PATH"; diff --git a/mindspore/ccsrc/debug/data_dump_parser.h b/mindspore/ccsrc/debug/data_dump_parser.h index d811bd9f0..95a730fff 100644 --- a/mindspore/ccsrc/debug/data_dump_parser.h +++ b/mindspore/ccsrc/debug/data_dump_parser.h @@ -22,7 +22,7 @@ #include #include #include "nlohmann/json.hpp" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { class DataDumpParser { diff --git a/mindspore/ccsrc/debug/draw.cc b/mindspore/ccsrc/debug/draw.cc index 09ded5118..bf16fbf53 100644 --- a/mindspore/ccsrc/debug/draw.cc +++ b/mindspore/ccsrc/debug/draw.cc @@ -643,5 +643,13 @@ void ModelDigraph::Edge(AnfNodePtr start, AnfNodePtr end, int idx, int id_start) buffer_ << "[arrowhead=vee,"; buffer_ << "]" << std::endl; } + +struct DrawerRegister { + DrawerRegister() { + FuncGraph::set_drawer( + [](const std::string &filename, const FuncGraphPtr &func_graph) { Draw(filename, func_graph); }); + } + ~DrawerRegister() = default; +} drawer_regsiter; } // namespace draw } // namespace mindspore diff --git a/mindspore/ccsrc/debug/e2e_dump.cc b/mindspore/ccsrc/debug/e2e_dump.cc index 9037a6d00..147582a36 100644 --- a/mindspore/ccsrc/debug/e2e_dump.cc +++ b/mindspore/ccsrc/debug/e2e_dump.cc @@ -23,7 +23,7 @@ #include "utils/system/file_system.h" #include "utils/system/env.h" #include "utils/convert_utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "debug/common.h" using json = nlohmann::json; diff --git a/mindspore/ccsrc/frontend/operator/cc_implementations.cc b/mindspore/ccsrc/frontend/operator/cc_implementations.cc index 3ec3455be..2df68037e 100644 --- a/mindspore/ccsrc/frontend/operator/cc_implementations.cc +++ b/mindspore/ccsrc/frontend/operator/cc_implementations.cc @@ -23,7 +23,7 @@ #include "utils/misc.h" #include "utils/log_adapter.h" #include "utils/convert_utils.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { // namespace to support primitive operators definition diff --git a/mindspore/ccsrc/frontend/operator/composite/do_signature.h b/mindspore/ccsrc/frontend/operator/composite/do_signature.h index 7b060aecf..33ef78e27 100644 --- a/mindspore/ccsrc/frontend/operator/composite/do_signature.h +++ b/mindspore/ccsrc/frontend/operator/composite/do_signature.h @@ -30,7 +30,7 @@ #include "utils/any.h" #include "ir/dtype.h" #include "ir/meta_func_graph.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { // namespace to support composite operators definition diff --git a/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc b/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc index 28d3119bd..e9418bb5d 100644 --- a/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc +++ b/mindspore/ccsrc/frontend/operator/composite/multitype_funcgraph.cc @@ -30,7 +30,7 @@ #include "abstract/param_validator.h" #include "frontend/operator/cc_implementations.h" #include "frontend/optimizer/opt.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/symbolic.h" #include "pybind_api/api_register.h" #include "./common.h" diff --git a/mindspore/ccsrc/frontend/operator/composite/unpack_call.h b/mindspore/ccsrc/frontend/operator/composite/unpack_call.h index 1867a37d9..5a5016f93 100644 --- a/mindspore/ccsrc/frontend/operator/composite/unpack_call.h +++ b/mindspore/ccsrc/frontend/operator/composite/unpack_call.h @@ -30,7 +30,7 @@ #include "utils/any.h" #include "ir/dtype.h" #include "ir/meta_func_graph.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { // namespace to support composite operators definition diff --git a/mindspore/ccsrc/frontend/operator/prim_maths.cc b/mindspore/ccsrc/frontend/operator/prim_maths.cc index e4543a382..5d06fb860 100644 --- a/mindspore/ccsrc/frontend/operator/prim_maths.cc +++ b/mindspore/ccsrc/frontend/operator/prim_maths.cc @@ -18,7 +18,7 @@ #include "frontend/operator/ops.h" #include "abstract/utils.h" #include "abstract/param_validator.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/frontend/operator/prim_others.cc b/mindspore/ccsrc/frontend/operator/prim_others.cc index 0810222e4..097cdbf27 100644 --- a/mindspore/ccsrc/frontend/operator/prim_others.cc +++ b/mindspore/ccsrc/frontend/operator/prim_others.cc @@ -18,12 +18,12 @@ #include #include "ir/dtype.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/operator/ops.h" #include "abstract/param_validator.h" #include "pipeline/jit/static_analysis/prim.h" #include "abstract/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/symbolic.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc index ac792e41b..d4fe20171 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/dfunctor.cc @@ -32,7 +32,7 @@ #include "frontend/operator/ops.h" #include "frontend/operator/composite/composite.h" #include "utils/symbolic.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "./common.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/optimizer/ad/grad.cc b/mindspore/ccsrc/frontend/optimizer/ad/grad.cc index f8ab08acc..b11d063db 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/grad.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/grad.cc @@ -17,7 +17,7 @@ #include "frontend/optimizer/ad/grad.h" #include "frontend/optimizer/ad/dfunctor.h" #include "ir/func_graph_cloner.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/symbolic.h" #include "ir/graph_utils.h" diff --git a/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc b/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc index 59b661740..4380d1628 100644 --- a/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc +++ b/mindspore/ccsrc/frontend/optimizer/ad/kprim.cc @@ -32,7 +32,7 @@ #include "frontend/operator/composite/composite.h" #include "utils/symbolic.h" #include "utils/primitive_utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/info.h" #include "debug/trace.h" diff --git a/mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.h b/mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.h index 2018341d5..aefd6d73b 100644 --- a/mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.h +++ b/mindspore/ccsrc/frontend/optimizer/irpass/gradient_eliminate.h @@ -24,7 +24,7 @@ #include "frontend/optimizer/optimizer.h" #include "frontend/optimizer/irpass.h" #include "frontend/optimizer/anf_visitor.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/operator/ops.h" #include "frontend/optimizer/ad/grad.h" diff --git a/mindspore/ccsrc/frontend/optimizer/optimizer.h b/mindspore/ccsrc/frontend/optimizer/optimizer.h index eead05241..bc6018158 100644 --- a/mindspore/ccsrc/frontend/optimizer/optimizer.h +++ b/mindspore/ccsrc/frontend/optimizer/optimizer.h @@ -34,7 +34,7 @@ #include "frontend/optimizer/opt.h" #include "pipeline/jit/resource.h" #include "pipeline/jit/action.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace opt { diff --git a/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h index 3168b433d..1bb619264 100644 --- a/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h +++ b/mindspore/ccsrc/frontend/optimizer/py_pass_manager.h @@ -25,7 +25,7 @@ #include "ir/func_graph.h" #include "utils/primitive_py.h" #include "ir/graph_utils.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "pipeline/jit/parse/resolve.h" #include "frontend/optimizer/pattern.h" diff --git a/mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.h index d67b7e714..9a0902138 100644 --- a/mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/edge_costmodel.h @@ -22,7 +22,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/parallel/auto_parallel/costmodel.h" #include "frontend/parallel/ops_info/operator_info.h" #include "frontend/parallel/tensor_layout/tensor_info.h" diff --git a/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h b/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h index 5ef979f4d..116d188c0 100644 --- a/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h +++ b/mindspore/ccsrc/frontend/parallel/auto_parallel/graph_costmodel.h @@ -23,7 +23,7 @@ #include #include #include "mindspore/ccsrc/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/parallel/auto_parallel/edge_costmodel.h" #include "frontend/parallel/costmodel_context.h" #include "frontend/parallel/ops_info/operator_info.h" @@ -31,25 +31,6 @@ namespace mindspore { namespace parallel { -#define OPERATOR_TO_OPERATOR_CONNECTOR "-" -#define DEFAULT_DEVICE_MEMORY_CAPACITY (1024.0 * 1024.0 * 1024.0 * 16.0) -#define DEFAULT_COST_MODEL_ALPHA 1.0 -#define DEFAULT_COST_MODEL_BETA_ASCEND 400.0 // for 'device_target = Ascend' -#define DEFAULT_COST_MODEL_BETA_GPU 50.0 // for 'device_target = GPU' -#define DEFAULT_COST_MODEL_GAMMA 0.001 -#define DEFAULT_COST_MODEL_SIMPLIFY_CALCULATION true -#define DEFAULT_COST_MODEL_COMMUNI_THRESHOLD 2048.0 -#define DEFAULT_COST_MODEL_COMMUNI_CONST 3072.0 -#define DEFAULT_COST_MODEL_COMMUNI_BIAS 1024.0 -#define DEFAULT_TENSOR_SLICE_ALIGNMENT_ENABLE false -#define DEFAULT_TENSOR_SLICE_ALIGNMENT_SIZE 16 -#define DEFAULT_FULLY_USE_DEVICES true -#define DEFAULT_ELEMENTWISE_OP_STRA_FOLLOW false -#define DEFAULT_IS_MULTI_SUBGRAPHS false -#define DEFAULT_RUN_PHASE 0 -#define TRAINING_PHASE 0 -#define INFERENCE_PHASE 1 - class CostGraph; using CostGraphPtr = std::shared_ptr; extern CostGraphPtr entire_costgraph; diff --git a/mindspore/ccsrc/frontend/parallel/context.cc b/mindspore/ccsrc/frontend/parallel/context.cc index dc5828911..24c6823a1 100644 --- a/mindspore/ccsrc/frontend/parallel/context.cc +++ b/mindspore/ccsrc/frontend/parallel/context.cc @@ -24,7 +24,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/parallel/device_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/parallel/costmodel_context.cc b/mindspore/ccsrc/frontend/parallel/costmodel_context.cc index 9bd7a62e5..536895c8d 100644 --- a/mindspore/ccsrc/frontend/parallel/costmodel_context.cc +++ b/mindspore/ccsrc/frontend/parallel/costmodel_context.cc @@ -19,8 +19,7 @@ #include #include "frontend/parallel/allreduce_fusion/allreduce_fusion.h" -#include "frontend/parallel/auto_parallel/graph_costmodel.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace parallel { @@ -135,5 +134,14 @@ void CostModelContext::set_elementwise_stra_follow(bool elementwise_follow) { } void CostModelContext::set_run_phase(int32_t phase) { run_phase_ = phase; } + +struct CostRegister { + CostRegister() { + MsContext::device_seter([](const std::string &device_target) { + CostModelContext::GetInstance()->set_costmodel_context_for_device(device_target); + }); + } + ~CostRegister() = default; +} cost_regsiter; } // namespace parallel } // namespace mindspore diff --git a/mindspore/ccsrc/frontend/parallel/costmodel_context.h b/mindspore/ccsrc/frontend/parallel/costmodel_context.h index 9a9b6b7fd..b1668e13e 100644 --- a/mindspore/ccsrc/frontend/parallel/costmodel_context.h +++ b/mindspore/ccsrc/frontend/parallel/costmodel_context.h @@ -22,9 +22,28 @@ #include #include "utils/log_adapter.h" +#include "utils/ms_context.h" namespace mindspore { namespace parallel { +#define OPERATOR_TO_OPERATOR_CONNECTOR "-" +#define DEFAULT_DEVICE_MEMORY_CAPACITY (1024.0 * 1024.0 * 1024.0 * 16.0) +#define DEFAULT_COST_MODEL_ALPHA 1.0 +#define DEFAULT_COST_MODEL_BETA_ASCEND 400.0 // for 'device_target = Ascend' +#define DEFAULT_COST_MODEL_BETA_GPU 50.0 // for 'device_target = GPU' +#define DEFAULT_COST_MODEL_GAMMA 0.001 +#define DEFAULT_COST_MODEL_SIMPLIFY_CALCULATION true +#define DEFAULT_COST_MODEL_COMMUNI_THRESHOLD 2048.0 +#define DEFAULT_COST_MODEL_COMMUNI_CONST 3072.0 +#define DEFAULT_COST_MODEL_COMMUNI_BIAS 1024.0 +#define DEFAULT_TENSOR_SLICE_ALIGNMENT_ENABLE false +#define DEFAULT_TENSOR_SLICE_ALIGNMENT_SIZE 16 +#define DEFAULT_FULLY_USE_DEVICES true +#define DEFAULT_ELEMENTWISE_OP_STRA_FOLLOW false +#define DEFAULT_IS_MULTI_SUBGRAPHS false +#define DEFAULT_RUN_PHASE 0 +#define TRAINING_PHASE 0 +#define INFERENCE_PHASE 1 class CostModelContext { public: ~CostModelContext() = default; diff --git a/mindspore/ccsrc/frontend/parallel/device_manager.h b/mindspore/ccsrc/frontend/parallel/device_manager.h index bf8ba03fc..3023f4a35 100644 --- a/mindspore/ccsrc/frontend/parallel/device_manager.h +++ b/mindspore/ccsrc/frontend/parallel/device_manager.h @@ -25,7 +25,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/parallel/device.h" #include "frontend/parallel/device_matrix.h" #include "frontend/parallel/group_manager.h" diff --git a/mindspore/ccsrc/frontend/parallel/graph_util/get_parallel_info.cc b/mindspore/ccsrc/frontend/parallel/graph_util/get_parallel_info.cc index df83500e3..fba348229 100644 --- a/mindspore/ccsrc/frontend/parallel/graph_util/get_parallel_info.cc +++ b/mindspore/ccsrc/frontend/parallel/graph_util/get_parallel_info.cc @@ -21,7 +21,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "ir/func_graph.h" #include "frontend/parallel/ops_info/operator_info.h" #include "frontend/parallel/graph_util/graph_info.h" diff --git a/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc b/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc index d7c346e6e..0121c70d4 100644 --- a/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc +++ b/mindspore/ccsrc/frontend/parallel/graph_util/graph_info.cc @@ -19,7 +19,7 @@ #include "debug/anf_ir_utils.h" #include "debug/draw.h" #include "ir/func_graph.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "ir/graph_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.h index 3a5c86a01..1ff327647 100644 --- a/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/matmul_info.h @@ -22,7 +22,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "ir/value.h" #include "frontend/parallel/auto_parallel/operator_costmodel.h" #include "frontend/parallel/ops_info/operator_info.h" diff --git a/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.cc b/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.cc index 4f69a9a0a..420e7f9f9 100644 --- a/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.cc +++ b/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.cc @@ -30,7 +30,7 @@ #include "frontend/parallel/auto_parallel/edge_costmodel.h" #include "frontend/parallel/auto_parallel/graph_costmodel.h" #include "frontend/parallel/context.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.h b/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.h index 3aceee2e3..7801482c5 100644 --- a/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.h +++ b/mindspore/ccsrc/frontend/parallel/ops_info/operator_info.h @@ -25,7 +25,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "base/base.h" #include "frontend/parallel/auto_parallel/costmodel.h" #include "frontend/parallel/auto_parallel/operator_costmodel.h" diff --git a/mindspore/ccsrc/frontend/parallel/ps/parameter_server.h b/mindspore/ccsrc/frontend/parallel/ps/parameter_server.h index 674490db3..6eedbd76b 100644 --- a/mindspore/ccsrc/frontend/parallel/ps/parameter_server.h +++ b/mindspore/ccsrc/frontend/parallel/ps/parameter_server.h @@ -38,7 +38,7 @@ #include "frontend/parallel/ps/optimizer_info_builder.h" #include "frontend/parallel/ps/util.h" #include "runtime/device/cpu/kernel_select_cpu.h" -#include "utils/context/ms_context.h" +#include "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" diff --git a/mindspore/ccsrc/frontend/parallel/ps/util.cc b/mindspore/ccsrc/frontend/parallel/ps/util.cc index f7ecbb8a5..1bda9c132 100644 --- a/mindspore/ccsrc/frontend/parallel/ps/util.cc +++ b/mindspore/ccsrc/frontend/parallel/ps/util.cc @@ -17,7 +17,7 @@ #include "frontend/parallel/ps/util.h" #include #include "frontend/parallel/ps/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace parallel { diff --git a/mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc b/mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc index ac1189c3a..0a8852464 100644 --- a/mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc +++ b/mindspore/ccsrc/frontend/parallel/strategy_checkpoint/parallel_strategy_checkpoint.cc @@ -20,7 +20,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/convert_utils.h" #include "utils/log_adapter.h" #include "proto/node_strategy.pb.h" diff --git a/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.cc index 1ff190094..565750b94 100644 --- a/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.cc @@ -18,7 +18,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/parallel/status.h" #include "frontend/parallel/tensor_layout/shape_util.h" #include "utils/convert_utils.h" diff --git a/mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.cc index d5d34a484..a53235e20 100644 --- a/mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/layout_transfer.cc @@ -15,7 +15,7 @@ */ #include "frontend/parallel/tensor_layout/layout_transfer.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/parallel/status.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/parallel/tensor_layout/map.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/map.cc index 69ae7bb23..b6c6904d4 100644 --- a/mindspore/ccsrc/frontend/parallel/tensor_layout/map.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/map.cc @@ -18,7 +18,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/parallel/status.h" #include "frontend/parallel/tensor_layout/shape_util.h" #include "utils/convert_utils.h" diff --git a/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.cc index 28a5fa5bc..203b4f995 100644 --- a/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_layout.cc @@ -17,7 +17,7 @@ #include "frontend/parallel/tensor_layout/tensor_layout.h" #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "ir/value.h" #include "frontend/parallel/device_matrix.h" #include "frontend/parallel/status.h" diff --git a/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.cc b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.cc index 43bb33078..87d385c81 100644 --- a/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.cc +++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/tensor_redistribution.cc @@ -18,7 +18,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "frontend/parallel/status.h" #include "frontend/parallel/tensor_layout/shape_util.h" diff --git a/mindspore/ccsrc/minddata/dataset/api/de_pipeline.cc b/mindspore/ccsrc/minddata/dataset/api/de_pipeline.cc index 7ad84238f..ce4137c1d 100644 --- a/mindspore/ccsrc/minddata/dataset/api/de_pipeline.cc +++ b/mindspore/ccsrc/minddata/dataset/api/de_pipeline.cc @@ -19,7 +19,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/tensor.h" #include "minddata/dataset/engine/cache/cache_client.h" #include "minddata/dataset/engine/dataset_iterator.h" diff --git a/mindspore/ccsrc/minddata/dataset/core/tensor.cc b/mindspore/ccsrc/minddata/dataset/core/tensor.cc index cd7e6dd75..fd81a90b4 100644 --- a/mindspore/ccsrc/minddata/dataset/core/tensor.cc +++ b/mindspore/ccsrc/minddata/dataset/core/tensor.cc @@ -24,7 +24,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/constants.h" #include "minddata/dataset/core/cv_tensor.h" #include "minddata/dataset/core/global_context.h" diff --git a/mindspore/ccsrc/minddata/dataset/core/tensor.h b/mindspore/ccsrc/minddata/dataset/core/tensor.h index ff5804655..25e896e4a 100644 --- a/mindspore/ccsrc/minddata/dataset/core/tensor.h +++ b/mindspore/ccsrc/minddata/dataset/core/tensor.h @@ -33,7 +33,7 @@ #include "pybind11/stl.h" #endif -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/constants.h" #include "minddata/dataset/core/data_type.h" #include "minddata/dataset/core/tensor_shape.h" diff --git a/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc b/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc index ff40062d3..19c3a6b45 100644 --- a/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc +++ b/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc @@ -19,7 +19,7 @@ #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/log_adapter.h" #include "minddata/dataset/core/constants.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc b/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc index 50d910251..6db8ec561 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc @@ -23,7 +23,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/status.h" #include "minddata/dataset/core/tensor_shape.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc index 20a61a564..aed3f0e86 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/batch_op.cc @@ -18,7 +18,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #ifdef ENABLE_PYTHON #include "minddata/dataset/core/pybind_support.h" #endif diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc index a01a9cc87..f3847fe72 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/concat_op.cc @@ -16,7 +16,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/engine/data_buffer.h" #include "minddata/dataset/engine/datasetops/concat_op.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.cc index b06fcdb55..6415557a2 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/cifar_op.cc @@ -20,7 +20,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/tensor_shape.h" #include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.cc index dac2f8f57..86301ea67 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/coco_op.cc @@ -18,7 +18,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/tensor_shape.h" #include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc index 9a3bbccdc..ddf7cc289 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/image_folder_op.cc @@ -16,7 +16,7 @@ #include "minddata/dataset/engine/datasetops/source/image_folder_op.h" #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/tensor_shape.h" #include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc index 7982c63d1..a88e69c27 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/manifest_op.cc @@ -20,7 +20,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/tensor_shape.h" #include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.cc index 2af425994..5453e18aa 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mindrecord_op.cc @@ -21,7 +21,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/constants.h" #include "minddata/dataset/core/global_context.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc index b3c52be60..a32a36afc 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/mnist_op.cc @@ -17,7 +17,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/tensor_shape.h" #include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.cc index 104d7919c..d8706f1c6 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/text_file_op.cc @@ -21,7 +21,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/engine/datasetops/source/text_file_op.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/util/task_manager.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.cc index f0d40a9ba..85c062424 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/tf_reader_op.cc @@ -27,7 +27,7 @@ #include "proto/example.pb.h" #include "./securec.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/global_context.h" #include "minddata/dataset/engine/connector.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.cc index bb48d5e41..ccc6dbfa4 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/source/voc_op.cc @@ -19,7 +19,7 @@ #include #include #include "./tinyxml2.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/core/tensor_shape.h" #include "minddata/dataset/engine/datasetops/source/sampler/sequential_sampler.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc b/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc index dfd4f254e..eb7a7e91d 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/datasetops/take_op.cc @@ -16,7 +16,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/config_manager.h" #include "minddata/dataset/engine/data_buffer.h" #include "minddata/dataset/engine/datasetops/take_op.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc b/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc index f5c018c03..4fdc6174a 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc @@ -17,7 +17,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/path.h" #include "minddata/dataset/engine/perf/monitor.h" #include "minddata/dataset/engine/perf/device_queue_tracing.h" diff --git a/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc b/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc index d04f5a08d..dd57fa7ea 100644 --- a/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc +++ b/mindspore/ccsrc/minddata/dataset/engine/tdt/tdt_plugin.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "minddata/dataset/engine/tdt/tdt_plugin.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/log_adapter.h" #include "minddata/dataset/engine/perf/profiling.h" diff --git a/mindspore/ccsrc/minddata/dataset/include/tensor.h b/mindspore/ccsrc/minddata/dataset/include/tensor.h index ff5804655..25e896e4a 100644 --- a/mindspore/ccsrc/minddata/dataset/include/tensor.h +++ b/mindspore/ccsrc/minddata/dataset/include/tensor.h @@ -33,7 +33,7 @@ #include "pybind11/stl.h" #endif -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/constants.h" #include "minddata/dataset/core/data_type.h" #include "minddata/dataset/core/tensor_shape.h" diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.cc index e33937b68..a27b2cb00 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/center_crop_op.cc @@ -15,7 +15,7 @@ */ #include "minddata/dataset/kernels/image/center_crop_op.h" #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/cv_tensor.h" #include "minddata/dataset/kernels/image/image_utils.h" #include "minddata/dataset/util/status.h" diff --git a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc index 013e3482e..86de12597 100644 --- a/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc +++ b/mindspore/ccsrc/minddata/dataset/kernels/image/image_utils.cc @@ -20,7 +20,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/constants.h" #include "minddata/dataset/core/cv_tensor.h" #include "minddata/dataset/core/tensor.h" diff --git a/mindspore/ccsrc/minddata/dataset/text/kernels/sentence_piece_tokenizer_op.cc b/mindspore/ccsrc/minddata/dataset/text/kernels/sentence_piece_tokenizer_op.cc index ba90da010..919f10823 100644 --- a/mindspore/ccsrc/minddata/dataset/text/kernels/sentence_piece_tokenizer_op.cc +++ b/mindspore/ccsrc/minddata/dataset/text/kernels/sentence_piece_tokenizer_op.cc @@ -18,7 +18,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/path.h" namespace mindspore { diff --git a/mindspore/ccsrc/minddata/dataset/text/sentence_piece_vocab.cc b/mindspore/ccsrc/minddata/dataset/text/sentence_piece_vocab.cc index 7d2179435..d9935112f 100644 --- a/mindspore/ccsrc/minddata/dataset/text/sentence_piece_vocab.cc +++ b/mindspore/ccsrc/minddata/dataset/text/sentence_piece_vocab.cc @@ -20,7 +20,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/path.h" namespace mindspore { diff --git a/mindspore/ccsrc/minddata/dataset/util/cache_pool.cc b/mindspore/ccsrc/minddata/dataset/util/cache_pool.cc index 22fb72eb8..37c6107fb 100644 --- a/mindspore/ccsrc/minddata/dataset/util/cache_pool.cc +++ b/mindspore/ccsrc/minddata/dataset/util/cache_pool.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/cache_pool.h" #include "minddata/dataset/util/services.h" diff --git a/mindspore/ccsrc/minddata/dataset/util/intrp_service.cc b/mindspore/ccsrc/minddata/dataset/util/intrp_service.cc index a82c82cdc..80417ac2a 100644 --- a/mindspore/ccsrc/minddata/dataset/util/intrp_service.cc +++ b/mindspore/ccsrc/minddata/dataset/util/intrp_service.cc @@ -15,7 +15,7 @@ */ #include "minddata/dataset/util/intrp_service.h" #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/services.h" #include "minddata/dataset/util/task_manager.h" diff --git a/mindspore/ccsrc/minddata/dataset/util/path.cc b/mindspore/ccsrc/minddata/dataset/util/path.cc index 8740ecb8e..97416be6a 100644 --- a/mindspore/ccsrc/minddata/dataset/util/path.cc +++ b/mindspore/ccsrc/minddata/dataset/util/path.cc @@ -22,7 +22,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/log_adapter.h" namespace mindspore { diff --git a/mindspore/ccsrc/minddata/dataset/util/queue.h b/mindspore/ccsrc/minddata/dataset/util/queue.h index 0cdb2c199..021ee5ab1 100644 --- a/mindspore/ccsrc/minddata/dataset/util/queue.h +++ b/mindspore/ccsrc/minddata/dataset/util/queue.h @@ -24,7 +24,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/log_adapter.h" #include "minddata/dataset/util/allocator.h" #include "minddata/dataset/util/services.h" diff --git a/mindspore/ccsrc/minddata/dataset/util/status.cc b/mindspore/ccsrc/minddata/dataset/util/status.cc index 3fc498b70..9d60bfe6a 100644 --- a/mindspore/ccsrc/minddata/dataset/util/status.cc +++ b/mindspore/ccsrc/minddata/dataset/util/status.cc @@ -15,7 +15,7 @@ */ #include "minddata/dataset/util/status.h" #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/task_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/minddata/dataset/util/storage_container.cc b/mindspore/ccsrc/minddata/dataset/util/storage_container.cc index 506495227..b64926e59 100644 --- a/mindspore/ccsrc/minddata/dataset/util/storage_container.cc +++ b/mindspore/ccsrc/minddata/dataset/util/storage_container.cc @@ -19,7 +19,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/path.h" #include "minddata/dataset/util/status.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/minddata/dataset/util/storage_manager.cc b/mindspore/ccsrc/minddata/dataset/util/storage_manager.cc index 2f85d00a4..82f39fd7a 100644 --- a/mindspore/ccsrc/minddata/dataset/util/storage_manager.cc +++ b/mindspore/ccsrc/minddata/dataset/util/storage_manager.cc @@ -19,7 +19,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/path.h" #include "minddata/dataset/util/services.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/minddata/dataset/util/task.cc b/mindspore/ccsrc/minddata/dataset/util/task.cc index 39d754e80..fb71e9337 100644 --- a/mindspore/ccsrc/minddata/dataset/util/task.cc +++ b/mindspore/ccsrc/minddata/dataset/util/task.cc @@ -14,7 +14,7 @@ * limitations under the License. */ #include "minddata/dataset/util/task.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/util/task_manager.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/minddata/mindrecord/common/shard_pybind.cc b/mindspore/ccsrc/minddata/mindrecord/common/shard_pybind.cc index f36182027..7c7f79ccf 100644 --- a/mindspore/ccsrc/minddata/mindrecord/common/shard_pybind.cc +++ b/mindspore/ccsrc/minddata/mindrecord/common/shard_pybind.cc @@ -16,7 +16,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/mindrecord/include/common/shard_utils.h" #include "minddata/mindrecord/include/shard_error.h" #include "minddata/mindrecord/include/shard_index_generator.h" diff --git a/mindspore/ccsrc/minddata/mindrecord/common/shard_utils.cc b/mindspore/ccsrc/minddata/mindrecord/common/shard_utils.cc index b5021802a..185f6cbb6 100644 --- a/mindspore/ccsrc/minddata/mindrecord/common/shard_utils.cc +++ b/mindspore/ccsrc/minddata/mindrecord/common/shard_utils.cc @@ -15,7 +15,7 @@ */ #include "minddata/mindrecord/include/common/shard_utils.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "./securec.h" using mindspore::LogStream; diff --git a/mindspore/ccsrc/minddata/mindrecord/io/shard_index_generator.cc b/mindspore/ccsrc/minddata/mindrecord/io/shard_index_generator.cc index 5b102c396..e2d624773 100644 --- a/mindspore/ccsrc/minddata/mindrecord/io/shard_index_generator.cc +++ b/mindspore/ccsrc/minddata/mindrecord/io/shard_index_generator.cc @@ -16,7 +16,7 @@ #include #include "minddata/mindrecord/include/shard_index_generator.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using mindspore::LogStream; using mindspore::ExceptionType::NoExceptionType; diff --git a/mindspore/ccsrc/minddata/mindrecord/io/shard_reader.cc b/mindspore/ccsrc/minddata/mindrecord/io/shard_reader.cc index 1df9c8e51..c42b73246 100644 --- a/mindspore/ccsrc/minddata/mindrecord/io/shard_reader.cc +++ b/mindspore/ccsrc/minddata/mindrecord/io/shard_reader.cc @@ -16,7 +16,7 @@ #include "minddata/mindrecord/include/shard_distributed_sample.h" #include "minddata/mindrecord/include/shard_reader.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using mindspore::LogStream; using mindspore::ExceptionType::NoExceptionType; diff --git a/mindspore/ccsrc/minddata/mindrecord/io/shard_segment.cc b/mindspore/ccsrc/minddata/mindrecord/io/shard_segment.cc index eda8924e1..a9a4a79cd 100644 --- a/mindspore/ccsrc/minddata/mindrecord/io/shard_segment.cc +++ b/mindspore/ccsrc/minddata/mindrecord/io/shard_segment.cc @@ -15,7 +15,7 @@ */ #include "minddata/mindrecord/include/shard_segment.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "./securec.h" #include "minddata/mindrecord/include/common/shard_utils.h" diff --git a/mindspore/ccsrc/minddata/mindrecord/io/shard_writer.cc b/mindspore/ccsrc/minddata/mindrecord/io/shard_writer.cc index 84b0c5b37..bf702180a 100644 --- a/mindspore/ccsrc/minddata/mindrecord/io/shard_writer.cc +++ b/mindspore/ccsrc/minddata/mindrecord/io/shard_writer.cc @@ -15,7 +15,7 @@ */ #include "minddata/mindrecord/include/shard_writer.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/mindrecord/include/common/shard_utils.h" #include "./securec.h" diff --git a/mindspore/ccsrc/minddata/mindrecord/meta/shard_column.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_column.cc index 4cc5e9f41..47e001e8f 100644 --- a/mindspore/ccsrc/minddata/mindrecord/meta/shard_column.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_column.cc @@ -16,7 +16,7 @@ #include "minddata/mindrecord/include/shard_column.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/mindrecord/include/common/shard_utils.h" #include "minddata/mindrecord/include/shard_error.h" diff --git a/mindspore/ccsrc/minddata/mindrecord/meta/shard_header.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_header.cc index f94f92d93..9f75d84e7 100644 --- a/mindspore/ccsrc/minddata/mindrecord/meta/shard_header.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_header.cc @@ -22,7 +22,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/mindrecord/include/shard_error.h" #include "minddata/mindrecord/include/shard_page.h" diff --git a/mindspore/ccsrc/minddata/mindrecord/meta/shard_schema.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_schema.cc index 093be9792..b9b26e33d 100644 --- a/mindspore/ccsrc/minddata/mindrecord/meta/shard_schema.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_schema.cc @@ -15,7 +15,7 @@ */ #include "minddata/mindrecord/include/shard_schema.h" -#include "common/utils.h" +#include "utils/ms_utils.h" using mindspore::LogStream; using mindspore::ExceptionType::NoExceptionType; diff --git a/mindspore/ccsrc/minddata/mindrecord/meta/shard_task.cc b/mindspore/ccsrc/minddata/mindrecord/meta/shard_task.cc index 6f8e440f9..972e3b2d1 100644 --- a/mindspore/ccsrc/minddata/mindrecord/meta/shard_task.cc +++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_task.cc @@ -15,7 +15,7 @@ */ #include "minddata/mindrecord/include/shard_task.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/mindrecord/include/common/shard_utils.h" using mindspore::LogStream; diff --git a/mindspore/ccsrc/pipeline/jit/action.cc b/mindspore/ccsrc/pipeline/jit/action.cc index 742f06aac..c5b38fe82 100644 --- a/mindspore/ccsrc/pipeline/jit/action.cc +++ b/mindspore/ccsrc/pipeline/jit/action.cc @@ -34,7 +34,7 @@ #include "pipeline/jit/static_analysis/static_analysis.h" #include "pipeline/jit/static_analysis/program_specialize.h" #include "pipeline/jit/resource.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "pipeline/jit/remove_value_node_dup.h" #include "frontend/optimizer/optimizer.h" #include "vm/transform.h" diff --git a/mindspore/ccsrc/pipeline/jit/base.h b/mindspore/ccsrc/pipeline/jit/base.h index 3f136a42c..595c2decd 100644 --- a/mindspore/ccsrc/pipeline/jit/base.h +++ b/mindspore/ccsrc/pipeline/jit/base.h @@ -24,7 +24,7 @@ #include "ir/anf.h" #include "pipeline/jit/resource.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace pipeline { diff --git a/mindspore/ccsrc/pipeline/jit/init.cc b/mindspore/ccsrc/pipeline/jit/init.cc index e6f4fec4c..8dc9d4a63 100644 --- a/mindspore/ccsrc/pipeline/jit/init.cc +++ b/mindspore/ccsrc/pipeline/jit/init.cc @@ -111,8 +111,6 @@ PYBIND11_MODULE(_c_expression, m) { .def("set_device_target", &mindspore::MsContext::set_device_target, "Set device target.") .def("get_device_id", &mindspore::MsContext::device_id, "Get device id.") .def("set_device_id", &mindspore::MsContext::set_device_id, "Set device id.") - .def("open_tsd", &mindspore::MsContext::OpenTsd, "Open tdt dataset client.") - .def("close_tsd", &mindspore::MsContext::CloseTsd, "Close tdt dataset client.") .def("get_save_graphs_flag", &mindspore::MsContext::save_graphs_flag, "Get whether to save graphs.") .def("set_save_graphs_flag", &mindspore::MsContext::set_save_graphs_flag, "Set whether to save graphs.") .def("get_auto_mixed_precision_flag", &mindspore::MsContext::auto_mixed_precision_flag, diff --git a/mindspore/ccsrc/pipeline/jit/parse/data_converter.cc b/mindspore/ccsrc/pipeline/jit/parse/data_converter.cc index 112b99631..9e119aa73 100644 --- a/mindspore/ccsrc/pipeline/jit/parse/data_converter.cc +++ b/mindspore/ccsrc/pipeline/jit/parse/data_converter.cc @@ -30,7 +30,7 @@ #include "frontend/operator/composite/composite.h" #include "ir/func_graph_cloner.h" #include "utils/symbolic.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "debug/trace.h" #include "frontend/optimizer/ad/grad.h" diff --git a/mindspore/ccsrc/pipeline/jit/parse/parse.cc b/mindspore/ccsrc/pipeline/jit/parse/parse.cc index ca27824d0..cadb0f619 100644 --- a/mindspore/ccsrc/pipeline/jit/parse/parse.cc +++ b/mindspore/ccsrc/pipeline/jit/parse/parse.cc @@ -28,7 +28,7 @@ #include "frontend/operator/ops.h" #include "pipeline/jit/parse/data_converter.h" #include "frontend/operator/composite/composite.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "debug/trace.h" namespace mindspore { diff --git a/mindspore/ccsrc/pipeline/jit/pipeline.cc b/mindspore/ccsrc/pipeline/jit/pipeline.cc index ff8376124..d0993f0fc 100644 --- a/mindspore/ccsrc/pipeline/jit/pipeline.cc +++ b/mindspore/ccsrc/pipeline/jit/pipeline.cc @@ -32,6 +32,7 @@ #include "debug/anf_ir_utils.h" #include "utils/config_manager.h" #include "utils/convert_utils.h" +#include "utils/context/context_extends.h" #include "utils/utils.h" #include "vm/segment_runner.h" #include "frontend/parallel/context.h" @@ -817,7 +818,7 @@ bool InitExecDataset(const std::string &queue_name, int64_t iter_num, int64_t ba #ifndef NO_DLIB auto ms_context = MsContext::GetInstance(); MS_EXCEPTION_IF_NULL(ms_context); - if (!ms_context->IsTsdOpened() || !ms_context->IsGeInited()) { + if (!context::IsTsdOpened(ms_context) || !context::IsGeInited(ms_context)) { (void)InitBackend(); } #endif @@ -911,7 +912,7 @@ void InitHccl() { mindspore::parse::python_adapter::set_python_env_flag(true); auto ms_context = MsContext::GetInstance(); MS_EXCEPTION_IF_NULL(ms_context); - (void)ms_context->OpenTsd(); + (void)context::OpenTsd(ms_context); uint32_t device_id = ms_context->device_id(); std::string device_name = ms_context->device_target(); ms_context->set_enable_hccl(true); @@ -944,8 +945,8 @@ void ExportGraph(const std::string &file_name, const std::string &, const std::s void ReleaseGeTsd() { auto context_ptr = MsContext::GetInstance(); if (context_ptr != nullptr) { - (void)context_ptr->FinalizeGe(true); - (void)context_ptr->CloseTsd(true); + (void)context::FinalizeGe(context_ptr, true); + (void)context::CloseTsd(context_ptr, true); } } @@ -955,17 +956,17 @@ void InitBackend() { // open tsd before ge initialize auto ms_context = MsContext::GetInstance(); MS_EXCEPTION_IF_NULL(ms_context); - if (!ms_context->OpenTsd()) { + if (!context::OpenTsd(ms_context)) { MS_LOG(EXCEPTION) << "Open tsd failed"; } - (void)ms_context->InitGe(); + (void)context::InitGe(ms_context); } void FinalizeBackend() { auto context_ptr = MsContext::GetInstance(); MS_EXCEPTION_IF_NULL(context_ptr); - (void)context_ptr->FinalizeGe(); - (void)context_ptr->CloseTsd(); + (void)context::FinalizeGe(context_ptr); + (void)context::CloseTsd(context_ptr); } void ClearResAtexit() { diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc index eb50974e5..b07bb270f 100644 --- a/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.cc @@ -22,7 +22,7 @@ #include "ir/func_graph_cloner.h" #include "abstract/utils.h" #include "debug/trace.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.h b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.h index 3b874d90e..af597d1d3 100644 --- a/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.h +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.h @@ -25,7 +25,7 @@ #include #include "pipeline/jit/static_analysis/static_analysis.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/jit/static_analysis/prim.cc b/mindspore/ccsrc/pipeline/jit/static_analysis/prim.cc index 22ef9c25f..fa8c36e46 100644 --- a/mindspore/ccsrc/pipeline/jit/static_analysis/prim.cc +++ b/mindspore/ccsrc/pipeline/jit/static_analysis/prim.cc @@ -33,10 +33,10 @@ #include "pipeline/jit/resource.h" #include "pipeline/jit/parse/resolve.h" #include "utils/convert_utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "pipeline/jit/parse/data_converter.h" #include "abstract/param_validator.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace abstract { diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc index 2786a8b41..7328b3b78 100644 --- a/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute.cc @@ -27,7 +27,8 @@ #include "ir/param_value.h" #include "utils/any.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" +#include "utils/context/context_extends.h" #include "frontend/operator/ops.h" #include "frontend/operator/composite/composite.h" #include "frontend/operator/composite/do_signature.h" @@ -750,7 +751,7 @@ py::tuple PynativeExecutor::RunOpInner(const OpExecInfoPtr &op_exec_info) { #else auto ms_context = MsContext::GetInstance(); MS_EXCEPTION_IF_NULL(ms_context); - ms_context->PynativeInitGe(); + context::PynativeInitGe(ms_context); backend_policy = kMsBackendGeOnly; #endif if (vm_operators.find(op_exec_info->op_name) != vm_operators.end()) { diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute.h b/mindspore/ccsrc/pipeline/pynative/pynative_execute.h index 1de225c26..246ceada1 100644 --- a/mindspore/ccsrc/pipeline/pynative/pynative_execute.h +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute.h @@ -29,7 +29,7 @@ #include "pybind11/numpy.h" #include "pipeline/pynative/base.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "ir/anf.h" #include "pipeline/jit/resource.h" #include "frontend/operator/composite/composite.h" diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc index 0b7f096b2..994306ec2 100644 --- a/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.cc @@ -23,7 +23,7 @@ #include "utils/any.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "frontend/operator/ops.h" #include "pipeline/jit/parse/data_converter.h" #include "pipeline/jit/static_analysis/prim.h" diff --git a/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.h b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.h index e8306dfb0..b8459db68 100644 --- a/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.h +++ b/mindspore/ccsrc/pipeline/pynative/pynative_execute_ge.h @@ -27,7 +27,7 @@ #include "transform/graph_ir/convert.h" #include "transform/graph_ir/graph_runner.h" #include "transform/graph_ir/types.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" using GeTensor = ge::Tensor; using GeTensorPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc index 7e42763fe..0efe3a698 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc @@ -30,7 +30,7 @@ #include "backend/kernel_compiler/tbe/tbe_kernel_build.h" #include "backend/kernel_compiler/tbe/tbe_kernel_parallel_build.h" #include "utils/utils.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "common/trans.h" #ifdef ENABLE_DUMP_E2E #include "debug/e2e_dump.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc index 75ce37775..0408dac28 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_kernel_runtime.cc @@ -23,7 +23,8 @@ #include #include "runtime/device/ascend/ascend_device_address.h" #include "runtime/device/cpu/mpi/mpi_adapter.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" +#include "utils/context/context_extends.h" #include "utils/mpi/mpi_config.h" #include "runtime/device/ascend/profiling/profiling_manager.h" #include "hccl/hcom.h" @@ -688,7 +689,7 @@ bool AscendKernelRuntime::ResetDevice() { bool AscendKernelRuntime::HcclInit() { auto context_ptr = MsContext::GetInstance(); MS_EXCEPTION_IF_NULL(context_ptr); - if (!context_ptr->IsTsdOpened()) { + if (!context::IsTsdOpened(context_ptr)) { MS_LOG(EXCEPTION) << "Hccl dependent tsd is not open"; } MS_LOG(INFO) << "Do hcom init"; diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc index 6d11900a4..0970fe01e 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_memory_manager.cc @@ -16,7 +16,7 @@ #include #include "runtime/device/ascend/ascend_memory_manager.h" #include "runtime/device/ascend/ascend_memory_pool.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "runtime/mem.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc index 9a3327a5f..57fe3090a 100644 --- a/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc +++ b/mindspore/ccsrc/runtime/device/ascend/ascend_stream_assign.cc @@ -20,8 +20,8 @@ #include #include "ir/manager.h" -#include "utils/context/ms_context.h" -#include "common/utils.h" +#include "utils/ms_context.h" +#include "utils/ms_utils.h" #include "backend/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_adjust.h" #include "backend/optimizer/common/helper.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc index e907b1d52..0a6ac5226 100644 --- a/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc +++ b/mindspore/ccsrc/runtime/device/ascend/dump/data_dumper.cc @@ -25,7 +25,7 @@ #include "runtime/rt_model.h" #include "runtime/device/ascend/dump/ge_dump.h" #include "proto/op_mapping_info.pb.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "debug/data_dump_parser.h" static constexpr uint32_t kAicpuLoadFlag = 1; diff --git a/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc b/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc index 3932c4fd5..da35ca023 100644 --- a/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc +++ b/mindspore/ccsrc/runtime/device/ascend/kernel_select_ascend.cc @@ -24,11 +24,11 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "debug/anf_ir_dump.h" #include "frontend/operator/ops.h" #include "ir/func_graph.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" #include "backend/kernel_compiler/common_utils.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc index bb7c1eae9..18d67d525 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.cc @@ -22,8 +22,8 @@ #include "runtime/device/ascend/profiling/plugin_impl.h" #include "runtime/device/ascend/profiling/profiling_engine_impl.h" #include "utils/log_adapter.h" -#include "utils/context/ms_context.h" -#include "common/utils.h" +#include "utils/ms_context.h" +#include "utils/ms_utils.h" #include "utils/convert_utils.h" #include "runtime/base.h" diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h index 4263f2b2a..26118bb27 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_manager.h @@ -22,7 +22,7 @@ #include #include #include "utils/contract.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" using std::map; using std::string; diff --git a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc index abc72f7e8..ed96f6ed2 100644 --- a/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc +++ b/mindspore/ccsrc/runtime/device/ascend/profiling/profiling_utils.cc @@ -19,10 +19,10 @@ #include "backend/kernel_compiler/kernel.h" #include "runtime/device/ascend/profiling/profiling_manager.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/utils.h" #include "runtime/device/ascend/profiling/reporter/task_desc_reporter.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "runtime/device/ascend/profiling/reporter/point_reporter.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc b/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc index 5aeb93210..2b419367f 100644 --- a/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc +++ b/mindspore/ccsrc/runtime/device/ascend/tasksink/task_generator.cc @@ -18,8 +18,8 @@ #include #include "backend/kernel_compiler/task_stream.h" -#include "utils/context/ms_context.h" -#include "common/utils.h" +#include "utils/ms_context.h" +#include "utils/ms_utils.h" #include "runtime/device/ascend/profiling/profiling_utils.h" #include "runtime/device/ascend/profiling/profiling_manager.h" diff --git a/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc b/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc index 6904c6a0b..1b44394ce 100644 --- a/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc +++ b/mindspore/ccsrc/runtime/device/cpu/cpu_kernel_runtime.cc @@ -24,10 +24,10 @@ #include #include "backend/kernel_compiler/kernel.h" #include "runtime/device/cpu/cpu_device_address.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/config_manager.h" #include "utils/profile.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/session/session_basic.h" #include "frontend/operator/ops.h" diff --git a/mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc b/mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc index 547c2fbe6..5cb97ac1e 100644 --- a/mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc +++ b/mindspore/ccsrc/runtime/device/gpu/blocking_queue.cc @@ -17,7 +17,7 @@ #include "runtime/device/gpu/blocking_queue.h" #include #include "runtime/device/gpu/gpu_common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc index a1b1fa9b7..7ca7878d5 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_buffer_mgr.cc @@ -18,7 +18,7 @@ #include #include #include "utils/log_adapter.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc index 664648351..bf0919268 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_kernel_runtime.cc @@ -22,10 +22,10 @@ #include "runtime/device/gpu/gpu_memory_allocator.h" #include "runtime/device/gpu/distribution/collective_init.h" #include "utils/convert_utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "runtime/device/kernel_runtime_manager.h" #include "runtime/device/gpu/gpu_common.h" -#include "common/utils.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" diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc index e2395bbaf..746aeda2c 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_allocator.cc @@ -18,7 +18,7 @@ #include "runtime/device/gpu/gpu_memory_allocator.h" #include "runtime/device/gpu/cuda_driver.h" #include "utils/log_adapter.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/convert_utils_base.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc index ffa07eea0..7702234cc 100644 --- a/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc +++ b/mindspore/ccsrc/runtime/device/gpu/gpu_memory_manager.cc @@ -16,7 +16,7 @@ #include "runtime/device/gpu/gpu_memory_manager.h" #include "runtime/device/gpu/gpu_memory_allocator.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/convert_utils.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc b/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc index 432698778..00bae0f6c 100644 --- a/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc +++ b/mindspore/ccsrc/runtime/device/gpu/kernel_info_setter.cc @@ -23,7 +23,7 @@ #include "backend/kernel_compiler/kernel_build_info.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/kernel_compiler/common_utils.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/oplib/oplib.h" #include "backend/kernel_compiler/oplib/opinfo.h" diff --git a/mindspore/ccsrc/runtime/device/kernel_adjust.cc b/mindspore/ccsrc/runtime/device/kernel_adjust.cc index bb1f7f723..513fa6825 100644 --- a/mindspore/ccsrc/runtime/device/kernel_adjust.cc +++ b/mindspore/ccsrc/runtime/device/kernel_adjust.cc @@ -24,10 +24,10 @@ #include #include "backend/session/anf_runtime_algorithm.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "common/trans.h" #include "utils/config_manager.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" #include "runtime/device/ascend/profiling/profiling_manager.h" diff --git a/mindspore/ccsrc/runtime/device/kernel_runtime.cc b/mindspore/ccsrc/runtime/device/kernel_runtime.cc index b86cdbed4..d1c0392e1 100644 --- a/mindspore/ccsrc/runtime/device/kernel_runtime.cc +++ b/mindspore/ccsrc/runtime/device/kernel_runtime.cc @@ -19,10 +19,10 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "common/trans.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "frontend/operator/ops.h" #include "pipeline/jit/parse/python_adapter.h" #include "backend/session/kernel_graph.h" diff --git a/mindspore/ccsrc/runtime/device/kernel_runtime.h b/mindspore/ccsrc/runtime/device/kernel_runtime.h index 419c77e3f..cc33c5646 100644 --- a/mindspore/ccsrc/runtime/device/kernel_runtime.h +++ b/mindspore/ccsrc/runtime/device/kernel_runtime.h @@ -33,7 +33,7 @@ #include "backend/session/kernel_graph.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/kernel_compiler/kernel.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "runtime/device/memory_manager.h" using mindspore::tensor::Tensor; diff --git a/mindspore/ccsrc/runtime/device/kernel_runtime_manager.h b/mindspore/ccsrc/runtime/device/kernel_runtime_manager.h index ed2a24229..bf88f5308 100644 --- a/mindspore/ccsrc/runtime/device/kernel_runtime_manager.h +++ b/mindspore/ccsrc/runtime/device/kernel_runtime_manager.h @@ -22,7 +22,7 @@ #include #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "runtime/device/kernel_runtime.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/device/memory_manager.cc b/mindspore/ccsrc/runtime/device/memory_manager.cc index 0ed054108..b00c1b719 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 "backend/session/anf_runtime_algorithm.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" using mindspore::memreuse::BestFitMemReuse; using mindspore::memreuse::MemReuseUtilPtr; namespace mindspore { diff --git a/mindspore/ccsrc/transform/graph_ir/convert.cc b/mindspore/ccsrc/transform/graph_ir/convert.cc index 3483a8a96..f686e13f2 100644 --- a/mindspore/ccsrc/transform/graph_ir/convert.cc +++ b/mindspore/ccsrc/transform/graph_ir/convert.cc @@ -28,7 +28,7 @@ #include "utils/config_manager.h" #include "utils/convert_utils.h" #include "./common.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace transform { diff --git a/mindspore/ccsrc/utils/context/ms_context.cc b/mindspore/ccsrc/utils/context/context_extends.cc similarity index 54% rename from mindspore/ccsrc/utils/context/ms_context.cc rename to mindspore/ccsrc/utils/context/context_extends.cc index c0ce5c45f..b460a66c4 100644 --- a/mindspore/ccsrc/utils/context/ms_context.cc +++ b/mindspore/ccsrc/utils/context/context_extends.cc @@ -14,158 +14,30 @@ * limitations under the License. */ -#include "utils/context/ms_context.h" +#include "utils/context/context_extends.h" +#include +#include +#include #include #include #include -#include "./common.h" -#include "utils/convert_utils.h" -#include "utils/tensorprint_utils.h" -#include "frontend/parallel/costmodel_context.h" -#ifndef NO_DLIB -#include "tdt/tsd_client.h" -#include "tdt/tdt_host_interface.h" -#include "tdt/data_common.h" -#endif -#ifdef ENABLE_GE -#include "transform/graph_ir/df_graph_manager.h" -#endif -#include "ir/tensor.h" -#include "common/utils.h" namespace mindspore { -#ifdef ENABLE_GE -using mindspore::transform::DfGraphManager; -#endif - -std::atomic thread_1_must_end(false); - -std::shared_ptr MsContext::inst_context_ = nullptr; -std::map MsContext::policy_map_ = {{"ge", kMsBackendGePrior}, - {"vm", kMsBackendVmOnly}, - {"ms", kMsBackendMsPrior}, - {"ge_only", kMsBackendGeOnly}, - {"vm_prior", kMsBackendVmPrior}}; - -MsContext::MsContext(const std::string &policy, const std::string &target) { - save_graphs_flag_ = false; - save_graphs_path_ = "."; - enable_dump_ = false; - save_dump_path_ = "."; - tsd_ref_ = 0; - ge_ref_ = 0; - is_multi_graph_sink_ = false; - is_pynative_ge_init_ = false; - enable_reduce_precision_ = true; - auto env_device = common::GetEnv("DEVICE_ID"); - if (!env_device.empty()) { - device_id_ = UlongToUint(std::stoul(env_device.c_str())); - } else { - device_id_ = 0; - } - backend_policy_ = policy_map_[policy]; - device_target_ = target; - execution_mode_ = kPynativeMode; - enable_task_sink_ = true; - ir_fusion_flag_ = true; - enable_hccl_ = false; -#ifdef ENABLE_DEBUGGER - enable_mem_reuse_ = false; -#else - enable_mem_reuse_ = true; -#endif - enable_gpu_summary_ = true; - precompile_only_ = false; - auto_mixed_precision_flag_ = false; - enable_pynative_infer_ = false; - enable_pynative_hook_ = false; - enable_dynamic_mem_pool_ = true; - graph_memory_max_size_ = "0"; - variable_memory_max_size_ = "0"; - enable_loop_sink_ = target == kAscendDevice || target == kDavinciDevice; - profiling_mode_ = false; - profiling_options_ = "training_trace"; - check_bprop_flag_ = false; - max_device_memory_ = kDefaultMaxDeviceMemory; - print_file_path_ = ""; - enable_graph_kernel_ = false; - enable_sparse_ = false; -} - -std::shared_ptr MsContext::GetInstance() { - if (inst_context_ == nullptr) { - MS_LOG(DEBUG) << "Create new mindspore context"; -#ifdef ENABLE_GE - inst_context_.reset(new (std::nothrow) MsContext("ge", kAscendDevice)); -#elif defined(ENABLE_D) - inst_context_.reset(new (std::nothrow) MsContext("ms", kAscendDevice)); -#elif defined(ENABLE_GPU) - inst_context_.reset(new (std::nothrow) MsContext("ms", kGPUDevice)); -#else - inst_context_.reset(new (std::nothrow) MsContext("vm", kCPUDevice)); -#endif - } - return inst_context_; -} - -bool MsContext::set_backend_policy(const std::string &policy) { - if (policy_map_.find(policy) == policy_map_.end()) { - MS_LOG(ERROR) << "invalid backend policy name: " << policy; - return false; - } - backend_policy_ = policy_map_[policy]; - MS_LOG(INFO) << "ms set context backend policy:" << policy; - return true; -} - -std::string MsContext::backend_policy() const { - auto res = std::find_if( - policy_map_.begin(), policy_map_.end(), - [&, this](const std::pair &item) { return item.second == backend_policy_; }); - if (res != policy_map_.end()) { - return res->first; - } - return "unknown"; -} - -void MsContext::set_execution_mode(int execution_mode) { - if (execution_mode != kGraphMode && execution_mode != kPynativeMode) { - MS_LOG(EXCEPTION) << "The execution mode is invalid!"; - } - execution_mode_ = execution_mode; -} - -bool MsContext::set_device_target(const std::string &target) { - if (kTargetSet.find(target) == kTargetSet.end()) { - MS_LOG(ERROR) << "invalid device target name: " << target; - return false; - } - if (target == kDavinciDevice) { - device_target_ = kAscendDevice; - } else { - device_target_ = target; - } - parallel::CostModelContext::GetInstance()->set_costmodel_context_for_device(device_target_); - MS_LOG(INFO) << "ms set context device target:" << target; - return true; -} - -bool MsContext::set_device_id(uint32_t device_id) { - device_id_ = device_id; - MS_LOG(INFO) << "ms set context device id:" << device_id; - return true; -} - +namespace context { #ifndef NO_DLIB // Open tdt dataset -bool MsContext::OpenTsd() { - if (is_pynative_ge_init_) { +bool OpenTsd(const std::shared_ptr &ms_context_ptr) { + if (ms_context_ptr == nullptr) { + MS_LOG(EXCEPTION) << "nullptr"; + } + + if (ms_context_ptr->is_pynative_ge_init()) { return true; } - if (tsd_ref_) { + if (ms_context_ptr->tsd_ref()) { MS_LOG(DEBUG) << "TDT Dataset client is already opened."; - tsd_ref_++; + ms_context_ptr->set_tsd_ref("++"); return true; } @@ -177,7 +49,7 @@ bool MsContext::OpenTsd() { unsigned int device_id; unsigned int rank_size = 1; - device_id = device_id_; + device_id = ms_context_ptr->device_id(); auto rank_size_env = common::GetEnv("RANK_SIZE"); if (rank_size_env.empty()) { @@ -197,26 +69,29 @@ bool MsContext::OpenTsd() { MS_LOG(EXCEPTION) << "Device " << device_id << " is occupied, open tsd failed, status = " << status << "."; return false; } - tsd_ref_++; + ms_context_ptr->set_tsd_ref("++"); #ifdef ENABLE_TDTQUE int32_t initStatus = tdt::TdtHostInit(device_id); if (initStatus != TDT_OK_CODE) { MS_LOG(EXCEPTION) << "Init tsd failed, status = " << initStatus << "."; return false; } - tdt_print_ = std::thread(TensorPrint()); + ms_context_ptr->tdt_print_ = std::thread(TensorPrint()); #endif - MS_LOG(INFO) << "Open and init tsd successful, tsd reference = " << tsd_ref_ << "."; + MS_LOG(INFO) << "Open and init tsd successful, tsd reference = " << ms_context_ptr->tsd_ref() << "."; return true; } -bool MsContext::CloseTsd(bool force) { - if (tsd_ref_ == 0) { +bool CloseTsd(const std::shared_ptr &ms_context_ptr, bool force) { + if (ms_context_ptr == nullptr) { + MS_LOG(EXCEPTION) << "nullptr"; + } + if (ms_context_ptr->tsd_ref() == 0) { return true; } - tsd_ref_--; - if (force || tsd_ref_ == 0) { - tsd_ref_ = 0; + ms_context_ptr->set_tsd_ref("--"); + if (force || ms_context_ptr->tsd_ref() == 0) { + ms_context_ptr->set_tsd_ref(" "); #ifdef ENABLE_TDTQUE int32_t stopStatus = tdt::TdtHostStop(KNpuLog); if (stopStatus != TDT_OK_CODE) { @@ -230,79 +105,58 @@ bool MsContext::CloseTsd(bool force) { return false; } try { - if (tdt_print_.joinable()) { + if (ms_context_ptr->tdt_print_.joinable()) { MS_LOG(INFO) << "join tdt host receive process"; - tdt_print_.join(); + ms_context_ptr->tdt_print_.join(); } } catch (const std::exception &e) { MS_LOG(ERROR) << "tdt thread join failed: " << e.what(); } #endif - unsigned int device_id; - device_id = device_id_; + auto device_id = ms_context_ptr->device_id(); TDT_StatusT status = TsdClose(device_id); if (status != TDT_OK) { MS_LOG(EXCEPTION) << "Close tsd failed, status = " << status << "."; return false; } - is_pynative_ge_init_ = false; + ms_context_ptr->set_pynative_ge_init(false); MS_LOG(INFO) << "Destroy and close tsd successful, status = " << status << "."; } else { - MS_LOG(DEBUG) << "TDT Dataset client is used, no need to close, tsd reference = " << tsd_ref_ << "."; + MS_LOG(DEBUG) << "TDT Dataset client is used, no need to close, tsd reference = " << ms_context_ptr->tsd_ref() + << "."; } return true; } #else -bool MsContext::OpenTsd() { return true; } - -bool MsContext::CloseTsd(bool) { return true; } +bool OpenTsd(const std::shared_ptr &ms_context_ptr) { return true; } +bool CloseTsd(const std::shared_ptr &ms_context_ptr, bool) { return true; } #endif -void MsContext::SetHcclOptions(std::map *ge_options) const { - auto env_table_file = common::GetEnv("RANK_TABLE_FILE"); - auto env_rank_id = common::GetEnv("RANK_ID"); - auto env_device_id = std::to_string(device_id_); - if (!(env_table_file.empty() || env_rank_id.empty())) { - MS_LOG(INFO) << "Initialize Ge for distribute parameter"; - MS_LOG(INFO) << "Use hccl, make sure hccl lib is set in OPTION_EXEC_EXTERN_PLUGIN_PATH."; - auto env_hccl_flag = common::GetEnv("HCCL_FLAG"); - if (!env_hccl_flag.empty()) { - (*ge_options)["ge.exec.hcclFlag"] = env_hccl_flag; - } - (*ge_options)["ge.exec.isUseHcom"] = "1"; - (*ge_options)["ge.exec.deviceId"] = env_device_id; - (*ge_options)["ge.exec.rankId"] = env_rank_id; - (*ge_options)["ge.exec.podName"] = env_rank_id; - (*ge_options)["ge.exec.rankTableFile"] = env_table_file; - (*ge_options)["ge.graphRunMode"] = "1"; - } else { - // device id is still needed for non-distribute case - (*ge_options)["ge.exec.deviceId"] = env_device_id; - MS_LOG(INFO) << "No hccl mode. " - "If use hccl, make sure [RANK_TABLE_FILE,RANK_ID,DEVICE_ID,DEPLOY_MODE] all be set in ENV."; - } - - auto env_deploy_mode = common::GetEnv("DEPLOY_MODE"); - if (!env_deploy_mode.empty()) { - (*ge_options)["ge.exec.deployMode"] = env_deploy_mode; +void SetDisableReuseMemoryFlag(std::map *ge_options) { + auto env_disable_reuse_memory = common::GetEnv("DISABLE_REUSE_MEMORY"); + if (!env_disable_reuse_memory.empty()) { + (*ge_options)["ge.exec.disableReuseMemory"] = env_disable_reuse_memory; } else { - (*ge_options)["ge.exec.deployMode"] = "0"; - MS_LOG(WARNING) << "DEPLOY_MODE is not set in ENV. Now set to default value 0"; + (*ge_options)["ge.exec.disableReuseMemory"] = "0"; + MS_LOG(WARNING) << "DISABLE_REUSE_MEMORY is not set in ENV. Now set to default value 0"; } } -void MsContext::GetGeOptions(std::map *ge_options) const { +void GetGeOptions(const std::shared_ptr &ms_context_ptr, std::map *ge_options) { + if (ms_context_ptr == nullptr) { + MS_LOG(EXCEPTION) << "nullptr"; + } #ifdef ENABLE_GE (*ge_options)["device_id"] = "0"; - (*ge_options)["ge.exec.enableDump"] = std::to_string(enable_dump_); - (*ge_options)["ge.exec.dumpPath"] = save_dump_path_; + (*ge_options)["ge.exec.enableDump"] = std::to_string(ms_context_ptr->enable_dump()); + (*ge_options)["ge.exec.dumpPath"] = ms_context_ptr->save_dump_path(); (*ge_options)["ge.exec.dumpMode"] = "output"; - MS_LOG(INFO) << "The enable dump state is " << std::to_string(enable_dump_) << " and save dump path is " - << save_dump_path_ << "."; - (*ge_options)["ge.exec.profilingMode"] = std::to_string(profiling_mode_); - if (profiling_mode_) { - (*ge_options)["ge.exec.profilingOptions"] = profiling_options_; + MS_LOG(INFO) << "The enable dump state is " << std::to_string(ms_context_ptr->enable_dump()) + << " and save dump path is " << ms_context_ptr->save_dump_path() << "."; + (*ge_options)["ge.exec.profilingMode"] = std::to_string(ms_context_ptr->enable_profiling()); + if (ms_context_ptr->enable_profiling()) { + (*ge_options)["ge.exec.profilingOptions"] = ms_context_ptr->profiling_options(); } (*ge_options)["rank_table_file"] = ""; @@ -314,19 +168,19 @@ void MsContext::GetGeOptions(std::map *ge_options) con } (*ge_options)["graphType"] = "1"; - if (graph_memory_max_size_ != "0") { - (*ge_options)["ge.graphMemoryMaxSize"] = graph_memory_max_size_; + if (ms_context_ptr->graph_memory_max_size() != "0") { + (*ge_options)["ge.graphMemoryMaxSize"] = ms_context_ptr->graph_memory_max_size(); } - if (variable_memory_max_size_ != "0") { - (*ge_options)["ge.variableMemoryMaxSize"] = variable_memory_max_size_; + if (ms_context_ptr->variable_memory_max_size() != "0") { + (*ge_options)["ge.variableMemoryMaxSize"] = ms_context_ptr->variable_memory_max_size(); } #if ENABLE_TRAIN == 1 (*ge_options)["ge.graphRunMode"] = "1"; #endif SetDisableReuseMemoryFlag(ge_options); - SetHcclOptions(ge_options); + SetHcclOptions(ms_context_ptr, ge_options); auto env_job_id = common::GetEnv("JOB_ID"); if (!env_job_id.empty()) { @@ -360,7 +214,7 @@ void MsContext::GetGeOptions(std::map *ge_options) con } // Enable auto mixed precision according to the context options - if (auto_mixed_precision_flag_) { + if (ms_context_ptr->auto_mixed_precision_flag()) { (*ge_options)["ge.exec.precision_mode"] = "allow_mix_precision"; } else { (*ge_options)["ge.exec.precision_mode"] = "allow_fp32_to_fp16"; @@ -370,29 +224,58 @@ void MsContext::GetGeOptions(std::map *ge_options) con #endif } -void MsContext::SetDisableReuseMemoryFlag(std::map *ge_options) const { - auto env_disable_reuse_memory = common::GetEnv("DISABLE_REUSE_MEMORY"); - if (!env_disable_reuse_memory.empty()) { - (*ge_options)["ge.exec.disableReuseMemory"] = env_disable_reuse_memory; +void SetHcclOptions(const std::shared_ptr &ms_context_ptr, std::map *ge_options) { + if (ms_context_ptr == nullptr) { + MS_LOG(EXCEPTION) << "nullptr"; + } + auto env_table_file = common::GetEnv("RANK_TABLE_FILE"); + auto env_rank_id = common::GetEnv("RANK_ID"); + auto env_device_id = std::to_string(ms_context_ptr->device_id()); + if (!(env_table_file.empty() || env_rank_id.empty())) { + MS_LOG(INFO) << "Initialize Ge for distribute parameter"; + MS_LOG(INFO) << "Use hccl, make sure hccl lib is set in OPTION_EXEC_EXTERN_PLUGIN_PATH."; + auto env_hccl_flag = common::GetEnv("HCCL_FLAG"); + if (!env_hccl_flag.empty()) { + (*ge_options)["ge.exec.hcclFlag"] = env_hccl_flag; + } + (*ge_options)["ge.exec.isUseHcom"] = "1"; + (*ge_options)["ge.exec.deviceId"] = env_device_id; + (*ge_options)["ge.exec.rankId"] = env_rank_id; + (*ge_options)["ge.exec.podName"] = env_rank_id; + (*ge_options)["ge.exec.rankTableFile"] = env_table_file; + (*ge_options)["ge.graphRunMode"] = "1"; } else { - (*ge_options)["ge.exec.disableReuseMemory"] = "0"; - MS_LOG(WARNING) << "DISABLE_REUSE_MEMORY is not set in ENV. Now set to default value 0"; + // device id is still needed for non-distribute case + (*ge_options)["ge.exec.deviceId"] = env_device_id; + MS_LOG(INFO) << "No hccl mode. " + "If use hccl, make sure [RANK_TABLE_FILE,RANK_ID,DEVICE_ID,DEPLOY_MODE] all be set in ENV."; + } + + auto env_deploy_mode = common::GetEnv("DEPLOY_MODE"); + if (!env_deploy_mode.empty()) { + (*ge_options)["ge.exec.deployMode"] = env_deploy_mode; + } else { + (*ge_options)["ge.exec.deployMode"] = "0"; + MS_LOG(WARNING) << "DEPLOY_MODE is not set in ENV. Now set to default value 0"; } } -bool MsContext::InitGe() { +bool InitGe(const std::shared_ptr &ms_context_ptr) { + if (ms_context_ptr == nullptr) { + MS_LOG(EXCEPTION) << "nullptr"; + } #ifdef ENABLE_GE - if (is_pynative_ge_init_) { + if (ms_context_ptr->is_pynative_ge_init()) { return true; } - if (ge_ref_) { - ge_ref_++; + if (ms_context_ptr->ge_ref()) { + ms_context_ptr->set_ge_ref("++"); return true; } std::map ge_options; - GetGeOptions(&ge_options); + GetGeOptions(ms_context_ptr, &ge_options); { // Release GIL before calling into (potentially long-running) C++ code py::gil_scoped_release release; @@ -400,20 +283,36 @@ bool MsContext::InitGe() { MS_LOG(EXCEPTION) << "Initialize GE failed!"; } } - ge_ref_++; - MS_LOG(INFO) << "Init ge successful, ge reference = " << ge_ref_ << "."; + ms_context_ptr->set_ge_ref("++"); + MS_LOG(INFO) << "Init ge successful, ge reference = " << ms_context_ptr->ge_ref() << "."; #endif return true; } -bool MsContext::FinalizeGe(bool force) { +bool PynativeInitGe(const std::shared_ptr &ms_context_ptr) { + if (ms_context_ptr == nullptr) { + MS_LOG(EXCEPTION) << "nullptr"; + } + if (ms_context_ptr->is_pynative_ge_init() || ms_context_ptr->ge_ref() || ms_context_ptr->tsd_ref()) { + return true; + } + (void)OpenTsd(ms_context_ptr); + (void)InitGe(ms_context_ptr); + ms_context_ptr->set_pynative_ge_init(true); + return true; +} + +bool FinalizeGe(const std::shared_ptr &ms_context_ptr, bool force) { + if (ms_context_ptr == nullptr) { + MS_LOG(EXCEPTION) << "nullptr"; + } #ifdef ENABLE_GE - if (ge_ref_ == 0) { + if (ms_context_ptr->ge_ref() == 0) { return true; } - ge_ref_--; - if (force || ge_ref_ == 0) { - ge_ref_ = 0; + ms_context_ptr->set_ge_ref("--"); + if (force || ms_context_ptr->ge_ref() == 0) { + ms_context_ptr->set_ge_ref(" "); try { DfGraphManager::GetInstance().DeleteGraphRunner(); DfGraphManager::GetInstance().DeleteGeSession(); @@ -426,35 +325,44 @@ bool MsContext::FinalizeGe(bool force) { if (ge::GEFinalize() != ge::GRAPH_SUCCESS) { MS_LOG(WARNING) << "Finalize GE failed!"; } - is_pynative_ge_init_ = false; + ms_context_ptr->set_pynative_ge_init(true); } else { - MS_LOG(INFO) << "Ge is used, no need to finalize, tsd reference = " << ge_ref_ << "."; + MS_LOG(INFO) << "Ge is used, no need to finalize, tsd reference = " << ms_context_ptr->ge_ref() << "."; } #endif return true; } -bool MsContext::PynativeInitGe() { - if (is_pynative_ge_init_ || ge_ref_ || tsd_ref_) { - return true; +bool IsTsdOpened(const std::shared_ptr &ms_context_ptr) { + if (ms_context_ptr == nullptr) { + MS_LOG(EXCEPTION) << "nullptr"; } - (void)OpenTsd(); - (void)InitGe(); - is_pynative_ge_init_ = true; - return true; + return ms_context_ptr->tsd_ref(); } -bool MsContext::IsTsdOpened() { - if (tsd_ref_ > 0) { - return true; +bool IsGeInited(const std::shared_ptr &ms_context_ptr) { + if (ms_context_ptr == nullptr) { + MS_LOG(EXCEPTION) << "nullptr"; } - return false; + return ms_context_ptr->ge_ref(); } -bool MsContext::IsGeInited() { - if (ge_ref_ > 0) { - return true; +// Register for device type. +struct DeviceTypeSetRegister { + DeviceTypeSetRegister() { + MsContext::device_type_seter([](std::shared_ptr &device_type_seter) { +#ifdef ENABLE_GE + device_type_seter.reset(new (std::nothrow) MsContext("ge", kAscendDevice)); +#elif defined(ENABLE_D) + device_type_seter.reset(new (std::nothrow) MsContext("ms", kAscendDevice)); +#elif defined(ENABLE_GPU) + device_type_seter.reset(new (std::nothrow) MsContext("ms", kGPUDevice)); +#else + device_type_seter.reset(new (std::nothrow) MsContext("vm", kCPUDevice)); +#endif + }); } - return false; -} + ~DeviceTypeSetRegister() = default; +} device_type_set_regsiter; +} // namespace context } // namespace mindspore diff --git a/mindspore/ccsrc/utils/context/context_extends.h b/mindspore/ccsrc/utils/context/context_extends.h new file mode 100644 index 000000000..f425042be --- /dev/null +++ b/mindspore/ccsrc/utils/context/context_extends.h @@ -0,0 +1,51 @@ +/** + * Copyright 2019 Huawei Technologies Co., Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#ifndef MINDSPORE_CCSRC_UTILS_CONTEXT_CONTEXT_EXTENDS_H +#define MINDSPORE_CCSRC_UTILS_CONTEXT_CONTEXT_EXTENDS_H + +#include +#include +#include +#include "utils/ms_context.h" +#include "utils/tensorprint_utils.h" +#include "utils/convert_utils.h" + +#ifndef NO_DLIB +#include "tdt/tsd_client.h" +#include "tdt/tdt_host_interface.h" +#include "tdt/data_common.h" +#endif +#ifdef ENABLE_GE +#include "transform/graph_ir/df_graph_manager.h" +#endif + +namespace mindspore { +namespace context { +bool OpenTsd(const std::shared_ptr &inst_context); +bool CloseTsd(const std::shared_ptr &inst_context, bool force = false); +void SetHcclOptions(const std::shared_ptr &inst_context, std::map *ge_options); +void GetGeOptions(const std::shared_ptr &inst_context, std::map *ge_options); +void SetDisableReuseMemoryFlag(std::map *ge_options); +bool InitGe(const std::shared_ptr &inst_context); +bool FinalizeGe(const std::shared_ptr &inst_context, bool force = false); +bool PynativeInitGe(const std::shared_ptr &inst_context); +bool IsTsdOpened(const std::shared_ptr &inst_context); +bool IsGeInited(const std::shared_ptr &inst_context); +} // namespace context +} // namespace mindspore + +#endif // MINDSPORE_CCSRC_UTILS_CONTEXT_CONTEXT_EXTENDS_H diff --git a/mindspore/ccsrc/utils/primitive_utils.cc b/mindspore/ccsrc/utils/primitive_utils.cc index abd5cb166..956041d8f 100644 --- a/mindspore/ccsrc/utils/primitive_utils.cc +++ b/mindspore/ccsrc/utils/primitive_utils.cc @@ -20,7 +20,7 @@ #include "pipeline/jit/parse/python_adapter.h" #include "utils/log_adapter.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { py::function GetBpropFunctionByObj(py::object obj) { diff --git a/mindspore/ccsrc/utils/tensorprint_utils.cc b/mindspore/ccsrc/utils/tensorprint_utils.cc index 5c8164020..d6dbe970c 100644 --- a/mindspore/ccsrc/utils/tensorprint_utils.cc +++ b/mindspore/ccsrc/utils/tensorprint_utils.cc @@ -22,7 +22,7 @@ #include #include "ir/tensor.h" #include "pybind11/pybind11.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "runtime/device/convert_tensor_utils.h" #include "./securec.h" #ifndef NO_DLIB diff --git a/mindspore/ccsrc/utils/tensorprint_utils.h b/mindspore/ccsrc/utils/tensorprint_utils.h index 4a40862ea..b150368f7 100644 --- a/mindspore/ccsrc/utils/tensorprint_utils.h +++ b/mindspore/ccsrc/utils/tensorprint_utils.h @@ -24,7 +24,7 @@ #include "tdt/tdt_host_interface.h" #include "tdt/data_common.h" #include "proto/print.pb.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #endif namespace mindspore { class TensorPrint { diff --git a/mindspore/ccsrc/vm/backend.cc b/mindspore/ccsrc/vm/backend.cc index 654e546e3..42af5541f 100644 --- a/mindspore/ccsrc/vm/backend.cc +++ b/mindspore/ccsrc/vm/backend.cc @@ -23,7 +23,7 @@ #include "utils/callbacks.h" #include "utils/base_ref_extends.h" #include "backend/session/session_factory.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #ifdef ENABLE_GE #include "utils/callbacks_ge.h" #endif diff --git a/mindspore/ccsrc/vm/transform.cc b/mindspore/ccsrc/vm/transform.cc index bf39e4e2e..61d96944f 100644 --- a/mindspore/ccsrc/vm/transform.cc +++ b/mindspore/ccsrc/vm/transform.cc @@ -31,7 +31,7 @@ #include "transform/graph_ir/convert.h" #endif #include "ir/graph_utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "debug/trace.h" #include "debug/anf_ir_dump.h" diff --git a/mindspore/core/ir/anf.cc b/mindspore/core/ir/anf.cc index 1d31936cf..a681644b3 100644 --- a/mindspore/core/ir/anf.cc +++ b/mindspore/core/ir/anf.cc @@ -26,7 +26,7 @@ #include "base/core_ops.h" #include "ir/func_graph.h" #include "ir/primitive.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { // namespace to support intermediate representation definition diff --git a/mindspore/core/ir/func_graph.h b/mindspore/core/ir/func_graph.h index b8ea6f8f3..ba1da220a 100644 --- a/mindspore/core/ir/func_graph.h +++ b/mindspore/core/ir/func_graph.h @@ -144,6 +144,7 @@ extern const char kFuncGraphFlagUndetermined[]; class FuncGraph : public FuncGraphBase { public: FuncGraph(); + using Drawer = std::function; ~FuncGraph() override = default; MS_DECLARE_PARENT(FuncGraph, FuncGraphBase); @@ -348,6 +349,7 @@ class FuncGraph : public FuncGraphBase { bool stub() const { return stub_; } void set_stub(bool stub) { stub_ = stub; } + static void set_drawer(Drawer drawer) { drawer_ = drawer; } private: // graph is manipulated by manager and others @@ -408,6 +410,7 @@ class FuncGraph : public FuncGraphBase { // CNode order which relates to origin code order std::list order_; bool stub_; + inline static Drawer drawer_ = nullptr; }; inline CNodePtr NewCNode(const std::vector &inputs, const FuncGraphPtr &fg) { diff --git a/mindspore/core/ir/func_graph_cloner.cc b/mindspore/core/ir/func_graph_cloner.cc index 02a42559d..bb8ed7bc4 100644 --- a/mindspore/core/ir/func_graph_cloner.cc +++ b/mindspore/core/ir/func_graph_cloner.cc @@ -24,7 +24,7 @@ #include "utils/convert_utils_base.h" #include "utils/log_adapter.h" #include "utils/profile.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "ir/graph_utils.h" // namespace to support intermediate representation definition diff --git a/mindspore/core/ir/func_graph_extends.cc b/mindspore/core/ir/func_graph_extends.cc index ea20a1b80..6e31c8150 100644 --- a/mindspore/core/ir/func_graph_extends.cc +++ b/mindspore/core/ir/func_graph_extends.cc @@ -24,7 +24,7 @@ #include "utils/ordered_set.h" #include "abstract/abstract_value.h" #include "abstract/abstract_function.h" -#include "debug/draw.h" +#include "utils/flags.h" namespace mindspore { using mindspore::abstract::AbstractFunction; @@ -75,7 +75,12 @@ void FuncGraph::set_output(const AnfNodePtr &value, bool force_new_ret) { input0->set_abstract(f); } -void FuncGraph::DumpFuncGraph(const std::string &path) { draw::Draw(path + ".dot", shared_from_base()); } +void FuncGraph::DumpFuncGraph(const std::string &path) { + // draw::Draw(path + ".dot", shared_from_base()); + if (drawer_) { + drawer_(path + ".dot", shared_from_base()); + } +} void FuncGraph::GenerateVarParams(const FuncGraphPtr &specialized_graph, std::vector *specialized_parameter_list, diff --git a/mindspore/core/ir/graph_utils.cc b/mindspore/core/ir/graph_utils.cc index 955856034..cde5eaafb 100644 --- a/mindspore/core/ir/graph_utils.cc +++ b/mindspore/core/ir/graph_utils.cc @@ -30,7 +30,7 @@ #include "ir/func_graph.h" #include "utils/log_adapter.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { std::vector TopoSort(const AnfNodePtr &root, const SuccFunc &succ, const IncludeFunc &include) { diff --git a/mindspore/core/ir/graph_utils_extends.cc b/mindspore/core/ir/graph_utils_extends.cc index e9f8f3e2d..1662e6111 100644 --- a/mindspore/core/ir/graph_utils_extends.cc +++ b/mindspore/core/ir/graph_utils_extends.cc @@ -30,7 +30,7 @@ #include "ir/func_graph.h" #include "utils/label.h" #include "utils/log_adapter.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace { diff --git a/mindspore/core/ir/meta_func_graph.cc b/mindspore/core/ir/meta_func_graph.cc index 49a567a18..141b495a3 100644 --- a/mindspore/core/ir/meta_func_graph.cc +++ b/mindspore/core/ir/meta_func_graph.cc @@ -18,7 +18,7 @@ #include "ir/meta_func_graph.h" #include "base/core_ops.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "abstract/abstract_function.h" // namespace to support intermediate representation definition diff --git a/mindspore/core/ir/value.h b/mindspore/core/ir/value.h index 02dd7ba56..6288aa6c6 100644 --- a/mindspore/core/ir/value.h +++ b/mindspore/core/ir/value.h @@ -31,7 +31,7 @@ #include "ir/scalar.h" #include "ir/dtype/ref.h" #include "utils/hashing.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { class ValueSequeue : public Value { diff --git a/mindspore/core/utils/CMakeLists.txt b/mindspore/core/utils/CMakeLists.txt index b52a6591f..f90d1b426 100644 --- a/mindspore/core/utils/CMakeLists.txt +++ b/mindspore/core/utils/CMakeLists.txt @@ -1,3 +1,3 @@ file(GLOB_RECURSE _UTIL_ALL_SRC_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "*.cc") -set_property(SOURCE ${_UTIL_ALL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_IR) +set_property(SOURCE ${_UTIL_ALL_SRC_FILES} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_UTILS) add_library(_mindspore_core_utils_obj OBJECT ${_UTIL_ALL_SRC_FILES}) diff --git a/mindspore/core/utils/ms_context.cc b/mindspore/core/utils/ms_context.cc new file mode 100644 index 000000000..a1ad034c0 --- /dev/null +++ b/mindspore/core/utils/ms_context.cc @@ -0,0 +1,158 @@ +/** + * Copyright 2019 Huawei Technologies Co., Ltd + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +#include "utils/ms_context.h" +#include +#include +#include +#include "ir/tensor.h" +#include "utils/ms_utils.h" + +namespace mindspore { +std::atomic thread_1_must_end(false); + +std::shared_ptr MsContext::inst_context_ = nullptr; +std::map MsContext::policy_map_ = {{"ge", kMsBackendGePrior}, + {"vm", kMsBackendVmOnly}, + {"ms", kMsBackendMsPrior}, + {"ge_only", kMsBackendGeOnly}, + {"vm_prior", kMsBackendVmPrior}}; + +MsContext::MsContext(const std::string &policy, const std::string &target) { + save_graphs_flag_ = false; + save_graphs_path_ = "."; + enable_dump_ = false; + save_dump_path_ = "."; + tsd_ref_ = 0; + ge_ref_ = 0; + is_multi_graph_sink_ = false; + is_pynative_ge_init_ = false; + enable_reduce_precision_ = true; + auto env_device = common::GetEnv("DEVICE_ID"); + if (!env_device.empty()) { + device_id_ = UlongToUint(std::stoul(env_device.c_str())); + } else { + device_id_ = 0; + } + backend_policy_ = policy_map_[policy]; + device_target_ = target; + execution_mode_ = kPynativeMode; + enable_task_sink_ = true; + ir_fusion_flag_ = true; + enable_hccl_ = false; +#ifdef ENABLE_DEBUGGER + enable_mem_reuse_ = false; +#else + enable_mem_reuse_ = true; +#endif + enable_gpu_summary_ = true; + precompile_only_ = false; + auto_mixed_precision_flag_ = false; + enable_pynative_infer_ = false; + enable_pynative_hook_ = false; + enable_dynamic_mem_pool_ = true; + graph_memory_max_size_ = "0"; + variable_memory_max_size_ = "0"; + enable_loop_sink_ = target == kAscendDevice || target == kDavinciDevice; + profiling_mode_ = false; + profiling_options_ = "training_trace"; + check_bprop_flag_ = false; + max_device_memory_ = kDefaultMaxDeviceMemory; + print_file_path_ = ""; + enable_graph_kernel_ = false; + enable_sparse_ = false; +} + +std::shared_ptr MsContext::GetInstance() { + if (inst_context_ == nullptr) { + MS_LOG(DEBUG) << "Create new mindspore context"; + if (device_type_seter_) { + device_type_seter_(inst_context_); + } + } + return inst_context_; +} + +bool MsContext::set_backend_policy(const std::string &policy) { + if (policy_map_.find(policy) == policy_map_.end()) { + MS_LOG(ERROR) << "invalid backend policy name: " << policy; + return false; + } + backend_policy_ = policy_map_[policy]; + MS_LOG(INFO) << "ms set context backend policy:" << policy; + return true; +} + +std::string MsContext::backend_policy() const { + auto res = std::find_if( + policy_map_.begin(), policy_map_.end(), + [&, this](const std::pair &item) { return item.second == backend_policy_; }); + if (res != policy_map_.end()) { + return res->first; + } + return "unknown"; +} + +void MsContext::set_execution_mode(int execution_mode) { + if (execution_mode != kGraphMode && execution_mode != kPynativeMode) { + MS_LOG(EXCEPTION) << "The execution mode is invalid!"; + } + execution_mode_ = execution_mode; +} + +bool MsContext::set_device_target(const std::string &target) { + if (kTargetSet.find(target) == kTargetSet.end()) { + MS_LOG(ERROR) << "invalid device target name: " << target; + return false; + } + if (target == kDavinciDevice) { + device_target_ = kAscendDevice; + } else { + device_target_ = target; + } + if (seter_) { + seter_(device_target_); + } + MS_LOG(INFO) << "ms set context device target:" << target; + return true; +} + +bool MsContext::set_device_id(uint32_t device_id) { + device_id_ = device_id; + MS_LOG(INFO) << "ms set context device id:" << device_id; + return true; +} + +void MsContext::set_tsd_ref(const std::string &op) { + if (op == "--") { + tsd_ref_--; + } else if (op == "++") { + tsd_ref_++; + } else { + tsd_ref_ = 0; + } +} + +void MsContext::set_ge_ref(const std::string &op) { + if (op == "--") { + ge_ref_--; + } else if (op == "++") { + ge_ref_++; + } else { + ge_ref_ = 0; + } +} +} // namespace mindspore diff --git a/mindspore/ccsrc/utils/context/ms_context.h b/mindspore/core/utils/ms_context.h similarity index 88% rename from mindspore/ccsrc/utils/context/ms_context.h rename to mindspore/core/utils/ms_context.h index 489277f06..9ad3259b2 100644 --- a/mindspore/ccsrc/utils/context/ms_context.h +++ b/mindspore/core/utils/ms_context.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_UTILS_CONTEXT_MS_CONTEXT_H_ -#define MINDSPORE_CCSRC_UTILS_CONTEXT_MS_CONTEXT_H_ +#ifndef MINDSPORE_CORE_UTILS_MS_CONTEXT_H_ +#define MINDSPORE_CORE_UTILS_MS_CONTEXT_H_ #include #include #include @@ -26,7 +26,6 @@ #include "utils/log_adapter.h" namespace mindspore { - enum MsBackendPolicy { kMsBackendGeOnly = 0, kMsBackendVmOnly = 1, @@ -50,10 +49,12 @@ const float kDefaultMaxDeviceMemory = 1024; class MsContext { public: + MsContext(const std::string &backend_policy, const std::string &target); ~MsContext() = default; MsContext(const MsContext &) = delete; MsContext &operator=(const MsContext &) = delete; - + using DeviceSeter = std::function; + using DeviceTypeSeter = std::function &)>; static std::shared_ptr GetInstance(); std::string backend_policy() const; @@ -85,18 +86,10 @@ class MsContext { std::string save_graphs_path() const { return save_graphs_path_; } void set_save_graphs_path(const std::string &save_paths) { save_graphs_path_ = save_paths; } - bool OpenTsd(); - bool CloseTsd(bool force = false); - bool IsTsdOpened(); - bool InitGe(); - bool FinalizeGe(bool force = false); - bool IsGeInited(); + bool IsGeInited() { return ge_ref_ > 0; } void set_enable_hccl(bool enable_hccl) { enable_hccl_ = enable_hccl; } bool enable_hccl() const { return enable_hccl_; } - bool PynativeInitGe(); - bool ir_fusion_flag() const { return ir_fusion_flag_; } - bool loop_sink_flag() const { return enable_loop_sink_; } void set_loop_sink_flag(bool enable_loop_sink) { enable_loop_sink_ = enable_loop_sink; } void set_enable_mem_reuse(bool enable_mem_reuse) { enable_mem_reuse_ = enable_mem_reuse; } @@ -120,6 +113,14 @@ class MsContext { std::string save_dump_path() const { return save_dump_path_; } bool IsTsdOpened() const { return tsd_ref_ > 0; } + void set_tsd_ref(const std::string &op); + uint32_t tsd_ref() const { return tsd_ref_; } + + void set_ge_ref(const std::string &op); + uint32_t ge_ref() const { return ge_ref_; } + + bool is_pynative_ge_init() { return is_pynative_ge_init_; } + void set_pynative_ge_init(bool flag) { is_pynative_ge_init_ = flag; } bool is_multi_graph_sink() const { return is_multi_graph_sink_; } void set_is_multi_graph_sink(bool flag) { is_multi_graph_sink_ = flag; } @@ -157,13 +158,14 @@ class MsContext { bool enable_sparse() const { return enable_sparse_; } void set_enable_sparse(bool enable_sparse) { enable_sparse_ = enable_sparse; } + static void device_seter(DeviceSeter device) { seter_ = device; } + static void device_type_seter(DeviceTypeSeter device_type) { device_type_seter_ = device_type; } - private: - MsContext(const std::string &backend_policy, const std::string &target); - void GetGeOptions(std::map *ge_options) const; - void SetDisableReuseMemoryFlag(std::map *ge_options) const; - void SetHcclOptions(std::map *ge_options) const; + std::thread tdt_print_; + private: + inline static DeviceSeter seter_ = nullptr; + inline static DeviceTypeSeter device_type_seter_ = nullptr; static std::shared_ptr inst_context_; static std::map policy_map_; MsBackendPolicy backend_policy_; @@ -192,7 +194,6 @@ class MsContext { bool enable_dynamic_mem_pool_; std::string graph_memory_max_size_; std::string variable_memory_max_size_; - std::thread tdt_print_; bool profiling_mode_; std::string profiling_options_; bool check_bprop_flag_; @@ -201,7 +202,6 @@ class MsContext { bool enable_graph_kernel_; bool enable_sparse_; }; - } // namespace mindspore -#endif // MINDSPORE_CCSRC_UTILS_CONTEXT_MS_CONTEXT_H_ +#endif // MINDSPORE_CORE_UTILS_MS_CONTEXT_H_ diff --git a/mindspore/ccsrc/common/utils.cc b/mindspore/core/utils/ms_utils.cc similarity index 97% rename from mindspore/ccsrc/common/utils.cc rename to mindspore/core/utils/ms_utils.cc index 7109c121e..f6a1567a7 100644 --- a/mindspore/ccsrc/common/utils.cc +++ b/mindspore/core/utils/ms_utils.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "common/utils.h" +#include "utils/ms_utils.h" #include #include #include diff --git a/mindspore/ccsrc/common/utils.h b/mindspore/core/utils/ms_utils.h similarity index 100% rename from mindspore/ccsrc/common/utils.h rename to mindspore/core/utils/ms_utils.h diff --git a/mindspore/lite/src/train/train_session.cc b/mindspore/lite/src/train/train_session.cc index 8f114a1ea..c92473e17 100644 --- a/mindspore/lite/src/train/train_session.cc +++ b/mindspore/lite/src/train/train_session.cc @@ -18,7 +18,7 @@ #include "mindspore/lite/src/train/train_session.h" #include "mindspore/lite/src/kernel_factory.h" #include "mindspore/lite/src/param_value_lite.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "mindspore/lite/src/ops/ops.h" #include "ir/anf.h" #include "mindspore/lite/src/ir/tensor.h" diff --git a/mindspore/lite/test/CMakeLists.txt b/mindspore/lite/test/CMakeLists.txt index a5d46bad2..baac3a35c 100644 --- a/mindspore/lite/test/CMakeLists.txt +++ b/mindspore/lite/test/CMakeLists.txt @@ -51,6 +51,7 @@ if(BUILD_CONVERTER) ${CMAKE_CURRENT_SOURCE_DIR}/../../core/utils/label.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../core/utils/info.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../core/utils/profile.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../../core/utils/ms_context.cc # core/abstract ${CMAKE_CURRENT_SOURCE_DIR}/../../core/abstract/abstract_function.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../core/abstract/analysis_context.cc @@ -61,7 +62,7 @@ if(BUILD_CONVERTER) ## ccsrc ${CCSRC_DIR}/debug/draw.cc ${CCSRC_DIR}/pybind_api/export_flags.cc - ${CCSRC_DIR}/utils/context/ms_context.cc + ${CCSRC_DIR}/utils/context/context_extends.cc ${CCSRC_DIR}/frontend/parallel/costmodel_context.cc ${CMAKE_CURRENT_SOURCE_DIR}/../src/common/graph_utils_extends.cc ) diff --git a/mindspore/lite/tools/converter/CMakeLists.txt b/mindspore/lite/tools/converter/CMakeLists.txt index 74fc5c16b..9dec33473 100644 --- a/mindspore/lite/tools/converter/CMakeLists.txt +++ b/mindspore/lite/tools/converter/CMakeLists.txt @@ -43,10 +43,11 @@ set(ANF_SRC ${CMAKE_CURRENT_SOURCE_DIR}/../../../core/utils/label.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../../core/utils/info.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../../core/utils/profile.cc + ${CMAKE_CURRENT_SOURCE_DIR}/../../../core/utils/ms_context.cc ## ccsrc ${CCSRC_DIR}/debug/draw.cc ${CCSRC_DIR}/pybind_api/export_flags.cc - ${CCSRC_DIR}/utils/context/ms_context.cc + ${CCSRC_DIR}/utils/context/context_extends.cc ${CCSRC_DIR}/frontend/parallel/costmodel_context.cc ${CMAKE_CURRENT_SOURCE_DIR}/../../src/common/graph_utils_extends.cc ) diff --git a/tests/ut/cpp/common/backend_common_test.h b/tests/ut/cpp/common/backend_common_test.h index f5bfc9d6d..aeeccef2b 100644 --- a/tests/ut/cpp/common/backend_common_test.h +++ b/tests/ut/cpp/common/backend_common_test.h @@ -16,7 +16,7 @@ #ifndef TESTS_UT_CPP_COMMON_UT_BACKEND_COMMON_H_ #define TESTS_UT_CPP_COMMON_UT_BACKEND_COMMON_H_ #include "common/common_test.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/session/kernel_graph.h" namespace mindspore { diff --git a/tests/ut/cpp/dataset/batch_op_test.cc b/tests/ut/cpp/dataset/batch_op_test.cc index 2fc7d9cd4..69090ec6b 100644 --- a/tests/ut/cpp/dataset/batch_op_test.cc +++ b/tests/ut/cpp/dataset/batch_op_test.cc @@ -18,7 +18,7 @@ #include #include "minddata/dataset/core/client.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "minddata/dataset/core/global_context.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/c_api_test.cc b/tests/ut/cpp/dataset/c_api_test.cc index f302854c0..2cb3064cb 100644 --- a/tests/ut/cpp/dataset/c_api_test.cc +++ b/tests/ut/cpp/dataset/c_api_test.cc @@ -20,7 +20,7 @@ #include #include "utils/log_adapter.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "common/common.h" #include "gtest/gtest.h" #include "securec.h" diff --git a/tests/ut/cpp/dataset/cifar_op_test.cc b/tests/ut/cpp/dataset/cifar_op_test.cc index ed22f4f34..0b6b4099a 100644 --- a/tests/ut/cpp/dataset/cifar_op_test.cc +++ b/tests/ut/cpp/dataset/cifar_op_test.cc @@ -19,7 +19,7 @@ #include #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/client.h" #include "minddata/dataset/core/global_context.h" #include "minddata/dataset/engine/datasetops/source/cifar_op.h" diff --git a/tests/ut/cpp/dataset/circular_pool_test.cc b/tests/ut/cpp/dataset/circular_pool_test.cc index d06f84668..ecad6e4d7 100644 --- a/tests/ut/cpp/dataset/circular_pool_test.cc +++ b/tests/ut/cpp/dataset/circular_pool_test.cc @@ -19,7 +19,7 @@ #include "minddata/dataset/util/circular_pool.h" #include "minddata/dataset/util/services.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "utils/log_adapter.h" #include "./securec.h" diff --git a/tests/ut/cpp/dataset/clue_op_test.cc b/tests/ut/cpp/dataset/clue_op_test.cc index 0935434a0..170e54b7f 100644 --- a/tests/ut/cpp/dataset/clue_op_test.cc +++ b/tests/ut/cpp/dataset/clue_op_test.cc @@ -19,7 +19,7 @@ #include "minddata/dataset/core/client.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "minddata/dataset/engine/datasetops/source/clue_op.h" diff --git a/tests/ut/cpp/dataset/coco_op_test.cc b/tests/ut/cpp/dataset/coco_op_test.cc index 6e6d3c26e..3c786e6f8 100644 --- a/tests/ut/cpp/dataset/coco_op_test.cc +++ b/tests/ut/cpp/dataset/coco_op_test.cc @@ -19,7 +19,7 @@ #include #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/client.h" #include "minddata/dataset/core/global_context.h" #include "minddata/dataset/engine/datasetops/source/coco_op.h" diff --git a/tests/ut/cpp/dataset/common/bboxop_common.cc b/tests/ut/cpp/dataset/common/bboxop_common.cc index 29324c928..b16c4c061 100644 --- a/tests/ut/cpp/dataset/common/bboxop_common.cc +++ b/tests/ut/cpp/dataset/common/bboxop_common.cc @@ -25,7 +25,7 @@ #include "./tinyxml2.h" #include "opencv2/opencv.hpp" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/cv_tensor.h" #include "minddata/dataset/util/path.h" #include "minddata/dataset/core/constants.h" diff --git a/tests/ut/cpp/dataset/common/cvop_common.cc b/tests/ut/cpp/dataset/common/cvop_common.cc index 9b5d76067..28d0c0776 100644 --- a/tests/ut/cpp/dataset/common/cvop_common.cc +++ b/tests/ut/cpp/dataset/common/cvop_common.cc @@ -19,7 +19,7 @@ #include #include "cvop_common.h" #include "minddata/dataset/core/constants.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/cv_tensor.h" #include "utils/log_adapter.h" #include diff --git a/tests/ut/cpp/dataset/concat_op_test.cc b/tests/ut/cpp/dataset/concat_op_test.cc index 9e991ce0d..7c6d84754 100644 --- a/tests/ut/cpp/dataset/concat_op_test.cc +++ b/tests/ut/cpp/dataset/concat_op_test.cc @@ -18,7 +18,7 @@ #include #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/client.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/csv_op_test.cc b/tests/ut/cpp/dataset/csv_op_test.cc index 2eae7b98f..4c01af965 100644 --- a/tests/ut/cpp/dataset/csv_op_test.cc +++ b/tests/ut/cpp/dataset/csv_op_test.cc @@ -19,7 +19,7 @@ #include "minddata/dataset/core/client.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "minddata/dataset/engine/datasetops/source/csv_op.h" diff --git a/tests/ut/cpp/dataset/image_folder_op_test.cc b/tests/ut/cpp/dataset/image_folder_op_test.cc index 768d0d834..2cce023dc 100644 --- a/tests/ut/cpp/dataset/image_folder_op_test.cc +++ b/tests/ut/cpp/dataset/image_folder_op_test.cc @@ -18,7 +18,7 @@ #include #include #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/client.h" #include "minddata/dataset/core/global_context.h" #include "minddata/dataset/engine/datasetops/source/image_folder_op.h" diff --git a/tests/ut/cpp/dataset/manifest_op_test.cc b/tests/ut/cpp/dataset/manifest_op_test.cc index 63ad4f44c..0d6621bfa 100644 --- a/tests/ut/cpp/dataset/manifest_op_test.cc +++ b/tests/ut/cpp/dataset/manifest_op_test.cc @@ -19,7 +19,7 @@ #include #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/client.h" #include "minddata/dataset/core/global_context.h" #include "minddata/dataset/engine/datasetops/source/manifest_op.h" diff --git a/tests/ut/cpp/dataset/mind_record_op_test.cc b/tests/ut/cpp/dataset/mind_record_op_test.cc index b5f08d8f1..bed97a740 100644 --- a/tests/ut/cpp/dataset/mind_record_op_test.cc +++ b/tests/ut/cpp/dataset/mind_record_op_test.cc @@ -18,7 +18,7 @@ #include #include "minddata/dataset/core/client.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "minddata/mindrecord/include/shard_category.h" #include "minddata/mindrecord/include/shard_error.h" diff --git a/tests/ut/cpp/dataset/mnist_op_test.cc b/tests/ut/cpp/dataset/mnist_op_test.cc index dfceeaa06..c40086e20 100644 --- a/tests/ut/cpp/dataset/mnist_op_test.cc +++ b/tests/ut/cpp/dataset/mnist_op_test.cc @@ -18,7 +18,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "common/common.h" #include "minddata/dataset/core/client.h" #include "minddata/dataset/core/global_context.h" diff --git a/tests/ut/cpp/dataset/project_op_test.cc b/tests/ut/cpp/dataset/project_op_test.cc index 45ef11b88..5bdb2923d 100644 --- a/tests/ut/cpp/dataset/project_op_test.cc +++ b/tests/ut/cpp/dataset/project_op_test.cc @@ -18,7 +18,7 @@ #include #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/client.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/rename_op_test.cc b/tests/ut/cpp/dataset/rename_op_test.cc index 56d3c01f6..6a1de176d 100644 --- a/tests/ut/cpp/dataset/rename_op_test.cc +++ b/tests/ut/cpp/dataset/rename_op_test.cc @@ -21,7 +21,7 @@ #include "minddata/dataset/core/constants.h" #include "minddata/dataset/engine/datasetops/rename_op.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/engine/data_buffer.h" #include "gtest/gtest.h" #include "minddata/dataset/core/global_context.h" diff --git a/tests/ut/cpp/dataset/schema_test.cc b/tests/ut/cpp/dataset/schema_test.cc index 95b9c75d9..d4c47cdf5 100644 --- a/tests/ut/cpp/dataset/schema_test.cc +++ b/tests/ut/cpp/dataset/schema_test.cc @@ -18,7 +18,7 @@ #include #include #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/client.h" #include "minddata/dataset/core/global_context.h" #include "minddata/dataset/engine/data_schema.h" diff --git a/tests/ut/cpp/dataset/shuffle_op_test.cc b/tests/ut/cpp/dataset/shuffle_op_test.cc index 98b4878ef..45d2d7f60 100644 --- a/tests/ut/cpp/dataset/shuffle_op_test.cc +++ b/tests/ut/cpp/dataset/shuffle_op_test.cc @@ -15,7 +15,7 @@ */ #include "minddata/dataset/core/client.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include diff --git a/tests/ut/cpp/dataset/take_op_test.cc b/tests/ut/cpp/dataset/take_op_test.cc index a8bfe40b1..156a76e9c 100644 --- a/tests/ut/cpp/dataset/take_op_test.cc +++ b/tests/ut/cpp/dataset/take_op_test.cc @@ -18,7 +18,7 @@ #include #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/client.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/tensorshape_test.cc b/tests/ut/cpp/dataset/tensorshape_test.cc index 65ab386db..7eec95b08 100644 --- a/tests/ut/cpp/dataset/tensorshape_test.cc +++ b/tests/ut/cpp/dataset/tensorshape_test.cc @@ -20,7 +20,7 @@ #include "minddata/dataset/core/tensor_shape.h" #include "minddata/dataset/engine/data_schema.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/text_file_op_test.cc b/tests/ut/cpp/dataset/text_file_op_test.cc index bc2674a6a..9450ac7b9 100644 --- a/tests/ut/cpp/dataset/text_file_op_test.cc +++ b/tests/ut/cpp/dataset/text_file_op_test.cc @@ -19,7 +19,7 @@ #include "minddata/dataset/core/client.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "minddata/dataset/engine/datasetops/source/text_file_op.h" diff --git a/tests/ut/cpp/dataset/tfReader_op_test.cc b/tests/ut/cpp/dataset/tfReader_op_test.cc index 30fde33ff..9f0919cd9 100644 --- a/tests/ut/cpp/dataset/tfReader_op_test.cc +++ b/tests/ut/cpp/dataset/tfReader_op_test.cc @@ -20,7 +20,7 @@ #include "minddata/dataset/core/client.h" #include "minddata/dataset/engine/data_schema.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" diff --git a/tests/ut/cpp/dataset/voc_op_test.cc b/tests/ut/cpp/dataset/voc_op_test.cc index 4bb212ffc..294703d60 100644 --- a/tests/ut/cpp/dataset/voc_op_test.cc +++ b/tests/ut/cpp/dataset/voc_op_test.cc @@ -19,7 +19,7 @@ #include #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/core/client.h" #include "minddata/dataset/core/global_context.h" #include "minddata/dataset/engine/datasetops/source/voc_op.h" diff --git a/tests/ut/cpp/dataset/zip_op_test.cc b/tests/ut/cpp/dataset/zip_op_test.cc index 90b363b35..b55578f67 100644 --- a/tests/ut/cpp/dataset/zip_op_test.cc +++ b/tests/ut/cpp/dataset/zip_op_test.cc @@ -27,7 +27,7 @@ #include "minddata/dataset/core/tensor.h" #include "minddata/dataset/core/config_manager.h" #include "common/common.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "minddata/dataset/engine/data_buffer.h" #include "gtest/gtest.h" #include "minddata/dataset/core/global_context.h" diff --git a/tests/ut/cpp/mindrecord/ut_common.h b/tests/ut/cpp/mindrecord/ut_common.h index ee943ab88..79c76c0a0 100644 --- a/tests/ut/cpp/mindrecord/ut_common.h +++ b/tests/ut/cpp/mindrecord/ut_common.h @@ -22,7 +22,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "minddata/mindrecord/include/shard_index.h" diff --git a/tests/ut/cpp/mindrecord/ut_shard_operator_test.cc b/tests/ut/cpp/mindrecord/ut_shard_operator_test.cc index 4501ea080..2137fb4a1 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_operator_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_operator_test.cc @@ -21,7 +21,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "minddata/mindrecord/include/shard_category.h" diff --git a/tests/ut/cpp/mindrecord/ut_shard_reader_test.cc b/tests/ut/cpp/mindrecord/ut_shard_reader_test.cc index ce7cb1ba5..fb0e8470c 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_reader_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_reader_test.cc @@ -21,7 +21,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "minddata/mindrecord/include/shard_reader.h" diff --git a/tests/ut/cpp/mindrecord/ut_shard_segment_test.cc b/tests/ut/cpp/mindrecord/ut_shard_segment_test.cc index 6b99e44d8..a4900a51f 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_segment_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_segment_test.cc @@ -27,7 +27,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "minddata/mindrecord/include/shard_segment.h" diff --git a/tests/ut/cpp/mindrecord/ut_shard_writer_test.cc b/tests/ut/cpp/mindrecord/ut_shard_writer_test.cc index 046b4f93d..a8abe5e98 100644 --- a/tests/ut/cpp/mindrecord/ut_shard_writer_test.cc +++ b/tests/ut/cpp/mindrecord/ut_shard_writer_test.cc @@ -21,7 +21,7 @@ #include #include -#include "common/utils.h" +#include "utils/ms_utils.h" #include "gtest/gtest.h" #include "utils/log_adapter.h" #include "minddata/mindrecord/include/shard_reader.h" 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 2b61a4904..c8909455d 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 @@ -26,7 +26,7 @@ #include "backend/optimizer/ascend/format_type/insert_cast.h" #include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace opt { 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 4e3a29bf3..fbb3733c9 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 @@ -21,7 +21,7 @@ #include "backend/optimizer/common/pass_manager.h" #include "backend/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #define private public #define protected public 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 18ec4c415..f1a1dbe02 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 @@ -20,7 +20,7 @@ #include "backend/session/anf_runtime_algorithm.h" #include "backend/kernel_compiler/oplib/oplib.h" #include "debug/anf_ir_dump.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #define private public #define protected public 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 23fa05f62..5f16016d2 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 @@ -19,7 +19,7 @@ #include "runtime/device/kernel_info.h" #include "backend/session/anf_runtime_algorithm.h" #include "backend/kernel_compiler/oplib/oplib.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #define private public #define protected public #include "backend/optimizer/ascend/format_type/insert_trans_op.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 d0aaa9ed2..5bccf5207 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 @@ -26,7 +26,7 @@ #include "frontend/operator/ops.h" #include "utils/log_adapter.h" #include "backend/session/anf_runtime_algorithm.h" -#include "common/utils.h" +#include "utils/ms_utils.h" #include "pipeline/jit/resource.h" #include "backend/optimizer/mem_reuse/mem_reuse.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 02e1865a8..35b767d4d 100644 --- a/tests/ut/cpp/pre_activate/pass/allreduce_fusion_test.cc +++ b/tests/ut/cpp/pre_activate/pass/allreduce_fusion_test.cc @@ -26,7 +26,7 @@ #include "backend/optimizer/common/pass_manager.h" #include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace opt { 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 cfcc34970..bbe9d45d6 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 @@ -26,7 +26,7 @@ #include "backend/optimizer/pass/common_subexpression_elimination.h" #include "backend/kernel_compiler/kernel_build_info.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" namespace mindspore { namespace opt { 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 25e4b3c11..59549d3c3 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 @@ -22,7 +22,7 @@ #include "backend/optimizer/common/pass_manager.h" #include "backend/optimizer/pass/const_to_attr_strided_slice_grad.h" #include "utils/utils.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace opt { 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 ac3272317..2b595f156 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 @@ -22,7 +22,7 @@ #include "backend/optimizer/common/pass_manager.h" #include "backend/optimizer/pass/convert_const_input_to_attr.h" #include "utils/utils.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace opt { 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 3e543d7a6..60d99d2da 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 @@ -27,10 +27,10 @@ #include "backend/optimizer/common/optimizer.h" #include "backend/optimizer/common/pass_manager.h" #include "utils/utils.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "backend/session/anf_runtime_algorithm.h" #include "runtime/device/kernel_info.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #define private public #define protected public diff --git a/tests/ut/cpp/pynative/pynative_execute_test.cc b/tests/ut/cpp/pynative/pynative_execute_test.cc index acc34acdd..c3c848423 100644 --- a/tests/ut/cpp/pynative/pynative_execute_test.cc +++ b/tests/ut/cpp/pynative/pynative_execute_test.cc @@ -20,7 +20,7 @@ #include "pipeline/jit/parse/data_converter.h" #include "frontend/operator/ops.h" #include "pipeline/pynative/pynative_execute.h" -#include "utils/context/ms_context.h" +#include "utils/ms_context.h" #include "utils/utils.h" namespace py = pybind11; diff --git a/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc b/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc index 87ab543c7..0b91bbdd3 100755 --- a/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc +++ b/tests/ut/cpp/stub/kernel/kernel_fusion_stub.cc @@ -15,7 +15,7 @@ */ #include "backend/kernel_compiler/kernel_fusion.h" #include "backend/kernel_compiler/tbe/tbe_kernel_mod.h" -#include "common/utils.h" +#include "utils/ms_utils.h" namespace mindspore { namespace kernel { -- GitLab