!3053 mindspore path adjust

Merge pull request !3053 from liubuyu/master

mindspore/ccsrc/CMakeLists.txt

@@ -1,4 +1,5 @@
 ## common setting
+include_directories(${CMAKE_SOURCE_DIR}/mindspore/core)
 include_directories(${CMAKE_CURRENT_SOURCE_DIR})
 include_directories(${CMAKE_BINARY_DIR})
 link_directories(${CMAKE_SOURCE_DIR}/build/mindspore/graphengine)
@@ -35,20 +36,20 @@ if(ENABLE_GPU)
     include_directories(${CUDNN_PATH} ${CUDA_PATH} ${CUDA_INCLUDE_DIRS})
 
     file(GLOB_RECURSE GPU_SRC_LIST RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
-            "device/gpu/*.cc"
+            "runtime/device/gpu/*.cc"
-            "device/gpu/*.cu"
+            "runtime/device/gpu/*.cu"
-            "kernel/gpu/*.cu"
+            "backend/kernel_compiler/gpu/*.cu"
-            "kernel/akg/gpu/*.cc"
+            "backend/kernel_compiler/akg/gpu/*.cc"
-            "kernel/akg/akg_kernel_build.cc"
+            "backend/kernel_compiler/akg/akg_kernel_build.cc"
-            "kernel/akg/akg_kernel_attrs_process.cc"
+            "backend/kernel_compiler/akg/akg_kernel_attrs_process.cc"
             )
 
     list(APPEND CUDA_NVCC_FLAGS -arch=sm_53)
-    list(REMOVE_ITEM GPU_SRC_LIST "device/gpu/blocking_queue.cc" "device/gpu/gpu_buffer_mgr.cc")
+    list(REMOVE_ITEM GPU_SRC_LIST "runtime/device/gpu/blocking_queue.cc" "runtime/device/gpu/gpu_buffer_mgr.cc")
-    list(REMOVE_ITEM GPU_SRC_LIST "device/gpu/mpi/mpi_initializer.cc"
+    list(REMOVE_ITEM GPU_SRC_LIST "runtime/device/gpu/mpi/mpi_initializer.cc"
-                                  "device/gpu/distribution/collective_wrapper.cc"
+                                  "runtime/device/gpu/distribution/collective_wrapper.cc"
-                                  "device/gpu/distribution/mpi_wrapper.cc"
+                                  "runtime/device/gpu/distribution/mpi_wrapper.cc"
-                                  "device/gpu/distribution/nccl_wrapper.cc"
+                                  "runtime/device/gpu/distribution/nccl_wrapper.cc"
                                   )
 
     set(NVCC_TMP_CMAKE_CXX_FLAGS ${CMAKE_CXX_FLAGS})
@@ -101,15 +102,15 @@ if (ENABLE_DUMP_PROTO)
 endif ()
 
 if (ENABLE_D)
-    include_directories("${CMAKE_BINARY_DIR}/kernel/aicpu")
+    include_directories("${CMAKE_BINARY_DIR}/backend/kernel_compiler/aicpu")
     include_directories("${CMAKE_BINARY_DIR}/predict/generator/ir")
-    file(GLOB_RECURSE PROTO_IN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "kernel/aicpu/proto/*.proto")
+    file(GLOB_RECURSE PROTO_IN RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "backend/kernel_compiler/aicpu/proto/*.proto")
     ms_protobuf_generate(PROTOSRCS PROTOHDRS ${PROTO_IN})
     
     file(GLOB_RECURSE PROTO_INNER RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "predict/proto/*.proto")
     ms_protobuf_generate(PREDICT_PROTOSRCS PREDICT_PROTOHDRS ${PROTO_INNER})
 
-    file(GLOB_RECURSE PROTO_DUMP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "device/ascend/dump/proto/*.proto")
+    file(GLOB_RECURSE PROTO_DUMP RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} "runtime/device/ascend/dump/proto/*.proto")
     ms_protobuf_generate(DUMP_PROTOSRCS PROTOHDRS ${PROTO_DUMP})
 
     list(APPEND MINDSPORE_PROTO_LIST ${PROTOSRCS})
