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 7e7fd20f3974e37e2045b84af1d00270d72a3d20..1e855f8fc0f01cef2fe191ea39832dd5d5aeabbf 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 e18b3169f316199865405f61e1cfccb5f38912fc..b2f992fc829980b57a50fca8a43f2cd95c8fe9ed 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<ge::model_runner::AicpuTaskInfo>;
 
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 9c13629b1bd8510661a2e1f7973bc39fb28c2430..033dfcf3da81f6fa9bff4f37fc6dff523e01e7a7 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 <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"
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 8bb4940778f0e2fe2b59ecc8be51ccae27c2c27c..8affa12c32012e0e673a8689786baafd16fd43c9 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 96fcd1869e4dba00d094db3694b705d3f7489cb1..e2cae2873abcbb5c6e597d3b5ebef1964fe8ed3a 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 d527f8ec7613e978edcfd254c8844fb21f73f461..65ba8b0b749468c92de593835595f22aed1e89ee 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 <fstream>
 #include <algorithm>
 #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 1e029f98919aaead5c45fa96082e94b3821401d0..38cb6afcd8432764d8220de4531703c9a40ffc1e 100644
--- a/mindspore/ccsrc/backend/kernel_compiler/common_utils.cc
+++ b/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"
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 c1ff8d54bdd32f6fcfcc75d0df5885da4789365f..76acf852d7b6ef0c7516a640d1289b59077d5702 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 2ee2e8d30e08715d62547c04ab5318695b76cd8a..90ab6f3ff0d1ee4350488d3915e53f6f3cc383f4 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 <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"
 
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 344f03cc53c12c04a40b8c798c02eb886f500d76..6bbf6c8a5de4f4bc388266f65de4d78febc8141a 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 834f489d797c7b2ede8e43faf1cc9d3325fc5f1f..25a01fdcacb5ea520daae8c674287ef44e61b53d 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 <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"
 
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 e2aff0c18c05081c4c42c42ea275e6753f664d53..077cf9a6190dba363e3ab1236c1c4ad5bb93236f 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 <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"
 
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 a1677905be6303693c6053be93a5d6bdd99330df..2073c5bf2085777dd7cf499161c39ce6509a6141 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 <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 {
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 3f4ba127b0330b3ef9cc91f354ddb916bdd94042..72ce1fd9c1bb45e42d57c819a57aeb9d364f37ec 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 <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"
 
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 9ffd67235d147bcbf4da035d994a96ac8c218f73..ea2ea9824df9d75669016e4b157db3594cd3dea3 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 <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"
 
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 4bbaa6459f5f445d79e6d47178d673c98a6a2222..ee9c4eb300c9c966de2476fb0d7a5440e5a0bc69 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 <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 {
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 49510d29e07d00622c3d350a8ff37bd5a8817a9b..7f66b81b82fffeca8e33f09359de2a4aa974861f 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 <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 {
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 99e7ecdfe047bad875636fbf39cfa1f833bad1c7..7e14b6681a48a9d60d65ff8ac912d5f8e642db05 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 <vector>
 #include <memory>
 #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 fddd769047a3087a0e664d4f9c6d46fa5facc7da..a59cc3c4b69e6321b6b3c40301f7186a38fe3a57 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 0bb1edde4de06f810f672b2c041f03082ac6438d..ad0ff274c1b073db7195aa17a16ff2b3f493c57b 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 <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"
 
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 1466b54452e248780f79ef57975ff65b39225b98..bd9bbe7b11aa550ca1540c60f8769c986eb8a618 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 <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"
 
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 29ac9a106289a78902200f04eeb6fb40f02c374a..558b2d706569967ccc2b074f38ada0a553f9b752 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 9139aa786242f7534603e97359ca568a99602b29..3188b0622cacaae396d49b664d920f910aab28be 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 94271b8a6999d8ebf239151f79bb820ef6904551..de9a8890dfb1e82f75a2ff29c9620c74db8ee620 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 889e2abdec8cb2a3bf2683eef08b7c63a82353ab..d6aadad436719c5f858b366c943d482fc86299d8 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 <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 {
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 b8bf7b318ac60117825786ee847d4bcf94de0c8a..b1299f1ae06cc9bdd5eb743fec25b1be79aa2892 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 <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 {
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 4a0191abd7426205ce5cde41c93a6811d6a7e1fc..8cd5a3c4eefbdfae1f8b657076d781f906adb2b9 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 <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"
diff --git a/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc b/mindspore/ccsrc/backend/kernel_compiler/hccl/hccl_kernel.cc
index 5ec4f52574ca99d2ce9291899671b08c5667a695..bf948498aa1390338d368bcd540e915cc1fdc8dc 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<ge::model_runner::HcclTaskInfo>;
 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 971caa27f35fff59416368b5aa7a841f235d3c49..330692e461f777b7241d64731ce3731fa8986337 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 e9fb4c9314b7bc3cb7a1ff6247b451e1760a9158..29f3e95481577b17a439425371a73404d52391cd 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 <string>
 #include <memory>
 
-#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 201071dcb5f335f212e135f680791263ece15c17..2502ec799bbd967ccc3ac7d6a44a13804b1093e8 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 <string>
 #include <memory>
 
-#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 533ce1b0874a6a7c1840c86dc47b18fceb05bd94..70857d6a6cdf189e0e9b8802a751cd1be61e0865 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 <memory>
 #include <string>
 
-#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 32c6dacb015ac1be7880fccd86595fdc5f193ae7..ca38f3e73b33b3fe20efad4c7fa2f60bcafd3dfc 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 <string>
 #include <memory>
 
-#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 60a95f5c12d4fa8e27699fb225e6bd5cc87b989f..d4ef905729c77d6eb4b78c89548ab87311540b7e 100644
--- a/mindspore/ccsrc/backend/kernel_compiler/kernel_fusion.cc
+++ b/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"
diff --git a/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc b/mindspore/ccsrc/backend/kernel_compiler/kernel_query.cc
index 81b5d0f996b1e88b188c2d87da7f4f77688ea43e..a1218f03d7768ab2decbab174124370213bc8eb4 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 69c4ca7db1e999111a63b06a11e27a81738b65f1..9a23e0def6eefbcea104a7718e085bc0d2ed4193 100644
--- a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.cc
+++ b/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 {
diff --git a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h b/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h
index ed647be3423bd12e2f6051275b519414640fced1..a27fae3df46ca08479e8cb153dbfe809f657f3c2 100644
--- a/mindspore/ccsrc/backend/kernel_compiler/oplib/oplib.h
+++ b/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 {
diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc
index 552468bb71486ff3261b40e2acec549ab1e5f247..49666293b4c3e23e062090839b199c7a4a5e907a 100644
--- a/mindspore/ccsrc/backend/kernel_compiler/rts/assign.cc
+++ b/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>;
diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/label_goto.cc
index 8ec460fe0ba67edc94fd1424de18a82b504d7922..81c85bd370f7f7b39e3554a4cd87b6177af81880 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<LabelGotoTaskInfo>;
diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/label_set.cc
index 909885ff178fbd0dba128a00587b1a22b02e15a9..5945dc9f52856eafc85c071f19a5d0838979cae8 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<LabelSetTaskInfo>;
diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/label_switch.cc
index ccb49d94970d7fd2cee8d3b0eb4523e993f7d5fd..8e0656937061f73c0621c7a3cc49a7792b079533 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<LabelSwitchTaskInfo>;
diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/memcpy_async.cc
index ca1114a83f7d765351ada1614ff59c4949c2b058..9546f38e6b611704c06efe1cc19d31867a3cabe0 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 <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>;
diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/recv.cc
index cee0ef2fdc4b5b6e3167482d39aa2387e52d7921..d51663f35442a8f9b13f90e11b420dd395f8d16c 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 <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 {
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 9501aed5f2a3bf0744d98f7a6a8f94c2274c55b3..59ac61fd81c70bf03af14d536be52ba14cc6f697 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 <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 {
diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/send.cc
index 11c0a7d6682937cf74805f2494ddd6d614a0dcca..3b284abe30647a7bdb2058cff437d0bcfb90e506 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<EventRecordTaskInfo>;
diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_active.cc
index e33549973d82aeba31b69e16007c559f01897584..4e48366f45243cedba6f0138fc616f7d5b09b7ad 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<StreamActiveTaskInfo>;
diff --git a/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc b/mindspore/ccsrc/backend/kernel_compiler/rts/stream_switch.cc
index 5fe03b1960417c50f0618cb1d6a7c99ee0cdd3e6..aecd7f69e8e9cceedac9ff3656c08d3fc174ad17 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<StreamSwitchTaskInfo>;
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 e7fd94ef84ab466c471cd9ab56e9875957cff1aa..34165c4799597535b83acabc43ada87b094f4072 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 <string>
 
 #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 e6cb4cf30dd0ca464d127ea07c4bc6197f8742f7..933fcb1566270f4f7bba434024aa178837f34232 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 <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 {
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 f694142763c264481ec177b0fb373fafadb53ba5..05d1aed78daa9ed2bbff0e6cb095d8fa919ff5b2 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 <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"
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 8e923f7449fbaa1b8a2f5f6607c9056cfb101473..4455ce9f3050e3be81062e7c5561bf4ec4bfc46f 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 76ef7b08d527d0839b538bf4c54292c5aa76bb56..b68d30633d41c2fe67aa919275ef5ddefaa9e94e 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 b273244bc8f2e1302a54b629abf2dd563e21b913..44aba2c3990595cf323681dfc4e705de9e7f3f12 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 74f4f249e55d04b456a6facf9d32cfb61fc9b0d2..1adce131bdf8d2b360d87e17f541743fd8c7a345 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 <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 {
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 22183c9050fd54de9eb4fe8dc80ef62ca882d80c..dd0d61e1ac45d7227ba4f36d372e86bebbf59dc1 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 59915d43d4a3cc69fe9ce809de27e43aacabf876..74ef83dcf4a649dfb1a4df4c81bb234f32e75984 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 1bfff1b50ea316a1d3b6d74ad46f8d8cdb2f93a4..eecda879d9614dd99b06ffd5699f741c5b89ad75 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 144ab4b53fd965e955fc8c159238b974d28cd688..d9d6c37848fab3e3bbbba390b9ea1a40650b7766 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 a2ebfbe79e25f9be69a2c01f7b7c0ad53a5852ff..d32269fab111688ddba6eae5a91b4b5fff1a1e70 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 1a67e3c39bf8b688d90912bdda82aaf5d696ec3c..d5626bc4145d83e5d46feddb350e2267f59c9305 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 1eb26b12bc7899cd505627897c939e50b071ae96..f31d8f758076c34d1685aa1bafa16f7a275457c6 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 285b8f6c07ce03e34973cfee5cd88596e60a5409..6e48048b280b2ddcb9dfa82b7584bb9eb2b3c4f0 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 1e24cce0e476fd5ffe8e886951926fa2d752fba8..865ae57349d491738127e0c0e3a8fd46c5cfb27e 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 27a7a786d13f4cac853b89bf71383c99de4845a5..f66dbeda99c65849ee049f9eedfe7516a50efe96 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 <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"
 
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 7fcc6e45e09da0559341f641bad5095537896511..f026bc8b019676de55d4c67ab0fe6329d6796d27 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 58a219aec73ed3b0eeaa052aecce8b4b2f76469d..bf29ca14161d52f6fd1014c91b79c85fbe0f0b65 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 95955818ebac6aaf6753909df04a6900f00fe518..741be4835de5cfb2a85b34e74fcf8441bc92be72 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 f2117f93740d85941f02b686db3677230be5e09d..6ae541c8cb737079d1da34f2bba950624125666f 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 d93b47b66c1264695b0514d15316dec9563ad77e..a6222a13aecbe75b283662cb64bc44eb238e0c81 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 968553070527e0481f1d67090b4eeee3e9545908..83fa647e1c86c62b3afd34e81df062f714b2187b 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 f508bb28688603a178d673a2eabb17e4de78bc32..03c4618069fdb86751da218a1ce910534875e343 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 7da00273109c3625e30146716661b29b99c9c614..bdebc0bc1ed0d56d5eec9794523e9344805c87b2 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 8f0d5dd48e4efa990e0bd0d44d16c4ee9088f0fc..9788db6773feaa35b37aa263c0cfa27204c3649f 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 91b9326cc14177b1e0f96e1840e7d4c8b117bd09..cff8ce5673c447a100a7f940365c7d8b63707310 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 97122386c61b05a7123fa1df693064e7123aa891..00adc721181e2b60657d7b7a209f79c66dc37901 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 <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"
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 6c4e226120dc4e42f696bf019463f7315e766fd0..45d629d4e90cd4628f8f183cce5f19206bc2aaae 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 <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"
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 33670e5703a801711bb128a93c638774fe809904..8ebbd9269aed5458888caa0889c41d1b1b2fa7a6 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 <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"
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 1d19def787fa4f7e5efd466e59403bfb23569e7b..55124b8752918b91d387d2714b482fc46e96b9a8 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 6eeb7a61f7ead93eb9faaab634caa932a168eb59..8e185602602995eb6d64341a863cbdff8c88a3eb 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 1d89bfd388af5bc7a554b3b47850f35bb755d13a..de6d4e6a51be97ce826d3d7e7e370dd013c78484 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 2a841655966d9eac9124a66d4b4da9d6b89d70c8..b38f89c761d28bc97f2dbe304889ed643d1a4e43 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 <vector>
 #include <utility>
 #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 8e38c3cc2eba0b87bb4b02cf6bbb1200db7f3311..550301dc1149910ca498babb663f33368927d191 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 3513c216e54df58a8f5b410f5f0752d3d3470309..236535ef3b81eb4710a8ae619568a1370190a12d 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 695e1800996a8d3f3c875dce0ea634ab22d3daf3..0c45851551ecfdc65a4208169c8ad93864740a4b 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 1e5f3ef9314d607780ad50ab3349cc73cd4dfebf..16bdeb79fe4d4f46d7d794fb7d8f7b6259e631f5 100644
--- a/mindspore/ccsrc/backend/optimizer/common/helper.h
+++ b/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 {
diff --git a/mindspore/ccsrc/backend/optimizer/common/optimizer.h b/mindspore/ccsrc/backend/optimizer/common/optimizer.h
index 86822e3549a36b94ad69299e16f05d2dd6314191..9277d19d64f67a61b3be52fa456b11a096445e64 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 f9f41237e09e27a01f9f0064e780a57aba640344..a0f03e85ad5b69b73f06302082dd9cf3d8a52739 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 50c67af9406308658bfdd26fc0b5bbd0921086e4..990a9d9c29bb91bf75b940631632f946c7db0c29 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 2fda84fa8311b54d8df8cb97944664f2b32c1f8b..5f6b65937294c4139d36b3d41940374873a88771 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 <unordered_map>
 #include <unordered_set>
 
-#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 51d399bbcd18c7e22314824b9e76838c9baf9ac9..7d4b54b23a0f800d9568f9ef4b080d61fc18e116 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 <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"
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 f2e35351b4e57f6132bded2aa9563bc986212fe8..2c24687c9e46f5d7bbefaa9e78bac41305404790 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 771c0d0149f8df07d72d627d9ca982fff04b171f..e260f7011ca2ba9ca5c54ab091c5cc8d5e3abbba 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 48a6a2325d01d790a8539646787c2657c1a0ba01..81516d94817e7614bc431d69f64bb78fd76fd553 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 ef796ff4fdcb3ae93d6d89b62d652a950e4a8e30..67eae6fba3a325363738f9c79ecfd13e12303149 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 027abdea078e36f70da88e7954f612b7070807c5..59fc84675911ff62d77bfa567bd83694f0a606b1 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 743a17b451e6f3c6924cb82146adb12824b61546..4ba62e53b78801439de30ae42e0820986f3017fb 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 77d22927565ec753747792e880f529cb93ec52cf..6e720babcf08036def88bd9bc7c83951cff98694 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 cec532fc8cc802eec2b7fcfd2340d72929d1cdac..7fa41905d1322a731f50b0fee9e040f91a6a860d 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 21ff3180e3540aebce6daeda0f1544ff1721139a..eb21470698d603267ed7ab0410ee48130f5b223b 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 5f3a0cab926a5c4e3a49ef7da0319e14faf502af..3e9296c5d590aef1e309ebff69ee1185aa1bff97 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 2148d1b3501c1c0e53a5bd1daebe92923a8f0194..6acb3ae18c2f5333b0468785b80f3615f958eac0 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 a5a7dfd245291bc09b0b45ebf30fdf6647c1db6a..6e4833fc2f90fe22383b6429609d909aa16ef7d5 100644
--- a/mindspore/ccsrc/backend/session/session_factory.h
+++ b/mindspore/ccsrc/backend/session/session_factory.h
@@ -21,7 +21,7 @@
 #include <memory>
 #include <string>
 #include <utility>
-#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 1841826ca96a9b78bd7972b04ee2e5366410f663..1b10a7d2f76b9028718d88b23cf107885d407221 100644
--- a/mindspore/ccsrc/common/trans.cc
+++ b/mindspore/ccsrc/common/trans.cc
@@ -17,7 +17,7 @@
 #include <functional>
 #include <numeric>
 #include <utility>
-#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 7d4380c4d28297050cc1fa246d3b3b4b5f513e36..261e811c917b786d23b7718678c5b173353712df 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 a75b9958226d11ed6b832a1b5dff4a4aec985f00..1683a3f80337c4dca18923e4c3fb59407c4b66c2 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<std::string> 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 ce7f955d49c01dec0dccb5ed0acf383487dc63b9..abe9938ed32f978a017873677c10ea65cdb5b210 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 <fstream>
-#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 d811bd9f0912bafdf1375565142d6e84053fad6f..95a730fff971a94fe5a7a700f07466a49341eb67 100644
--- a/mindspore/ccsrc/debug/data_dump_parser.h
+++ b/mindspore/ccsrc/debug/data_dump_parser.h
@@ -22,7 +22,7 @@
 #include <mutex>
 #include <optional>
 #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 09ded5118ad285dbbcd2b32adedff2f69d9efbe5..bf16fbf5373b741992e6842d40666a4225502e03 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 9037a6d00b36c19075b32a0db1c0ba43078303cb..147582a36041967e5e2a26e532410d86accfe31a 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 3ec3455be7512a1b5b8ba80d41e794504794dcd5..2df68037e53a69943cd8434396b7711c78af4ba1 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 7b060aecfbaeb3031b43619d5d8f26f5ce212977..33ef78e27cefc3f462346ac55b52444a99694441 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 28d3119bde0e8833f48e386773e361dc6c7f016e..e9418bb5dbbcacf94cacf7a0de62efcc9cfd153a 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 1867a37d9fd94deeeef5e7621431ce4d9659b432..5a5016f93bf8cb9723e281941c0c0dea2a966cb6 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 e4543a3821027a888fc4e7a8fbf0ebb0288eee7a..5d06fb860350f12cb922ef8f208a2cbb0920a08a 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 0810222e43b2630c6057454f62f3654ef2612671..097cdbf2753a32469752d90ce1c04037905297cb 100644
--- a/mindspore/ccsrc/frontend/operator/prim_others.cc
+++ b/mindspore/ccsrc/frontend/operator/prim_others.cc
@@ -18,12 +18,12 @@
 #include <sstream>
 
 #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 ac792e41b0a3c2f10e453a750625e596868964fb..d4fe20171068235f4857b98bec185c4be7322cff 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 f8ab08acc07c7c4cb8240d4acb599cf4214c9574..b11d063db64be6493c6e586e7bb743a80128054e 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 59b661740cbe78c35b7db98c7bfaea78cb7394a0..4380d162824b1f2c3dd480c0d9ce09dae5a231de 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 2018341d5a591def5c491c7fd6bda58d6fc76d8f..aefd6d73bc0e3aaf0a0ce1047a0696f767f9c3a5 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 eead05241115977193489bd05c1c9c22530621d8..bc60181587c7ee527713955bd1550bfc76c57a9f 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 3168b433d5b5fee54b4bafe5673448cdb529c4a7..1bb619264e6e17f33c4db506c135347298c7eaca 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 d67b7e714a4f9c04e1ac0cef5253c4a9b4390b86..9a09021380dbbe43e95aba2c8cd728b4b3e62129 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 <string>
 #include <utility>
 #include <vector>
-#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 5ef979f4dc5b6a808fe08e12c15e7bab76078051..116d188c0ec2a651d810d6c3f71dd546df5549c0 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 <utility>
 #include <vector>
 #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<CostGraph>;
 extern CostGraphPtr entire_costgraph;
diff --git a/mindspore/ccsrc/frontend/parallel/context.cc b/mindspore/ccsrc/frontend/parallel/context.cc
index dc58289111eca88e365bea691c65e6a36ecc3840..24c6823a1a03650d24a765141edd60709b5edcda 100644
--- a/mindspore/ccsrc/frontend/parallel/context.cc
+++ b/mindspore/ccsrc/frontend/parallel/context.cc
@@ -24,7 +24,7 @@
 #include <utility>
 #include <map>
 
-#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 9bd7a62e559141d1023e63a48ff432c1a82107a8..536895c8deb64d09a40ee4a8936b6938654cb27b 100644
--- a/mindspore/ccsrc/frontend/parallel/costmodel_context.cc
+++ b/mindspore/ccsrc/frontend/parallel/costmodel_context.cc
@@ -19,8 +19,7 @@
 #include <memory>
 
 #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 9a9b6b7fdd0cec1bbe12925d628bf13a30d13f18..b1668e13ef61c20f4d6011192682175dc729d550 100644
--- a/mindspore/ccsrc/frontend/parallel/costmodel_context.h
+++ b/mindspore/ccsrc/frontend/parallel/costmodel_context.h
@@ -22,9 +22,28 @@
 #include <vector>
 
 #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 bf8ba03fc1f8f29f385881ba732ef39e70bc26d7..3023f4a355df7991569441b7a03025ccb7a2e2d9 100644
--- a/mindspore/ccsrc/frontend/parallel/device_manager.h
+++ b/mindspore/ccsrc/frontend/parallel/device_manager.h
@@ -25,7 +25,7 @@
 #include <utility>
 #include <vector>
 
-#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 df83500e34b988e8132e02fa28e9363620991a4c..fba348229c553301714707b0d23a6760ab25a53d 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 <utility>
 #include <vector>
 
-#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 d7c346e6ec6aa9c9919b4174b0e867c55932bd79..0121c70d40ae1db6f225dac8d19905df242e72d8 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 3a5c86a01ed601a50ea6047577ab33683fedf3dd..1ff327647415de47fb5ea428aac7a63d75431ca5 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 <unordered_map>
 #include <vector>
 
-#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 4f69a9a0ac94ef5bd1c67ea5ff407c51eeb5b485..420e7f9f96a46892072ea74316de7ad4022e6758 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 3aceee2e357d79f30310b574c8e60d67dcb15597..7801482c5642b065c156db26d043940e4a271bcf 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 <utility>
 #include <vector>
 
-#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 674490db355cf692431cde55e6e959cf945fe0bc..6eedbd76b3270ef29f86a55dd85125e797327152 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 f7ecbb8a52db19bd27688715a0806f8de0b5fa47..1bda9c1323f59a7e69613bfc07e51f86079058ab 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 <unordered_map>
 #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 ac1189c3a3af1232ef08883da4732a8f33860fdf..0a8852464f36053810150d3fe756e287c3d35cca 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 <memory>
 #include <vector>
 
-#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 1ff19009449eeb3bd68622b2210e1f5e1243a6ac..565750b94450d1cfc634efdda9595d98494b94b0 100644
--- a/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.cc
+++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/arrangement.cc
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <iostream>
 #include <utility>
-#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 d5d34a484f409661585b70647cac7d20fa7c9036..a53235e2064d49f3882db8c43589a870693fc21e 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 69ae7bb231c449d50c7bb7d4dcd749114bfb9e5e..b6c6904d4e4a6202939a64060d98906a365ef440 100644
--- a/mindspore/ccsrc/frontend/parallel/tensor_layout/map.cc
+++ b/mindspore/ccsrc/frontend/parallel/tensor_layout/map.cc
@@ -18,7 +18,7 @@
 #include <algorithm>
 #include <iostream>
 #include <utility>
-#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 28a5fa5bc2e45077226263f5e86b10f61bd702f4..203b4f9958c93c1166610bae3c4f9df81aaf5dd5 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 <iostream>
 #include <utility>
-#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 43bb3307878e6be3ec097b172d0060a65a136fb9..87d385c81bff7ce4f2fed9a06bab300d961cbe30 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 <cfloat>
 #include <functional>
 #include <numeric>
-#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 7ad84238fa755be398663228266aae97671862e5..ce4137c1d082827f4acadd2e46641d291e4859cd 100644
--- a/mindspore/ccsrc/minddata/dataset/api/de_pipeline.cc
+++ b/mindspore/ccsrc/minddata/dataset/api/de_pipeline.cc
@@ -19,7 +19,7 @@
 #include <set>
 #include <map>
 
-#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 cd7e6dd75fd0eb80601554a2bfb68c5f3d877099..fd81a90b4b89af4b93d02712680228a6fd92fb4c 100644
--- a/mindspore/ccsrc/minddata/dataset/core/tensor.cc
+++ b/mindspore/ccsrc/minddata/dataset/core/tensor.cc
@@ -24,7 +24,7 @@
 #include <utility>
 #include <functional>
 
-#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 ff58046553ec1d89fc069aa8eca8fc1caa5ce38d..25e896e4a27a926aed5f3ff85eb7ba161ee76eb3 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 ff40062d377621e7e185f6834b8a09645c170c1a..19c3a6b457573f41985b96a0454c36407c818d06 100644
--- a/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc
+++ b/mindspore/ccsrc/minddata/dataset/core/tensor_shape.cc
@@ -19,7 +19,7 @@
 
 #include <limits>
 
-#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 50d910251d78cf1c0e430559b522b293ef42acc2..6db8ec5614bc13a12232419b46e1f2f7b41d9862 100644
--- a/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc
+++ b/mindspore/ccsrc/minddata/dataset/engine/data_schema.cc
@@ -23,7 +23,7 @@
 #include <sstream>
 #include <nlohmann/json.hpp>
 
-#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 20a61a5644e077b320ae7cd935a2b64310d5b2d4..aed3f0e8613403d9850c505417f73b0c6aab2e9b 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 <utility>
 #include <iomanip>
 
-#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 a01a9cc87fd3a19c2475e8f719f4d6b546590367..f3847fe72f2cf17a1c980197575bdf24e43a887f 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 <iomanip>
 #include <utility>
 
-#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 b06fcdb55d45d37a759aba14951e7864623391a6..6415557a2b746c3dbeec9f903bdc7a2aaba12164 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 <iomanip>
 #include <utility>
 
-#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 dac2f8f57dd8e41140db1be28bd9d058c19bd798..86301ea67cced611290fe5feaecbd52505e2101d 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 <algorithm>
 #include <fstream>
 #include <iomanip>
-#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 9a3bbccdcf913a18591e54c37d8ee5428dfdf840..ddf7cc289587344da3837afc159e76964079cd9f 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 <fstream>
 #include <iomanip>
-#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 7982c63d1067de5f7499fd6368f027e34d517253..a88e69c27b1dd8892f3227dbc513d68d20abeaf7 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 <iomanip>
 #include <nlohmann/json.hpp>
 
-#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 2af425994430a2725e8f2a1909792663fc0d6f34..5453e18aaa6b5a5895b7799c5ccd1a4ad7c03ac5 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 <limits>
 #include <utility>
 
-#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 b3c52be60ee9618353a731441159f8cfa3cce247..a32a36afc3ca9170c34160b874bd345e0e79c724 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 <fstream>
 #include <iomanip>
-#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 104d7919ceea8987392c62a18940e19f4ea1c6e6..d8706f1c697cb50e1f4dafd4b0ce02726221f258 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 <string>
 #include <utility>
 
-#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 f0d40a9ba8d30458c6d95cc413e3e8c137202399..85c0624246a0ca3c8f35fa48564d45e5ca1a094d 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 bb48d5e418d9f8041533743c1ffe17071b93b4c3..ccc6dbfa4fc3977b55cd62183ea5600428997ab7 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 <fstream>
 #include <iomanip>
 #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 dfd4f254e08959812127eb30ec213c4b3147d27d..eb7a7e91dad77d2e35e6ea291b51003df02d06ce 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 <iomanip>
 #include <utility>
 
-#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 f5c018c03bb19ba61fd44290d434f93449ecb763..4fdc6174a318c49965a9873ee1bbafdcbb237335 100644
--- a/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc
+++ b/mindspore/ccsrc/minddata/dataset/engine/perf/profiling.cc
@@ -17,7 +17,7 @@
 #include <sys/time.h>
 #include <cstdlib>
 #include <fstream>
-#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 d04f5a08d2b14d8971682bf335d1537b40f54c59..dd57fa7ea49db99894902375eaf83a95963eb88a 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 ff58046553ec1d89fc069aa8eca8fc1caa5ce38d..25e896e4a27a926aed5f3ff85eb7ba161ee76eb3 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 e33937b684a80a049d307bdea0c73a2df6e6efd9..a27b2cb0005202a07044b1e1326e2750025587f5 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 <string>
-#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 013e3482eacc6b804f9ce438ae7acd443158b590..86de12597b3323e6ba90a557585bf9b82ac44b3b 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 <stdexcept>
 #include <utility>
 #include <opencv2/imgcodecs.hpp>
-#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 ba90da01035fb6db94911033d6298ec85d7a9ed3..919f10823748d98c01a256b4946ffd226523d480 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 <memory>
 #include <vector>
 
-#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 7d2179435701455dab98bd0021b0bbd1c4db7380..d9935112f40c011ea80eb1a22d0d98955f5a4071 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 <sentencepiece_processor.h>
 #include <fstream>
 
-#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 22fb72eb8a0272023b4d6e736b2b7c417784b4ca..37c6107fb0d2519fdbc2c9c25b785278affb285c 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 <algorithm>
-#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 a82c82cdc9237c82f545c7c48f38eea01c6ce5ba..80417ac2a01d195a09f17d609aac49bbc8f645e0 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 <sstream>
-#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 8740ecb8e0fd1b023dd938ffa1593232fbc1abf0..97416be6a808ac2a9bd42813472d27f04952bcaf 100644
--- a/mindspore/ccsrc/minddata/dataset/util/path.cc
+++ b/mindspore/ccsrc/minddata/dataset/util/path.cc
@@ -22,7 +22,7 @@
 #include <sstream>
 #include <utility>
 
-#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 0cdb2c19930a4466a6850fca47a5520de58d9ccb..021ee5ab10245a6d4663f5d82474280c6d2ff2e0 100644
--- a/mindspore/ccsrc/minddata/dataset/util/queue.h
+++ b/mindspore/ccsrc/minddata/dataset/util/queue.h
@@ -24,7 +24,7 @@
 #include <utility>
 #include <vector>
 
-#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 3fc498b701dc9edc4f33904f4379e5be817cbfc7..9d60bfe6a6a2482241e358d238844dc5505e2049 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 <sstream>
-#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 506495227d9abdb748c95abd892e4da7c7a0b7a9..b64926e596998f44da8528a7040732c325712dbe 100644
--- a/mindspore/ccsrc/minddata/dataset/util/storage_container.cc
+++ b/mindspore/ccsrc/minddata/dataset/util/storage_container.cc
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <vector>
-#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 2f85d00a45329157ea6c61b69e7b629ac15ec69e..82f39fd7ae758da49370db2cc54526c726bea8d8 100644
--- a/mindspore/ccsrc/minddata/dataset/util/storage_manager.cc
+++ b/mindspore/ccsrc/minddata/dataset/util/storage_manager.cc
@@ -19,7 +19,7 @@
 #include <sstream>
 #include <stdexcept>
 #include <utility>
-#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 39d754e8060ce1b5bbc905b2e6c513b879a5f934..fb71e93379b672440a7d703e792d766c0bd2144e 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 f36182027786e72ae6bfac2920e0db0bb19ea80a..7c7f79ccfb8dc04dc6b3ea647436019b41e62342 100644
--- a/mindspore/ccsrc/minddata/mindrecord/common/shard_pybind.cc
+++ b/mindspore/ccsrc/minddata/mindrecord/common/shard_pybind.cc
@@ -16,7 +16,7 @@
 
 #include <string>
 #include <vector>
-#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 b5021802a043b1a12700e5ab9ff994a572a3f341..185f6cbb60fa9784168a6aed09978879d5831160 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 5b102c3968f22e441d2680ff5d127792be3302e1..e2d6247735f781b47d1ed0123ba47e82dc1c7317 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 <thread>
 
 #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 1df9c8e5128bf8b05a61cc4cfe0effbf7de667f5..c42b732463bad1b1ba7ee28bf511cabb957ac3d4 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 eda8924e1315713eb611a1e5eede260aef4b6bca..a9a4a79cdf431d58d89431d3c1b38e6fe4fad42c 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 84b0c5b37a174470b9bee42ed93ef4be22a2c978..bf702180abd44cd008a90d5eabdf631c496ffcbb 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 4cc5e9f413a8dc496f01e9c9435e98b2609cd285..47e001e8f88e964b4ac0dcadd01894e04ece91d0 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 f94f92d939abefb499b22505a3bc42a1e6321d55..9f75d84e7ac218503e6285ddb9171bc5fd212624 100644
--- a/mindspore/ccsrc/minddata/mindrecord/meta/shard_header.cc
+++ b/mindspore/ccsrc/minddata/mindrecord/meta/shard_header.cc
@@ -22,7 +22,7 @@
 #include <utility>
 #include <vector>
 
-#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 093be9792f11d69f3dee1989c714d28a41548ced..b9b26e33d1a828ce773e1aebf70955fba6ae5fb4 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 6f8e440f91cce96e599fba6d672f6be5978a8ff4..972e3b2d14b392ab2c6123f21f35afdb8db00cea 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 742f06aacc4b5ca390bd81bced0517bfd602e088..c5b38fe829a3a98d770a3de9322da3e6d2b0b108 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 3f136a42c69e487a9d2849d46febbd722044c73d..595c2decd44e223b5addedeeb9c057c99f491a02 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 e6f4fec4ce02eb67855aec02a3577d82b029252e..8dc9d4a63afa6ac6c0aae4a94df7d3d7127a0027 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 112b99631b3f2dd3ce2c9186dbc9dd3f84045d5b..9e119aa730431bec4e9d62cafe6e9ae16610a9d5 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 ca27824d099470a296b7fc0bad788a1f69f7414a..cadb0f61996a19be0017e0ef636aaf13ab3a5e39 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 ff83761249b36c225d1dd4ca650adf249314b8b8..d0993f0fcc021e50cd764b1bcc360904705eac6a 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 eb50974e5485ed32fd1c858fbf6aab207684251a..b07bb270f19ca3c6cfcb27538f62b95344c7813d 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 3b874d90ed5eb672e80cab38ff9f8b8d0a7d79f3..af597d1d3335ce27e6d3fb1ce2873a658a697029 100644
--- a/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.h
+++ b/mindspore/ccsrc/pipeline/jit/static_analysis/evaluator.h
@@ -25,7 +25,7 @@
 #include <vector>
 
 #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 22ef9c25f32d741c40d4fe8093c3c137e9ec93b4..fa8c36e460d6131c2d084187a39530dc12226177 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 2786a8b41319fbcb3b47dd2aa8d0227a72bda5ca..7328b3b78e7e70b5861b805896b9206181c8aaa6 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 1de225c260e76844ab565d887d077fbc1c2f58f9..246ceada152fce95bc2773772d4adf611ec0f026 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 0b7f096b2e1ec502f5df9cc99afad672ca9f0fb0..994306ec2d9527d3f203ab0951b94aa43cec205e 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 e8306dfb04a9ef96e2d876e5535dd03aaef03e4a..b8459db687697bdae3d72bf5b0397fcd3497e2a6 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<GeTensor>;
diff --git a/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc b/mindspore/ccsrc/runtime/device/ascend/ascend_device_address.cc
index 7e42763fe8146d8f6d20a105b3d9be38f939cfc2..0efe3a6988ec003a6f15071bde04ed516e2254c7 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 75ce3777526c575503151b6b22296b295aed71ce..0408dac28094923a093364a13ce8d315f6993bbc 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 <algorithm>
 #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 6d11900a46e0f2010d1dc0850a0a2d7d7ed59822..0970fe01edec723b9053ec44bc4c40cb9c964378 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 <string>
 #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 9a3327a5f0e7b60308de2dc230008e07bdb989d6..57fe3090affd537afa3a6878cbf61c092b750188 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 <utility>
 
 #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 e907b1d52543206b6df234afa7adc54286971a94..0a6ac52268176aaae5c9324c974a3516fbeb9b11 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 3932c4fd5aafad0e825a55e477be723a9110ea35..da35ca023542a28d0fcb781d10273175feeabcd0 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 <map>
 #include <unordered_map>
 #include <unordered_set>
-#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 bb7c1eae90db71dfac40fd8ee1ab0e406411e180..18d67d525379b55b02c7d0f1ad8cb7af2c0efe38 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 4263f2b2a23b5db9d52dca221d197cd1e7479c28..26118bb27cce328fbf6c9486ba615d9f9ba8a2c8 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 <memory>
 #include <nlohmann/json.hpp>
 #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 abc72f7e8ecf98faf334f303892c57e468cd77d5..ed96f6ed2aeb01a99a5f6ccd35e7c90cd2897ccc 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 5aeb932105f41098b3ddd22dcbd5e93a54f31b8f..2b419367f9dd4bf9ba23c07f884aeb6889e2a11e 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 <runtime/rt.h>
 #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 6904c6a0bec38741679ecca5e8acf4c157862f53..1b44394ce086422a95da03f671bdce2d0d36e382 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 <set>
 #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 547c2fbe648472fe3b597f7e58e28f595513a47c..5cb97ac1e7b6e47d7790df28acdda102c1377272 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 <chrono>
 #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 a1b1fa9b79cb009fe9baa52816473c67bd2cb760..7ca7878d56a2b5ec9439e417bbd529150c15f4bd 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 <cuda_runtime_api.h>
 #include <utility>
 #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 664648351a757608af73ec96957072a0a0319742..bf0919268c2e06736bff83193203cdd154b49500 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 e2395bbaf25f9ed25b45a418ca037e67a1ddca1a..746aeda2cdb7ce4f459188fb46505af571f4eba4 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 ffa07eea0d83a73b9a91896f827560bf1d90105a..7702234ccdbfce0f76bb7711f87c8f638ed46843 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 4326987784cbaa8d4968e844fd43b1af5a3a85fb..00bae0f6c0a1870190da00f2f76a5e59223ba2c9 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 bb1f7f723ee6267e078faa6a9a91821d236eefd2..513fa6825229c6d8bcf9b744863da84bbe741887 100644
--- a/mindspore/ccsrc/runtime/device/kernel_adjust.cc
+++ b/mindspore/ccsrc/runtime/device/kernel_adjust.cc
@@ -24,10 +24,10 @@
 #include <vector>
 
 #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 b86cdbed4f4a36eec7273667e9620ae2e3ecc130..d1c0392e1cd388d98845c14cbb58f15387e9ec53 100644
--- a/mindspore/ccsrc/runtime/device/kernel_runtime.cc
+++ b/mindspore/ccsrc/runtime/device/kernel_runtime.cc
@@ -19,10 +19,10 @@
 #include <utility>
 #include <numeric>
 #include <functional>
-#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 419c77e3f806d3db97de854da38fbdcd0aadbaac..cc33c5646e3b266c2836b669c4e179a5b7a2b4ec 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 ed2a24229bbd6d796496c34eed3e33d52d94e070..bf88f5308777dbcf8ae7b8bbcb44c61c1810b49d 100644
--- a/mindspore/ccsrc/runtime/device/kernel_runtime_manager.h
+++ b/mindspore/ccsrc/runtime/device/kernel_runtime_manager.h
@@ -22,7 +22,7 @@
 #include <functional>
 #include <utility>
 #include <mutex>
-#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 0ed054108cb0e90899d3ff3523db93108a71147f..b00c1b719bf7593b4f54aa9725abda6e96524779 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 3483a8a9661047419f1ce7cdbcd8ea54ea4c36f0..f686e13f2e434742ff43fa573096c9a4877b957a 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 c0ce5c45fedc79f0d01194222791e3cf2c7bdcda..b460a66c4de2923955da3be10875f34910d67924 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 <map>
+#include <string>
+#include <memory>
 #include <thread>
 #include <atomic>
 #include <fstream>
-#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<bool> thread_1_must_end(false);
-
-std::shared_ptr<MsContext> MsContext::inst_context_ = nullptr;
-std::map<std::string, MsBackendPolicy> 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> 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<std::string, MsBackendPolicy> &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<MsContext> &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<MsContext> &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<MsContext> &ms_context_ptr) { return true; }
+bool CloseTsd(const std::shared_ptr<MsContext> &ms_context_ptr, bool) { return true; }
 #endif
 
-void MsContext::SetHcclOptions(std::map<std::string, std::string> *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<std::string, std::string> *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<std::string, std::string> *ge_options) const {
+void GetGeOptions(const std::shared_ptr<MsContext> &ms_context_ptr, std::map<std::string, std::string> *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<std::string, std::string> *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<std::string, std::string> *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<std::string, std::string> *ge_options) con
 #endif
 }
 
-void MsContext::SetDisableReuseMemoryFlag(std::map<std::string, std::string> *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<MsContext> &ms_context_ptr, std::map<std::string, std::string> *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<MsContext> &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<std::string, std::string> 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<MsContext> &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<MsContext> &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<MsContext> &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<MsContext> &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<MsContext> &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 0000000000000000000000000000000000000000..f425042bec7000ec489def52ce3a68c0b6fcbd57
--- /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 <map>
+#include <string>
+#include <memory>
+#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<MsContext> &inst_context);
+bool CloseTsd(const std::shared_ptr<MsContext> &inst_context, bool force = false);
+void SetHcclOptions(const std::shared_ptr<MsContext> &inst_context, std::map<std::string, std::string> *ge_options);
+void GetGeOptions(const std::shared_ptr<MsContext> &inst_context, std::map<std::string, std::string> *ge_options);
+void SetDisableReuseMemoryFlag(std::map<std::string, std::string> *ge_options);
+bool InitGe(const std::shared_ptr<MsContext> &inst_context);
+bool FinalizeGe(const std::shared_ptr<MsContext> &inst_context, bool force = false);
+bool PynativeInitGe(const std::shared_ptr<MsContext> &inst_context);
+bool IsTsdOpened(const std::shared_ptr<MsContext> &inst_context);
+bool IsGeInited(const std::shared_ptr<MsContext> &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 abd5cb1660d02f0b8d505d3a94181229be35b089..956041d8fb334735cb2c6b8d88ab8aa23e297bf9 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 5c81640206c8d22f19a527365b86f19c071753bc..d6dbe970c4ea7f19596da489427f101bd7834cef 100644
--- a/mindspore/ccsrc/utils/tensorprint_utils.cc
+++ b/mindspore/ccsrc/utils/tensorprint_utils.cc
@@ -22,7 +22,7 @@
 #include <vector>
 #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 4a40862ea35403ab8eca122d781185f2c6c29dca..b150368f71f91b1e444ec43fb8bda6cc90d45e76 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 654e546e3cabbe9bbe71924dc2fde920243dc6e5..42af5541f289663242ca000e7a786b4513d87686 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 bf39e4e2e7381830f5d3f7f7982653e707f8a226..61d96944f7c9516eb3be9364a4a8453814a0bf83 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 1d31936cfba82c44da6817e2c1e6572f64d79aad..a681644b3d7573fe9ad1f2a930c875568345dcbe 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 b8ea6f8f3290e188229b741cf927d0dc69a01738..ba1da220a7415351bc3f39fe420f0fc617cb7646 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<void(const std::string &, const FuncGraphPtr &)>;
 
   ~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<CNodePtr> order_;
   bool stub_;
+  inline static Drawer drawer_ = nullptr;
 };
 
 inline CNodePtr NewCNode(const std::vector<AnfNodePtr> &inputs, const FuncGraphPtr &fg) {
diff --git a/mindspore/core/ir/func_graph_cloner.cc b/mindspore/core/ir/func_graph_cloner.cc
index 02a42559dbd444822e93f0681be24cd45eedc758..bb8ed7bc4c4324300f1b9aebd74203d921c10ec2 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 ea20a1b80dc1f7421fd40b945ea8357f2448b0e9..6e31c8150f29855fb508a6a4cbccff5db9426377 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<FuncGraph>()); }
+void FuncGraph::DumpFuncGraph(const std::string &path) {
+  // draw::Draw(path + ".dot", shared_from_base<FuncGraph>());
+  if (drawer_) {
+    drawer_(path + ".dot", shared_from_base<FuncGraph>());
+  }
+}
 
 void FuncGraph::GenerateVarParams(const FuncGraphPtr &specialized_graph,
                                   std::vector<AnfNodePtr> *specialized_parameter_list,
diff --git a/mindspore/core/ir/graph_utils.cc b/mindspore/core/ir/graph_utils.cc
index 9558560340e366923ae711f28687e3cd4ba2ebb4..cde5eaafba6f4d2e6362caec45d02b5385bfcd15 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<AnfNodePtr> 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 e9f8f3e2d6d1c147f212c3c30d9206f2810b0051..1662e6111fb859817a57ff1355765e5406dc66ef 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 49a567a18ce58a847bf6d8b5ba72f0b221e953c8..141b495a37c16ac93a4c8858bff36cb5b1e2cccf 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 02dd7ba5653d63d7e84e96ff3a8c7a6b00e9bf0f..6288aa6c67b87e945b62636152cdb422a029e1dd 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 b52a6591fffb08f77fcb3b0261c1d70d76cfcabb..f90d1b426a32e5fdad1f36f1b4a4692ee6a10875 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 0000000000000000000000000000000000000000..a1ad034c00916a143849ec0506200d09b80a0ed5
--- /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 <thread>
+#include <atomic>
+#include <fstream>
+#include "ir/tensor.h"
+#include "utils/ms_utils.h"
+
+namespace mindspore {
+std::atomic<bool> thread_1_must_end(false);
+
+std::shared_ptr<MsContext> MsContext::inst_context_ = nullptr;
+std::map<std::string, MsBackendPolicy> 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> 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<std::string, MsBackendPolicy> &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 489277f06e1c9072fe8ae82823abd08e1af41d9c..9ad3259b24fd19351e9df33c68aa1185b2f5dd1a 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 <thread>
 #include <memory>
 #include <map>
@@ -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<void(const std::string &device_target)>;
+  using DeviceTypeSeter = std::function<void(std::shared_ptr<MsContext> &)>;
   static std::shared_ptr<MsContext> 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<std::string, std::string> *ge_options) const;
-  void SetDisableReuseMemoryFlag(std::map<std::string, std::string> *ge_options) const;
-  void SetHcclOptions(std::map<std::string, std::string> *ge_options) const;
+  std::thread tdt_print_;
 
+ private:
+  inline static DeviceSeter seter_ = nullptr;
+  inline static DeviceTypeSeter device_type_seter_ = nullptr;
   static std::shared_ptr<MsContext> inst_context_;
   static std::map<std::string, MsBackendPolicy> 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 7109c121e523734ff1f5bdbdeef9fffcac23572d..f6a1567a7b02d732333785a91be27bfb0d03aab2 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 <string>
 #include <vector>
 #include <atomic>
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 8f114a1ea54b66944092a90143a218d1835687fb..c92473e177ed9253910d9e10e19896d9dbf07f36 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 a5d46bad2ff241f5fcee708c4bbb478fdfcc92ee..baac3a35cad192a329d19ccbfd7f861343a76b6a 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 74fc5c16b4606f97232e17d3217eb4361e1f9f07..9dec33473a451feea7aafde4ee5a4419f60c28e1 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 f5bfc9d6dd46fecf69af12506f0fa71017fd8507..aeeccef2bce02d88ba15c0630104b9c2420b88a0 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 2fc7d9cd41aa454058064b9f16539083731c5962..69090ec6b695fef09cd9f33c374c62795448ca20 100644
--- a/tests/ut/cpp/dataset/batch_op_test.cc
+++ b/tests/ut/cpp/dataset/batch_op_test.cc
@@ -18,7 +18,7 @@
 #include <string>
 #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 f302854c0879b1d0e9f07c518b38cc7efc8ac5c0..2cb3064cb52f3aded86a5abb431a7b2ed02b1e35 100644
--- a/tests/ut/cpp/dataset/c_api_test.cc
+++ b/tests/ut/cpp/dataset/c_api_test.cc
@@ -20,7 +20,7 @@
 #include <string>
 
 #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 ed22f4f347075193f7d1a91920591e4f6bc1704f..0b6b4099a4a49ca20b221dcc292d217d61bebb71 100644
--- a/tests/ut/cpp/dataset/cifar_op_test.cc
+++ b/tests/ut/cpp/dataset/cifar_op_test.cc
@@ -19,7 +19,7 @@
 #include <string>
 
 #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 d06f8466841964cc49c181c3e8f35282e70f4b49..ecad6e4d7b167f894c0d10d260bf1ce724f6bb92 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 0935434a06c8c0441ab63ed48a0f04f9f984c1d8..170e54b7f2660bec7880dd9ef62e4e16ccacd282 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 6e6d3c26e518fe61e08b19c78ef94b9382ea5573..3c786e6f81aec45091ae32321aa81872a8559a88 100644
--- a/tests/ut/cpp/dataset/coco_op_test.cc
+++ b/tests/ut/cpp/dataset/coco_op_test.cc
@@ -19,7 +19,7 @@
 #include <string>
 
 #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 29324c928ce7b4d9d6b36c246c192d7f3dba1a6f..b16c4c0615211a1f33c4e8f2a8901986cb577b8c 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 9b5d7606720986b1670bfe139fb8d634840c53d2..28d0c07764e9e99d88ebf1231f251b8acfb28395 100644
--- a/tests/ut/cpp/dataset/common/cvop_common.cc
+++ b/tests/ut/cpp/dataset/common/cvop_common.cc
@@ -19,7 +19,7 @@
 #include <vector>
 #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 <fstream>
diff --git a/tests/ut/cpp/dataset/concat_op_test.cc b/tests/ut/cpp/dataset/concat_op_test.cc
index 9e991ce0d38c3accdefdf032b4ad76be3bd09318..7c6d8475401d1e822361bc2ff9f938ec167abdfd 100644
--- a/tests/ut/cpp/dataset/concat_op_test.cc
+++ b/tests/ut/cpp/dataset/concat_op_test.cc
@@ -18,7 +18,7 @@
 #include <vector>
 
 #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 2eae7b98f11e8095bbcacf1832c4354c24ee2969..4c01af965484c770c680ca6a30b4bc3b67180939 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 768d0d834e2336c6817ca9af077185ef7210efc8..2cce023dcf6e2e9cc9dbd9bdcddb1bc2c3984884 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 <memory>
 #include <string>
 #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 63ad4f44c2b35d775fb9d3ddc049850cfe74ec5d..0d6621bfa2d9dcc476c05613fd083b141d317c20 100644
--- a/tests/ut/cpp/dataset/manifest_op_test.cc
+++ b/tests/ut/cpp/dataset/manifest_op_test.cc
@@ -19,7 +19,7 @@
 #include <string>
 
 #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 b5f08d8f11f21cf0e55723792b7f252cdd25827f..bed97a740d205c3402b60757ba82b66856a11d0e 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 <vector>
 #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 dfceeaa06a8023ae9afc95c804d5cecdf1fa2262..c40086e20f0cc6084fb4430ee1243e7eef63e827 100644
--- a/tests/ut/cpp/dataset/mnist_op_test.cc
+++ b/tests/ut/cpp/dataset/mnist_op_test.cc
@@ -18,7 +18,7 @@
 #include <memory>
 #include <string>
 
-#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 45ef11b88f8718e2fde54ba50e928e4947e9b5e7..5bdb2923d428e2520d36399d760d88fe6c980e11 100644
--- a/tests/ut/cpp/dataset/project_op_test.cc
+++ b/tests/ut/cpp/dataset/project_op_test.cc
@@ -18,7 +18,7 @@
 #include <vector>
 
 #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 56d3c01f61f7b1ec60d253957412e33da2bbe822..6a1de176da612df97a9e7360d38633bb08646aef 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 95b9c75d9e31ce0b01090ae8a9c8bf5359425e3b..d4c47cdf51ea9d4fff109b42f7c90680a5a285ac 100644
--- a/tests/ut/cpp/dataset/schema_test.cc
+++ b/tests/ut/cpp/dataset/schema_test.cc
@@ -18,7 +18,7 @@
 #include <memory>
 #include <string>
 #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 98b4878efb870b7648147c7e5d690aaff6ab8dd7..45d2d7f60897667cf5613e1392932d1cba921724 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 <memory>
diff --git a/tests/ut/cpp/dataset/take_op_test.cc b/tests/ut/cpp/dataset/take_op_test.cc
index a8bfe40b105e1baaf90b331c3e39ee3af2ae94d8..156a76e9c165ea45a14a386d9a313fcc9f1188f0 100644
--- a/tests/ut/cpp/dataset/take_op_test.cc
+++ b/tests/ut/cpp/dataset/take_op_test.cc
@@ -18,7 +18,7 @@
 #include <vector>
 
 #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 65ab386db0e08f815a87dd57ddbf24fb4f8e3332..7eec95b081df4f760940cb7e1a52e12e9ab952ae 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 bc2674a6a304834ad87979a21d03d175345f8471..9450ac7b98dffbb41a91e563aa2b341f332e7db7 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 30fde33ff9c4d7c375722cf72d4c8bfd5365e5de..9f0919cd9653abdf17e8de4d40585f76206f57cb 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 4bb212ffc79de9a49517b05de9b75b48aa8498e1..294703d6085fa63bd24dcd8cb32fd1bb5be62af4 100644
--- a/tests/ut/cpp/dataset/voc_op_test.cc
+++ b/tests/ut/cpp/dataset/voc_op_test.cc
@@ -19,7 +19,7 @@
 #include <string>
 
 #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 90b363b35ecea0984353143cbe74073e4a8ea6c0..b55578f6721886504f890dcc5711282263960a89 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 ee943ab88e0e8db6ecca6e67f8117b2abbff65e8..79c76c0a0429cc4d9ecdb4c883d9b4e8b55e9806 100644
--- a/tests/ut/cpp/mindrecord/ut_common.h
+++ b/tests/ut/cpp/mindrecord/ut_common.h
@@ -22,7 +22,7 @@
 #include <string>
 #include <vector>
 
-#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 4501ea0800d3fc8137447261b01a66cce2ec3ad7..2137fb4a13f5bddf8d1f1d5d3af4166071dbabb0 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 <string>
 #include <vector>
 
-#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 ce7cb1ba5d8b41fca660c56b7b5a57f9be88d995..fb0e8470ced62972091d8c12887c769427c8bbef 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 <string>
 #include <vector>
 
-#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 6b99e44d89049533bda7088858049ff27b735699..a4900a51f294ed4dd074ca173f3e9acb5b191fdb 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 <thread>
 #include <vector>
 
-#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 046b4f93d5c0145e3c87b38ae0f0aae6110ba03f..a8abe5e98db48ec4f57a83ac69cff5080855d707 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 <string>
 #include <vector>
 
-#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 2b61a4904888a63c535e1e90502ee72eef82903d..c8909455d32e6b048e10c64a3948bb587f01a157 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 4e3a29bf30d5472fc3b7b3cf8ba3cea16e19dacb..fbb3733c9ba3098df3416f3e46b046de01878326 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 18ec4c415514e0a7f51efa490c4abcad18877f05..f1a1dbe0269db7f5a16aa83aae9a5b500bb47a41 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 23fa05f621aa60a4cfbe58312b61081f662b5213..5f16016d2c3810576303a29dba687f42f3c79197 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 d0aaa9ed2db76c7f2044ab727ee283b9a7a99a33..5bccf5207793704548fb1fef545f009346aad2f7 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 02e1865a82f4965a57447cab1df92f0fa82fbe7d..35b767d4dd6315cc63233927b6dc3f928b12a65b 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 cfcc34970b3fb6f994bee1d8473e02fc0001b4a4..bbe9d45d665b204eb2ee6d60588ee4d4e8ae5245 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 25e4b3c11108b2af9be53aad398f1505cfeea8be..59549d3c3be40487f44dc71576787fc3dac0b5be 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 ac3272317a459ff1b3db2e7278d69c32b04c85e3..2b595f1560766412213cf47d7babaabb1916644a 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 3e543d7a63b8f06944aacbb99dfee827ebb4010a..60d99d2dad06a91b377e09d0e0a0149a628cec3e 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 acc34acdd0a59c07bc752d0fa45be6182a9e5dbf..c3c848423bc48b6647c6beab4861b28c705600c7 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 87ab543c7c18b36edc9cb34f0ebd63b678438918..0b91bbdd35d8643f004d625e599496c1921b365c 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 {