!3938 decoupling core and context

Merge pull request !3938 from liubuyu/master

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"

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<ge::model_runner::AicpuTaskInfo>;
 

mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_build.cc

@@ -31,7 +31,7 @@
 #include <iterator>
 #include <numeric>
 #include <unordered_set>
-#include "common/utils.h"
+#include "utils/ms_utils.h"
 #include "utils/convert_utils.h"
 #include "utils/any.h"
 #include "utils/utils.h"

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 {

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 {

mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.cc

@@ -18,7 +18,7 @@
 #include <fstream>
 #include <algorithm>
 #include "nlohmann/json.hpp"
-#include "common/utils.h"
+#include "utils/ms_utils.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/common_utils.cc

@@ -24,7 +24,7 @@
 #include <thread>
 #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"

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 {

mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel_factory.h

@@ -23,7 +23,7 @@
 #include <utility>
 #include <vector>
 
-#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"
 

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

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 <string>
-#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"
 

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 <string>
-#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"
 

mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.cc

@@ -17,7 +17,7 @@
 #include <string>
 #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 {

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 <string>
-#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"
 

mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.cc

@@ -18,7 +18,7 @@
 #include <cmath>
 #include <numeric>
 #include <string>
-#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"
 

mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.cc

@@ -17,7 +17,7 @@
 #include <algorithm>
 #include <utility>
 #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 {

mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.cc

@@ -17,7 +17,7 @@
 #include <vector>
 #include <string>
 #include <algorithm>
-#include "common/utils.h"
+#include "utils/ms_utils.h"
 #include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
 
 namespace mindspore {

mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h

@@ -23,7 +23,7 @@
 #include <vector>
 #include <memory>
 #include "dnnl.hpp"
-#include "common/utils.h"
+#include "utils/ms_utils.h"
 
 namespace mindspore {
 namespace kernel {

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 {

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 <string>
 #include <algorithm>
-#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"
 

mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.cc

@@ -17,7 +17,7 @@
 #include <string>
 #include <utility>
 #include <algorithm>
-#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"
 

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 {

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 {

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 {

mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.cc

@@ -19,7 +19,7 @@
 #include <cmath>
 #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 {

mindspore/ccsrc/backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.cc

@@ -19,7 +19,7 @@
 #include <cmath>
 #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 {

mindspore/ccsrc/backend/kernel_compiler/gpu/gpu_kernel_factory.cc

@@ -19,7 +19,7 @@
 #include <iostream>
 #include <string>
 
-#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"

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<ge::model_runner::HcclTaskInfo>;
 using ge::model_runner::HcclTaskInfo;

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 {

mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_broadcast.cc

@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 
-#include "utils/context/ms_context.h"
+#include "utils/ms_context.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_gather.cc

@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 
-#include "utils/context/ms_context.h"
+#include "utils/ms_context.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce.cc

@@ -20,7 +20,7 @@
 #include <memory>
 #include <string>
 
-#include "utils/context/ms_context.h"
+#include "utils/ms_context.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/hccl/hcom_all_reduce_scatter.cc

@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 
-#include "utils/context/ms_context.h"
+#include "utils/ms_context.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.cc

@@ -21,7 +21,7 @@
 #include <memory>
 #include <utility>
 
-#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"

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 {

mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc

@@ -22,7 +22,7 @@
 #include <fstream>
 #include "utils/log_adapter.h"
 #include "utils/overload.h"
-#include "utils/context/ms_context.h"
+#include "utils/ms_context.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <memory>
 #include <nlohmann/json.hpp>
-#include "common/utils.h"
+#include "utils/ms_utils.h"
 #include "backend/kernel_compiler/oplib/opinfo.h"
 
 namespace mindspore {

mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc

@@ -19,7 +19,7 @@
 #include <memory>
 
 #include "runtime/mem.h"
-#include "common/utils.h"
+#include "utils/ms_utils.h"
 
 using ge::model_runner::MemcpyAsyncTaskInfo;
 using MemcpyAsyncTaskInfoPtr = std::shared_ptr<MemcpyAsyncTaskInfo>;

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<LabelGotoTaskInfo>;

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<LabelSetTaskInfo>;

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<LabelSwitchTaskInfo>;

mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc

@@ -20,10 +20,10 @@
 #include <string>
 
 #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<MemcpyAsyncTaskInfo>;

mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc

@@ -17,11 +17,11 @@
 #include "backend/kernel_compiler/rts/recv.h"
 #include <memory>
 #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 {

mindspore/ccsrc/backend/kernel_compiler/rts/rt_kernel_info.cc

@@ -19,7 +19,7 @@
 #include <algorithm>
 #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 {

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<EventRecordTaskInfo>;

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<StreamActiveTaskInfo>;

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<StreamSwitchTaskInfo>;

mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_convert_utils.cc

@@ -21,7 +21,7 @@
 #include <string>
 
 #include "backend/session/anf_runtime_algorithm.h"
-#include "common/utils.h"
+#include "utils/ms_utils.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_mod.cc

@@ -17,7 +17,7 @@
 #include "backend/kernel_compiler/tbe/tbe_kernel_mod.h"
 #include <algorithm>
 #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 {

mindspore/ccsrc/backend/kernel_compiler/tbe/tbe_kernel_parallel_build.cc

@@ -23,7 +23,7 @@
 #include <vector>
 #include <string>
 
-#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"

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"

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"

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"

mindspore/ccsrc/backend/optimizer/ascend/ascend_helper.cc

@@ -17,7 +17,7 @@
 #include "backend/optimizer/ascend/ascend_helper.h"
 #include <set>
 #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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

mindspore/ccsrc/backend/optimizer/ascend/buffer_fusion/fusion_base_pass.cc

@@ -17,7 +17,7 @@
 #include <unordered_set>
 #include <memory>
 #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"
 

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

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 {

mindspore/ccsrc/backend/optimizer/ascend/ir_fission/batch_norm_grad_split.cc

@@ -20,8 +20,8 @@
 #include <memory>
 
 #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"

mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_grad_split.cc

@@ -20,8 +20,8 @@
 #include <memory>
 
 #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"

mindspore/ccsrc/backend/optimizer/ascend/ir_fission/bn_split.cc

@@ -20,7 +20,7 @@
 #include <memory>
 
 #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"

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 {

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 {

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 {

mindspore/ccsrc/backend/optimizer/ascend/ir_fusion/input_to_output_registry.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include <utility>
 #include "ir/anf.h"
-#include "common/utils.h"
+#include "utils/ms_utils.h"
 
 namespace mindspore {
 namespace opt {

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 {

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 {

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 {

mindspore/ccsrc/backend/optimizer/common/helper.h

@@ -24,7 +24,7 @@
 #include <unordered_set>
 #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 {

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 {

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 {

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"
 

mindspore/ccsrc/backend/optimizer/pass/const_input_to_attr_registry.h

@@ -19,7 +19,7 @@
 #include <unordered_map>
 #include <unordered_set>
 
-#include "common/utils.h"
+#include "utils/ms_utils.h"
 
 namespace mindspore {
 namespace opt {

mindspore/ccsrc/backend/optimizer/pass/const_to_attr_strided_slice_grad.cc

@@ -18,7 +18,7 @@
 #include <vector>
 #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"

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"

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 {

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;

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"

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"

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"

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"
 

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;
@@ -233,7 +234,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;
   }
@@ -340,6 +341,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);
@@ -353,11 +358,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;
   }

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"

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