@@ -126,17 +127,31 @@ endif()
 
 ## make sub objects
 set(SUB_COMP
-    transform pre_activate parallel pipeline device kernel common debug gvar ir onnx operator optimizer predict
+        transform/graph_ir
-    pybind_api pynative session utils vm base abstract
+        transform/onnx
+        backend/optimizer
+        backend/kernel_compiler
+        backend/session
+        runtime/device
+        frontend/optimizer
+        frontend/parallel
+        frontend/operator
+        pipeline/jit
+        pipeline/pynative
+        common debug gvar predict pybind_api utils vm base abstract
 )
 
 foreach (_comp ${SUB_COMP})
     add_subdirectory(${_comp})
-    if (TARGET _mindspore_${_comp}_obj)
+    string(REPLACE "/" "_" sub ${_comp})
-        list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_${_comp}_obj>)
+    if (TARGET _mindspore_${sub}_obj)
-        add_dependencies(_mindspore_${_comp}_obj proto_input flat_input)
+        list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_${sub}_obj>)
+        add_dependencies(_mindspore_${sub}_obj proto_input flat_input)
     endif ()
 endforeach ()
+add_subdirectory(${CMAKE_SOURCE_DIR}/mindspore/core/ir ir)
+list(APPEND SUB_OBJECTS_SRC $<TARGET_OBJECTS:_mindspore_ir_obj>)
+add_dependencies(_mindspore_ir_obj proto_input flat_input)
 
 set_property(SOURCE ${SUB_OBJECTS_SRC} PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_ME)
 add_library(mindspore STATIC ${SUB_OBJECTS_SRC})
@@ -207,8 +222,8 @@ endif()
 
 # set c_expression building
 set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE)
-set_property(SOURCE "pipeline/init.cc" PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PIPELINE)
+set_property(SOURCE "pipeline/jit/init.cc" PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_PIPELINE)
-pybind11_add_module(_c_expression "pipeline/init.cc")
+pybind11_add_module(_c_expression "pipeline/jit/init.cc")
 
 MESSAGE(STATUS "operation system is ${CMAKE_SYSTEM}")
 if (CMAKE_SYSTEM_NAME MATCHES "Linux")
@@ -265,8 +280,8 @@ if (ENABLE_CPU)
 endif ()
 
 if (ENABLE_MINDDATA)
-    add_subdirectory(mindrecord)
+    add_subdirectory(minddata/mindrecord)
-    add_subdirectory(dataset)
+    add_subdirectory(minddata/dataset)
 endif ()
 
 # build inference
@@ -275,7 +290,7 @@ set(LOAD_ONNX_SRC
         ${CMAKE_CURRENT_SOURCE_DIR}/utils/load_onnx/anf_model_parser.cc
         )
 add_library(inference SHARED
-        ${CMAKE_CURRENT_SOURCE_DIR}/session/session.cc
+        ${CMAKE_CURRENT_SOURCE_DIR}/backend/session/session.cc
         ${LOAD_ONNX_SRC}
         )
 target_link_libraries(inference PRIVATE ${PYTHON_LIBRARIES} ${SECUREC_LIBRARY}

mindspore/ccsrc/backend/kernel_compiler/CMakeLists.txt

@@ -63,4 +63,4 @@ endif()
 
 set_property(SOURCE ${KERNEL_SRC_LIST} ${CPU_SRC_LIST} ${GPU_SRC_LIST} ${D_SRC_LIST}
     PROPERTY COMPILE_DEFINITIONS SUBMODULE_ID=mindspore::SubModuleId::SM_KERNEL)
-add_library(_mindspore_kernel_obj OBJECT ${KERNEL_SRC_LIST} ${CPU_SRC_LIST} ${GPU_SRC_LIST} ${D_SRC_LIST})
+add_library(_mindspore_backend_kernel_compiler_obj OBJECT ${KERNEL_SRC_LIST} ${CPU_SRC_LIST} ${GPU_SRC_LIST} ${D_SRC_LIST})

mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.cc

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/aicpu/aicpu_kernel_build.h"
+#include "backend/kernel_compiler/aicpu/aicpu_kernel_build.h"
 #include <google/protobuf/text_format.h>
 #include <fstream>
 #include <utility>
@@ -22,18 +22,18 @@
 #include <memory>
 #include <algorithm>
 #include <map>
-#include "device/kernel_runtime.h"
+#include "runtime/device/kernel_runtime.h"
-#include "kernel/aicpu/aicpu_kernel_mod.h"
+#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h"
-#include "kernel/akg/akg_kernel_build.h"
+#include "backend/kernel_compiler/akg/akg_kernel_build.h"
 #include "proto/tensor.pb.h"
 #include "proto/tensor_shape.pb.h"
 #include "proto/attr.pb.h"
 #include "proto/node_def.pb.h"
-#include "session/anf_runtime_algorithm.h"
+#include "backend/session/anf_runtime_algorithm.h"
 #include "common/utils.h"
-#include "kernel/aicpu/aicpu_util.h"
+#include "backend/kernel_compiler/aicpu/aicpu_util.h"
-#include "session/kernel_graph.h"
+#include "backend/session/kernel_graph.h"
-#include "kernel/common_utils.h"
+#include "backend/kernel_compiler/common_utils.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_build.h

@@ -16,7 +16,7 @@
 #ifndef MINDSPORE_MINDSPORE_CCSRC_KERNEL_AICPU_AICPU_KERNEL_BUILD_H_
 #define MINDSPORE_MINDSPORE_CCSRC_KERNEL_AICPU_AICPU_KERNEL_BUILD_H_
 #include <memory>
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.cc

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "kernel/aicpu/aicpu_kernel_metadata.h"
+#include "backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h"
 #include <memory>
 #include <string>
-#include "kernel/oplib/oplib.h"
+#include "backend/kernel_compiler/oplib/oplib.h"
-#include "kernel/common_utils.h"
+#include "backend/kernel_compiler/common_utils.h"
-#include "kernel/aicpu/aicpu_util.h"
+#include "backend/kernel_compiler/aicpu/aicpu_util.h"
-#include "session/anf_runtime_algorithm.h"
+#include "backend/session/anf_runtime_algorithm.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_metadata.h

@@ -20,7 +20,7 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include "kernel/kernel_build_info.h"
+#include "backend/kernel_compiler/kernel_build_info.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "kernel/aicpu/aicpu_kernel_mod.h"
+#include "backend/kernel_compiler/aicpu/aicpu_kernel_mod.h"
 
 #include <memory>
 #include <vector>
@@ -23,9 +23,9 @@
 
 #include "runtime/mem.h"
 #include "runtime/rt.h"
-#include "kernel/aicpu/aicpu_kernel_build.h"
+#include "backend/kernel_compiler/aicpu/aicpu_kernel_build.h"
 #include "utils/convert_utils.h"
-#include "kernel/aicpu/aicpu_util.h"
+#include "backend/kernel_compiler/aicpu/aicpu_util.h"
 #include "utils/context/ms_context.h"
 
 using AicpuTaskInfoPtr = std::shared_ptr<ge::model_runner::AicpuTaskInfo>;

mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_kernel_mod.h

@@ -18,8 +18,8 @@
 #include <vector>
 #include <memory>
 #include <string>
-#include "kernel/ascend_kernel_mod.h"
+#include "backend/kernel_compiler/ascend_kernel_mod.h"
-#include "kernel/aicpu/aicpu_util.h"
+#include "backend/kernel_compiler/aicpu/aicpu_util.h"
 namespace mindspore {
 namespace kernel {
 class AicpuOpKernelMod : public AscendKernelMod {

mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.cc

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/aicpu/aicpu_util.h"
+#include "backend/kernel_compiler/aicpu/aicpu_util.h"
 #include <vector>
 #include <string>
 #include "proto/types.pb.h"
 #include "runtime/mem.h"
 #include "runtime/rt.h"
 #include "utils/convert_utils.h"
-#include "session/anf_runtime_algorithm.h"
+#include "backend/session/anf_runtime_algorithm.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/aicpu/aicpu_util.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include <map>
 #include <string>
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/akg/akg_kernel_attrs_process.h"
+#include "backend/kernel_compiler/akg/akg_kernel_attrs_process.h"
 
 #include <algorithm>
-#include "session/anf_runtime_algorithm.h"
+#include "backend/session/anf_runtime_algorithm.h"
-#include "pre_activate/common/helper.h"
+#include "backend/optimizer/common/helper.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_attrs_process.h

@@ -22,7 +22,7 @@
 #include <unordered_map>
 #include "ir/anf.h"
 #include "utils/utils.h"
-#include "operator/ops.h"
+#include "frontend/operator/ops.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "kernel/akg/akg_kernel_build.h"
+#include "backend/kernel_compiler/akg/akg_kernel_build.h"
 #include <Python.h>
 #include <sys/types.h>
 #include <signal.h>
@@ -35,8 +35,8 @@
 #include "utils/convert_utils.h"
 #include "utils/any.h"
 #include "utils/utils.h"
-#include "session/anf_runtime_algorithm.h"
+#include "backend/session/anf_runtime_algorithm.h"
-#include "kernel/akg/akg_kernel_attrs_process.h"
+#include "backend/kernel_compiler/akg/akg_kernel_attrs_process.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -22,11 +22,11 @@
 #include <memory>
 #include <map>
 #include <utility>
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
 #include "ir/dtype.h"
 #include <nlohmann/json.hpp>
-#include "kernel/common_utils.h"
+#include "backend/kernel_compiler/common_utils.h"
-#include "kernel/oplib/oplib.h"
+#include "backend/kernel_compiler/oplib/oplib.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -14,11 +14,11 @@
  * limitations under the License.
  */
 
-#include "kernel/akg/akg_kernel_metadata.h"
+#include "backend/kernel_compiler/akg/akg_kernel_metadata.h"
 #include <memory>
-#include "session/anf_runtime_algorithm.h"
+#include "backend/session/anf_runtime_algorithm.h"
-#include "kernel/oplib/oplib.h"
+#include "backend/kernel_compiler/oplib/oplib.h"
-#include "kernel/common_utils.h"
+#include "backend/kernel_compiler/common_utils.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/akg/akg_kernel_metadata.h

@@ -21,7 +21,7 @@
 #include <vector>
 #include <unordered_map>
 #include <memory>
-#include "kernel/kernel_build_info.h"
+#include "backend/kernel_compiler/kernel_build_info.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "kernel/akg/ascend/akg_ascend_kernel_build.h"
+#include "backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h"
 
 #include <algorithm>
 #include <map>
@@ -26,12 +26,12 @@
 #include <Python.h>
 #include "ir/dtype.h"
 #include "ir/func_graph.h"
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
-#include "kernel/common_utils.h"
+#include "backend/kernel_compiler/common_utils.h"
-#include "kernel/tbe/tbe_utils.h"
+#include "backend/kernel_compiler/tbe/tbe_utils.h"
-#include "kernel/akg/ascend/akg_ascend_kernel_mod.h"
+#include "backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h"
-#include "kernel/akg/akg_kernel_attrs_process.h"
+#include "backend/kernel_compiler/akg/akg_kernel_attrs_process.h"
-#include "session/anf_runtime_algorithm.h"
+#include "backend/session/anf_runtime_algorithm.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_build.h

@@ -22,8 +22,8 @@
 #include <vector>
 #include <map>
 #include "ir/anf.h"
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
-#include "kernel/akg/akg_kernel_build.h"
+#include "backend/kernel_compiler/akg/akg_kernel_build.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "kernel/akg/ascend/akg_ascend_kernel_mod.h"
+#include "backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h"
 #include <algorithm>
 #include <fstream>
 #include <map>

mindspore/ccsrc/backend/kernel_compiler/akg/ascend/akg_ascend_kernel_mod.h

@@ -19,8 +19,8 @@
 #include <string>
 #include <vector>
 #include <memory>
-#include "kernel/ascend_kernel_mod.h"
+#include "backend/kernel_compiler/ascend_kernel_mod.h"
-#include "kernel/tbe/tbe_utils.h"
+#include "backend/kernel_compiler/tbe/tbe_utils.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "kernel/akg/gpu/akg_gpu_kernel_build.h"
+#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h"
 #include <vector>
 #include <memory>
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
-#include "kernel/akg/akg_kernel_build.h"
+#include "backend/kernel_compiler/akg/akg_kernel_build.h"
-#include "kernel/akg/gpu/akg_gpu_kernel_mod.h"
+#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h"
 #include "common/utils.h"
 
 namespace mindspore {

mindspore/ccsrc/backend/kernel_compiler/akg/gpu/akg_gpu_kernel_build.h

@@ -16,7 +16,7 @@
 
 #ifndef MINDSPORE_CCSRC_KERNEL_AKG_GPU_AKG_GPU_KERNEL_BUILD_H_
 #define MINDSPORE_CCSRC_KERNEL_AKG_GPU_AKG_GPU_KERNEL_BUILD_H_
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
 #include "base/base.h"
 
 namespace mindspore {

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

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "kernel/akg/gpu/akg_gpu_kernel_mod.h"
+#include "backend/kernel_compiler/akg/gpu/akg_gpu_kernel_mod.h"
 #include <fstream>
 #include <algorithm>
 #include "nlohmann/json.hpp"

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

@@ -21,7 +21,7 @@
 #include <vector>
 #include <unordered_map>
 #include <memory>
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/ascend_kernel_mod.h

@@ -20,7 +20,7 @@
 #include <vector>
 #include <memory>
 #include "framework/ge_runtime/task_info.h"
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
 #ifdef ENABLE_DATA_DUMP
 #include "debug/data_dump_parser.h"
 #endif

mindspore/ccsrc/backend/kernel_compiler/common_utils.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "kernel/common_utils.h"
+#include "backend/kernel_compiler/common_utils.h"
 #include <unordered_map>
 #include <map>
 #include <iostream>
@@ -22,12 +22,12 @@
 #include <fstream>
 #include <thread>
 #include "nlohmann/json.hpp"
-#include "session/anf_runtime_algorithm.h"
+#include "backend/session/anf_runtime_algorithm.h"
 #include "common/utils.h"
 #include "ir/manager.h"
 #include "ir/meta_tensor.h"
 #include "ir/func_graph.h"
-#include "operator/ops.h"
+#include "frontend/operator/ops.h"
 #include "utils/graph_utils.h"
 
 namespace mindspore {

mindspore/ccsrc/backend/kernel_compiler/common_utils.h

@@ -26,9 +26,9 @@
 #include <vector>
 #include <utility>
 #include <nlohmann/json.hpp>
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
-#include "kernel/oplib/opinfo.h"
+#include "backend/kernel_compiler/oplib/opinfo.h"
-#include "kernel/kernel_build_info.h"
+#include "backend/kernel_compiler/kernel_build_info.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/addn_cpu_kernel.cc

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "kernel/cpu/addn_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/addn_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -18,8 +18,8 @@
 #define MINDSPORE_CCSRC_KERNEL_CPU_ADDN_CPU_KERNEL_H_
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/allgather_cpu_kernel.cc

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/allgather_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/allgather_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
-#include "device/cpu/mpi/mpi_adapter.h"
+#include "runtime/device/cpu/mpi/mpi_adapter.h"
 #include "utils/log_adapter.h"
 
 namespace mindspore {

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

@@ -17,8 +17,8 @@
 #define MINDSPORE_CCSRC_KERNEL_CPU_REDUCE_SCATTER_CPU_KERNEL_H_
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.cc

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/apply_momentum_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 #include "common/utils.h"
 
 namespace mindspore {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/argmax_cpu_kernel.cc

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/argmax_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/argmax_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -17,8 +17,8 @@
 #define MINDSPORE_CCSRC_KERNEL_CPU_ARGMAX_CPU_KERNEL_H_
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_cpu_kernel.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "kernel/cpu/bias_add_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/bias_add_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -18,8 +18,8 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.cc

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-#include "kernel/cpu/bias_add_grad_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/bias_add_grad_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -19,8 +19,8 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/concat_cpu_kernel.cc

@@ -14,8 +14,8 @@
  * limitations under the License.
  */
 
-#include "kernel/cpu/concat_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/concat_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -17,8 +17,8 @@
 #define MINDSPORE_CCSRC_KERNEL_CPU_CONCAT_CPU_KERNEL_H_
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/cpu_kernel.cc

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -21,9 +21,9 @@
 #include <memory>
 #include <numeric>
 #include <functional>
-#include "kernel/kernel.h"
+#include "backend/kernel_compiler/kernel.h"
 #include "ir/anf.h"
-#include "session/anf_runtime_algorithm.h"
+#include "backend/session/anf_runtime_algorithm.h"
 
 using mindspore::kernel::Address;
 using mindspore::kernel::AddressPtr;

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

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 #include <memory>
 #include <iostream>
 #include <string>
 
-#include "device/kernel_info.h"
+#include "runtime/device/kernel_info.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -24,8 +24,8 @@
 #include <vector>
 
 #include "common/utils.h"
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "device/cpu/kernel_select_cpu.h"
+#include "runtime/device/cpu/kernel_select_cpu.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/debug_cpu_kernel.cc

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/debug_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/debug_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 #include "common/utils.h"
 #ifdef ENABLE_DEBUGGER
 #include "debug/debugger/debugger.h"

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

@@ -18,8 +18,8 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.cc

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 #include <thread>
-#include "kernel/cpu/embedding_look_up_comm_grad_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/embedding_look_up_comm_grad_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
-#include "device/cpu/mpi/mpi_adapter.h"
+#include "runtime/device/cpu/mpi/mpi_adapter.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -17,8 +17,8 @@
 #define MINDSPORE_CCSRC_KERNEL_CPU_EMBEDDING_LOOK_UP_COMM_GRAD_CPU_KERNEL_H_
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.cc

@@ -15,9 +15,9 @@
  */
 #include <thread>
 #include <string>
-#include "kernel/cpu/embedding_look_up_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
-#include "device/cpu/mpi/mpi_adapter.h"
+#include "runtime/device/cpu/mpi/mpi_adapter.h"
 #include "ir/primitive.h"
 
 namespace mindspore {

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

@@ -17,8 +17,8 @@
 #define MINDSPORE_CCSRC_KERNEL_CPU_EMBEDDING_LOOK_UP_CPU_KERNEL_H_
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/equal_count_cpu_kernel.cc

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/equal_count_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/equal_count_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -17,8 +17,8 @@
 #define MINDSPORE_CCSRC_KERNEL_CPU_EQUAL_COUNT_CPU_KERNEL_H_
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/gather_cpu_kernel.cc

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/gather_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/gather_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -17,8 +17,8 @@
 #define MINDSPORE_CCSRC_KERNEL_CPU_GATHER_CPU_KERNEL_H_
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/conv2d_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/conv2d_cpu_kernel.h"
 #include <string>
 #include "common/utils.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/conv2d_grad_filter_cpu_kernel.h"
 #include <string>
 #include "common/utils.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,10 +13,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/conv2d_grad_input_cpu_kernel.h"
 #include <string>
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 #include "common/utils.h"
 
 namespace mindspore {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,11 +13,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/lstm_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/lstm_cpu_kernel.h"
 #include <string>
 #include "common/utils.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -24,7 +24,7 @@
 #endif
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 namespace mindspore {
 namespace kernel {
 class LstmCPUKernel : public MKLCPUKernel {

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

@@ -13,14 +13,14 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/lstm_grad_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/lstm_grad_cpu_kernel.h"
 #include <cstring>
 #include <cmath>
 #include <numeric>
 #include <string>
 #include "common/utils.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/matmul_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/matmul_cpu_kernel.h"
 #include <algorithm>
 #include <utility>
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
 #include "common/utils.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 #include <vector>
 #include <string>
 #include <algorithm>
 #include "common/utils.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -21,8 +21,8 @@
 #include <memory>
 #include <vector>
 #include "dnnl.hpp"
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
 #include "utils/log_adapter.h"
 #include "dnnl.hpp"
 

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

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/mul_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mul_cpu_kernel.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 #include "common/utils.h"
 
 namespace mindspore {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/pooling_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/pooling_cpu_kernel.h"
 #include <string>
 #include <algorithm>
 #include "common/utils.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,13 +13,13 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/pooling_grad_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/pooling_grad_cpu_kernel.h"
 #include <string>
 #include <utility>
 #include <algorithm>
 #include "common/utils.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -19,7 +19,7 @@
 #include <vector>
 #include <memory>
 #include <utility>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/relu_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/relu_cpu_kernel.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 #include "common/utils.h"
 
 namespace mindspore {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/relu_grad_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/relu_grad_cpu_kernel.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 #include "common/utils.h"
 
 namespace mindspore {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/softmax_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/softmax_cpu_kernel.h"
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 #include "common/utils.h"
 
 namespace mindspore {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/softmax_cross_entropy_with_logits_cpu_kernel.h"
 #include <numeric>
 #include <functional>
 #include <cmath>
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 #include "common/utils.h"
 
 namespace mindspore {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -13,12 +13,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/sparse_softmax_cross_entropy_with_logits_cpu_kernel.h"
 #include <numeric>
 #include <functional>
 #include <cmath>
-#include "kernel/cpu/mkldnn/mkl_kernel_engine.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_kernel_engine.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 #include "common/utils.h"
 
 namespace mindspore {

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

@@ -18,7 +18,7 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/mkldnn/mkl_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/mkldnn/mkl_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/one_hot_cpu_kernel.cc

@@ -13,8 +13,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/one_hot_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/one_hot_cpu_kernel.h"
-#include "device/cpu/cpu_device_address.h"
+#include "runtime/device/cpu/cpu_device_address.h"
 
 namespace mindspore {
 namespace kernel {

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

@@ -17,8 +17,8 @@
 #define MINDSPORE_CCSRC_KERNEL_CPU_ONE_HOT_CPU_KERNEL_H_
 #include <vector>
 #include <memory>
-#include "kernel/cpu/cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel.h"
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.cc

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/ps/apply_momentum_ps_kernel.h"
+#include "backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/ps/apply_momentum_ps_kernel.h

@@ -18,8 +18,8 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/ps/pserver_kernel.h"
+#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h"
-#include "kernel/cpu/apply_momentum_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/apply_momentum_cpu_kernel.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.cc

@@ -13,9 +13,9 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-#include "kernel/cpu/ps/embedding_look_up_proxy_kernel.h"
+#include "backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h"
 #include <vector>
-#include "parallel/ps/worker.h"
+#include "frontend/parallel/ps/worker.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_proxy_kernel.h

@@ -16,9 +16,9 @@
 #ifndef MINDSPORE_CCSRC_KERNEL_CPU_EMBEDDING_LOOK_UP_PROXY_KERNEL_H_
 #define MINDSPORE_CCSRC_KERNEL_CPU_EMBEDDING_LOOK_UP_PROXY_KERNEL_H_
 
-#include "kernel/cpu/embedding_look_up_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h"
 #include <vector>
-#include "kernel/cpu/cpu_kernel_factory.h"
+#include "backend/kernel_compiler/cpu/cpu_kernel_factory.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.cc

@@ -14,12 +14,12 @@
  * limitations under the License.
  */
 
-#include "kernel/cpu/ps/embedding_look_up_ps_kernel.h"
+#include "backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h"
 #include <functional>
 #include <vector>
 #include <memory>
-#include "kernel/common_utils.h"
+#include "backend/kernel_compiler/common_utils.h"
-#include "parallel/ps/util.h"
+#include "frontend/parallel/ps/util.h"
 
 namespace mindspore {
 namespace kernel {

mindspore/ccsrc/backend/kernel_compiler/cpu/ps/embedding_look_up_ps_kernel.h

@@ -18,8 +18,8 @@
 
 #include <vector>
 #include <memory>
-#include "kernel/cpu/embedding_look_up_cpu_kernel.h"
+#include "backend/kernel_compiler/cpu/embedding_look_up_cpu_kernel.h"
-#include "kernel/cpu/ps/pserver_kernel.h"
+#include "backend/kernel_compiler/cpu/ps/pserver_kernel.h"
 
 namespace mindspore {
 namespace kernel {