diff --git a/.jenkins/check/config/filter_cpplint.txt b/.jenkins/check/config/filter_cpplint.txt index 5b9d0914af18693a7b8b0bf6a490c9d836853524..55dedbda17eaca55ad277f6ef71143cb46aea181 100644 --- a/.jenkins/check/config/filter_cpplint.txt +++ b/.jenkins/check/config/filter_cpplint.txt @@ -111,7 +111,9 @@ "mindspore/mindspore/ccsrc/plugin/device/ascend/kernel/aicore/op_proto" "build/include" "mindspore/mindspore/ccsrc/plugin/gpu/gpu_register_callback.cc" "build/include_order" "mindspore/mindspore/ccsrc/frontend/jit/ps/parse/data_converter.cc" "runtime/int" -"mindspore/mindspore/ops/grad/grad_array_ops.cc" "whitespace/indent_namespace" +"mindspore/mindspore/ops/grad/grad_array_ops.cc" "whitespace/indent_namespace" +"mindspore/mindspore/ops/kernel/cpu/eigen/random_poisson_cpu_kernel.cc" "whitespace/indent" +"mindspore/mindspore/ops/kernel/cpu/native/random_categorical_cpu_kernel.cc" "whitespace/indent" # Modelzoo "mindspore/model_zoo/official/cv/yolov4_tiny/infer/mxbase/src/Yolov4TinyDetection.h" "runtime/references" diff --git a/mindspore/ccsrc/backend/common/device_address_utils.cc b/mindspore/ccsrc/backend/common/device_address_utils.cc index c8835458394ddf654dfa9e11aa1d804eed710911..a6be2cb2ee81de0c64504cee64341a2387686959 100644 --- a/mindspore/ccsrc/backend/common/device_address_utils.cc +++ b/mindspore/ccsrc/backend/common/device_address_utils.cc @@ -47,7 +47,7 @@ #include "include/backend/debug/data_dump/dump_json_parser.h" #include "ir/device_type.h" #endif -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "mindspore/ops/op_def/auto_generate/gen_ops_primitive_m.h" #include "mindspore/core/include/ir/tensor_new.h" #include "utils/stream_guard.h" diff --git a/mindspore/ccsrc/backend/common/device_address_utils.h b/mindspore/ccsrc/backend/common/device_address_utils.h index 6d40dc18bcb04bde1f7a9d19055961f3315f6865..0262bf1417a94b8b81d88be1f3109a6e447d28df 100644 --- a/mindspore/ccsrc/backend/common/device_address_utils.h +++ b/mindspore/ccsrc/backend/common/device_address_utils.h @@ -23,7 +23,7 @@ #include #include "runtime/hardware_abstract/device_context/device_context.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "include/runtime/hardware_abstract/kernel_base/kernel.h" #include "mindapi/base/type_traits.h" @@ -154,7 +154,7 @@ class BACKEND_COMMON_EXPORT DeviceAddressUtils { template static void ProcessCrossStreamAddress(const std::string &op_name, const DeviceContext *device_context, - size_t op_stream_id, const T &... args) { + size_t op_stream_id, const T &...args) { // memory_stream_addresses pair : memory_stream_id, address. std::vector> cross_stream_addresses; (GetCrossStreamAddressInfo(op_stream_id, &cross_stream_addresses, args), ...); @@ -173,7 +173,7 @@ class BACKEND_COMMON_EXPORT DeviceAddressUtils { template static void ProcessCrossStreamAddressWithEvent(const std::string &op_name, const DeviceContext *device_context, - size_t op_stream_id, const DeviceEventPtr &event, const T &... args) { + size_t op_stream_id, const DeviceEventPtr &event, const T &...args) { // memory_stream_addresses pair : memory_stream_id, address. std::vector> cross_stream_addresses; (GetCrossStreamAddressInfo(op_stream_id, &cross_stream_addresses, args), ...); diff --git a/mindspore/ccsrc/backend/common/pass_manager/pattern_engine.cc b/mindspore/ccsrc/backend/common/pass_manager/pattern_engine.cc index ffe9d19c6a54ac2df318fdfeb47cb32eee50e46a..70c24e20a4e4a6451ebac3fce3938c40bd6ae83a 100644 --- a/mindspore/ccsrc/backend/common/pass_manager/pattern_engine.cc +++ b/mindspore/ccsrc/backend/common/pass_manager/pattern_engine.cc @@ -65,7 +65,7 @@ std::ostream &operator<<(std::ostream &os, const VarPtr &var) { } template <> -std::ostream &operator<<(std::ostream &os, const Equiv &equiv) { +std::ostream &operator<< (std::ostream &os, const Equiv &equiv) { os << "[Equiv]" << "\n"; for (auto &equiv_item : equiv) { diff --git a/mindspore/ccsrc/backend/ge_backend/executor/ge_device_res_manager.h b/mindspore/ccsrc/backend/ge_backend/executor/ge_device_res_manager.h index 4796f5d8b13451f60f55bc8743e4247c89bd8bc6..51c22ecba01ce8f7810f9bd78b79fc6e349f43bd 100644 --- a/mindspore/ccsrc/backend/ge_backend/executor/ge_device_res_manager.h +++ b/mindspore/ccsrc/backend/ge_backend/executor/ge_device_res_manager.h @@ -20,7 +20,7 @@ #include #include "external/ge/ge_allocator.h" #include "ir/device_address.h" -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" namespace mindspore { namespace backend { diff --git a/mindspore/ccsrc/backend/ge_backend/ge_backend.cc b/mindspore/ccsrc/backend/ge_backend/ge_backend.cc index 882b9c98b2c3a8fe5ef342df4d0a06f3461dedae..98f575fb8901e5228aee8700bd5140b6faa9b402 100644 --- a/mindspore/ccsrc/backend/ge_backend/ge_backend.cc +++ b/mindspore/ccsrc/backend/ge_backend/ge_backend.cc @@ -49,7 +49,7 @@ #include "abstract/abstract_function.h" #include "mindspore/ops/op_def/array_ops.h" #include "mindspore/ops/op_def/sparse_tensor_ops.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "plugin/ascend/res_manager/stream_manager/ascend_stream_manager.h" #include "include/utils/scoped_long_running.h" #include "include/runtime/memory/mem_pool/mem_tracker.h" @@ -69,7 +69,7 @@ #include "plugin/ascend/res_manager/device_context_conf/op_tuning_conf.h" #include "plugin/ascend/res_manager/hal_manager/ascend_hal_manager.h" #include "plugin/ascend/res_manager/device_context_conf/op_debug_conf.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "plugin/ascend/res_manager/mbuf_manager/tensorreport_utils.h" #include "plugin/ascend/res_manager/mbuf_manager/tensorprint_utils.h" #include "plugin/ascend/res_manager/mbuf_manager/tensorsummary_utils.h" diff --git a/mindspore/ccsrc/backend/ge_backend/runtime/actor/super_kernel_actor.cc b/mindspore/ccsrc/backend/ge_backend/runtime/actor/super_kernel_actor.cc index 0f3314931ced4d201081a22f772660a5e1b080f3..729e85fe719816f3c2132177fd2d727b4d31826f 100644 --- a/mindspore/ccsrc/backend/ge_backend/runtime/actor/super_kernel_actor.cc +++ b/mindspore/ccsrc/backend/ge_backend/runtime/actor/super_kernel_actor.cc @@ -22,7 +22,7 @@ #include "backend/ge_backend/runtime/actor/output_actor.h" #include "backend/ge_backend/runtime/actor/memory_manager_actor.h" #include "backend/ge_backend/runtime/actor/debug_actor.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "async/async.h" #include "utils/llm_manager.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/backend/ge_backend/utils/device_address_utils.cc b/mindspore/ccsrc/backend/ge_backend/utils/device_address_utils.cc index 1487cd31b73a77f033044b8a9689aec17a2e9cb1..359c19caa200e4f8deafddcd743a07503a0adc14 100644 --- a/mindspore/ccsrc/backend/ge_backend/utils/device_address_utils.cc +++ b/mindspore/ccsrc/backend/ge_backend/utils/device_address_utils.cc @@ -27,7 +27,7 @@ #include "ir/graph_utils.h" #include "utils/shape_utils.h" #include "frontend/ir/tensor_py.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "runtime/hardware_abstract/utils.h" #include "runtime/hardware_abstract/device_context/device_context.h" #include "pybind_api/gil_scoped_long_running.h" diff --git a/mindspore/ccsrc/backend/ms_backend/ms_backend.cc b/mindspore/ccsrc/backend/ms_backend/ms_backend.cc index ce070f8ad74ec6c4702f840b390b74a102e0c028..ab6e50c2c9328e83e88e6b3a78a6795776600b1d 100644 --- a/mindspore/ccsrc/backend/ms_backend/ms_backend.cc +++ b/mindspore/ccsrc/backend/ms_backend/ms_backend.cc @@ -52,7 +52,7 @@ #include "backend/common/device_address_utils.h" #include "backend/common/pass_manager/dynamic_shape_helper.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "runtime/pipeline/task/run_graph_task.h" #include "include/utils/stub_tensor.h" diff --git a/mindspore/ccsrc/backend/ms_backend/ms_backend_base.cc b/mindspore/ccsrc/backend/ms_backend/ms_backend_base.cc index 190e3348eeb2fe9e142dbe75bc82df9bae53c643..0bdea649b71e38ddf159a5933fb3e1851adca009 100644 --- a/mindspore/ccsrc/backend/ms_backend/ms_backend_base.cc +++ b/mindspore/ccsrc/backend/ms_backend/ms_backend_base.cc @@ -48,12 +48,12 @@ #include "mindspore/ops/op_def/nn_ops.h" #include "backend/common/device_address_utils.h" #include "runtime/core/graph_executor/pre_launch/pre_launch_comm.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "runtime/hardware_abstract/utils.h" #include "runtime/core/graph_scheduler/base/graph_compiler.h" #include "runtime/core/graph_scheduler/base/graph_scheduler.h" #include "runtime/core/graph_scheduler/base/graph_adapter.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pybind_api/gil_scoped_long_running.h" #include "utils/file_utils.h" #include "utils/log_adapter.h" diff --git a/mindspore/ccsrc/cluster/init.cc b/mindspore/ccsrc/cluster/init.cc index c8ee744aea83d2cca9035f72bc0921906527b3b9..6355815c1cc28c9bbd432e56d8514db191e961aa 100644 --- a/mindspore/ccsrc/cluster/init.cc +++ b/mindspore/ccsrc/cluster/init.cc @@ -25,7 +25,7 @@ #include #include "include/utils/callback.h" #include "tools/error_handler/exit_handler.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "utils/ms_exception.h" namespace mindspore { diff --git a/mindspore/ccsrc/frontend/ir/dlpack_utils.cc b/mindspore/ccsrc/frontend/ir/dlpack_utils.cc index c230f1d1c1bde938777c0b8f0de5a3be8822b200..84e45315f3f3a2a023b71923e2114f630421fece 100644 --- a/mindspore/ccsrc/frontend/ir/dlpack_utils.cc +++ b/mindspore/ccsrc/frontend/ir/dlpack_utils.cc @@ -25,7 +25,7 @@ #include "ir/tensor_storage_info.h" #include "runtime/hardware_abstract/device_context/device_context.h" #include "backend/common/device_address_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "mindspore/ccsrc/pyboost/functions/auto_generate/functions.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" diff --git a/mindspore/ccsrc/frontend/ir/tensor_py.cc b/mindspore/ccsrc/frontend/ir/tensor_py.cc index dcf4288b75f2d517ccdbaabc3705030bfff9afc0..c5c8eed7565069da829875d1139983939cd9db77 100644 --- a/mindspore/ccsrc/frontend/ir/tensor_py.cc +++ b/mindspore/ccsrc/frontend/ir/tensor_py.cc @@ -29,7 +29,7 @@ #include "tools/profiler/profiler.h" #include "include/utils/pynative/adapter.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/backend/mbuf_device_address.h" #include "runtime/core/graph_scheduler/base/move_to.h" #include "utils/value_utils.h" diff --git a/mindspore/ccsrc/frontend/jit/pi/runtime.cc b/mindspore/ccsrc/frontend/jit/pi/runtime.cc index 829d69866ea3f3df91ab239ae0950602addc414b..b73bfe2e39b4ee6c4bb3f20b869fe8fc9a99a176 100644 --- a/mindspore/ccsrc/frontend/jit/pi/runtime.cc +++ b/mindspore/ccsrc/frontend/jit/pi/runtime.cc @@ -43,7 +43,7 @@ #include "frontend/jit/pi/capture_context.h" #include "frontend/jit/ps/executor/jit_executor_py.h" #include "frontend/jit/pi/python_adapter/py_frame.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "mindspore/ccsrc/utils/ir_dump/anf_ir_dump.h" #include "frontend/jit/pi/graph_capture/code_generator.h" #include "utils/convert_utils_base.h" diff --git a/mindspore/ccsrc/frontend/jit/pi/utils/allocator.h b/mindspore/ccsrc/frontend/jit/pi/utils/allocator.h index f75e1495e390fa18422d3831b1ea4280e22e40c9..ff3b1f3d342e3607a8e66f7c6abb8bacf490ef67 100644 --- a/mindspore/ccsrc/frontend/jit/pi/utils/allocator.h +++ b/mindspore/ccsrc/frontend/jit/pi/utils/allocator.h @@ -37,14 +37,14 @@ class Allocator { ValueNode *NewValueNode(AObject *a, int b, int c, const std::vector &d); template - T *NewNode(Args &&... args) { + T *NewNode(Args &&...args) { T *v = new T(std::forward(args)...); AddNodePool(v); return v; } template - T *NewInstr(Args &&... args) { + T *NewInstr(Args &&...args) { T *v = new T(std::forward(args)...); AddInstrPool(v); return v; diff --git a/mindspore/ccsrc/include/cluster/topology/collective_manager.h b/mindspore/ccsrc/include/cluster/topology/collective_manager.h index e304eadb01058a5eb24f3a5275365aaa38a47d52..4d2e41e4dd4659db4d5e8d2e306e211574dc0140 100644 --- a/mindspore/ccsrc/include/cluster/topology/collective_manager.h +++ b/mindspore/ccsrc/include/cluster/topology/collective_manager.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_DISTRIBUTED_COLLECTIVE_COLLECTIVE_MANAGER_H_ -#define MINDSPORE_CCSRC_DISTRIBUTED_COLLECTIVE_COLLECTIVE_MANAGER_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COLLECTIVE_MANAGER_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COLLECTIVE_MANAGER_H_ #include #include @@ -34,8 +34,8 @@ #else #include "include/cluster/topology/dummy_cluster_context.h" #endif -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "runtime/hardware_abstract/visible.h" @@ -305,4 +305,4 @@ class RUNTIME_HARDWARE_EXPORT CollectiveManager { } // namespace collective } // namespace distributed } // namespace mindspore -#endif // MINDSPORE_CCSRC_DISTRIBUTED_COLLECTIVE_COLLECTIVE_MANAGER_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COLLECTIVE_MANAGER_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_comm_lib_loader.h b/mindspore/ccsrc/include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h similarity index 85% rename from mindspore/ccsrc/runtime/hardware_abstract/collective/collective_comm_lib_loader.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h index 9495ec479018a86784dabbaa706edc47e7e29b8b..3a90b742478517fac3662ba41e7a2c20238fbc0e 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_comm_lib_loader.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_COLLECTIVE_LIB_LOADER_H_ -#define MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_COLLECTIVE_LIB_LOADER_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COLLECTIVE_LIB_LOADER_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COLLECTIVE_LIB_LOADER_H_ #include #include #include "utils/dlopen_macro.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "runtime/hardware_abstract/visible.h" namespace mindspore { @@ -57,4 +57,4 @@ ORIGIN_METHOD(communication_lib_instance, mindspore::device::CollectiveCommunica ORIGIN_METHOD(ascend_communication_lib_instance, mindspore::device::CollectiveCommunicationLib *) ORIGIN_METHOD(lowlatency_communication_lib_instance, mindspore::device::CollectiveCommunicationLib *) ORIGIN_METHOD(multi_ascend_communication_lib_instance, mindspore::device::CollectiveCommunicationLib *) -#endif // MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_COLLECTIVE_LIB_LOADER_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COLLECTIVE_LIB_LOADER_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_communication_lib.h b/mindspore/ccsrc/include/runtime/hardware_abstract/collective/collective_communication_lib.h similarity index 95% rename from mindspore/ccsrc/runtime/hardware_abstract/collective/collective_communication_lib.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/collective/collective_communication_lib.h index 38ec3c07b4f488c5d1fa883d4d7678567c8032fd..aa608255e5d61cbdba749e5f8e96875c0f6558a0 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_communication_lib.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/collective/collective_communication_lib.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_COLLECTIVE_COMMUNICATION_LIB_H_ -#define MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_COLLECTIVE_COMMUNICATION_LIB_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COLLECTIVE_COMMUNICATION_LIB_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COLLECTIVE_COMMUNICATION_LIB_H_ #include #include @@ -25,7 +25,7 @@ #include #include #include "ir/dtype/type_id.h" -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" #include "runtime/hardware_abstract/visible.h" namespace mindspore { @@ -211,4 +211,4 @@ class RUNTIME_HARDWARE_EXPORT CollectiveCommunicationLib { using CollectiveCommunicationLibPtr = CollectiveCommunicationLib *; } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_COLLECTIVE_COMMUNICATION_LIB_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COLLECTIVE_COMMUNICATION_LIB_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/collective/communication_group.h b/mindspore/ccsrc/include/runtime/hardware_abstract/collective/communication_group.h similarity index 93% rename from mindspore/ccsrc/runtime/hardware_abstract/collective/communication_group.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/collective/communication_group.h index 83f84cd1fa5598d0c2ca68eb49486cb38f1f5687..8e899231ca001e4c05e46ba3f9e6999b82e30665 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/collective/communication_group.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/collective/communication_group.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_COMMUNICATION_GROUP_H_ -#define MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_COMMUNICATION_GROUP_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COMMUNICATION_GROUP_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COMMUNICATION_GROUP_H_ #include #include @@ -97,7 +97,8 @@ using CommunicationGroupPtr = std::shared_ptr; } // namespace mindspore #ifndef COMM_GROUP_HDR_FILE_REL_PATH -#define COMM_GROUP_HDR_FILE_REL_PATH "mindspore/ccsrc/runtime/hardware_abstract/collective/communication_group.h" +#define COMM_GROUP_HDR_FILE_REL_PATH \ + "mindspore/ccsrc/include/runtime/hardware_abstract/collective/communication_group.h" #endif static constexpr size_t GetCommLibFileRelPathPos() noexcept { return sizeof(__FILE__) > sizeof(COMM_GROUP_HDR_FILE_REL_PATH) @@ -128,4 +129,4 @@ static constexpr size_t GetCommLibFileRelPathPos() noexcept { pybind11::pybind11_fail(oss.str()); \ } \ } while (0) -#endif // MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_COMMUNICATION_GROUP_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_COMMUNICATION_GROUP_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/collective/dummy_collective_communication_lib.h b/mindspore/ccsrc/include/runtime/hardware_abstract/collective/dummy_collective_communication_lib.h similarity index 86% rename from mindspore/ccsrc/runtime/hardware_abstract/collective/dummy_collective_communication_lib.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/collective/dummy_collective_communication_lib.h index 1e786c7187fad8da738190f6672989c7badee8c8..ab0f73479cfc379dffc808df2824d7a9913f603f 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/collective/dummy_collective_communication_lib.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/collective/dummy_collective_communication_lib.h @@ -13,14 +13,14 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_DUMMY_COLLECTIVE_COMMUNICATION_LIB_H_ -#define MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_DUMMY_COLLECTIVE_COMMUNICATION_LIB_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_DUMMY_COLLECTIVE_COMMUNICATION_LIB_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_DUMMY_COLLECTIVE_COMMUNICATION_LIB_H_ #include #include -#include "runtime/hardware_abstract/collective/communication_group.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "utils/ms_context.h" #include "runtime/hardware_abstract/visible.h" @@ -83,4 +83,4 @@ class RUNTIME_HARDWARE_EXPORT DummyCollectiveCommunicationLib : public Collectiv }; } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_RUNTIME_HARDWARE_COLLECTIVE_DUMMY_COLLECTIVE_COMMUNICATION_LIB_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_HARDWARE_ABSTRACT_COLLECTIVE_DUMMY_COLLECTIVE_COMMUNICATION_LIB_H_ diff --git a/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/blocking_queue.h b/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/blocking_queue.h index 59dadb1ae5d13f2bd86b88617b7699ab2a7e4013..44e195304582e7006a0bbc93030766e3d99df28d 100644 --- a/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/blocking_queue.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/blocking_queue.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_INCLUDE_BACKEND_DATA_QUEUE_BLOCKING_QUEUE_H -#define MINDSPORE_CCSRC_INCLUDE_BACKEND_DATA_QUEUE_BLOCKING_QUEUE_H +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_DATA_QUEUE_BLOCKING_QUEUE_H +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_DATA_QUEUE_BLOCKING_QUEUE_H #include #include @@ -55,4 +55,4 @@ class RUNTIME_HARDWARE_EXPORT BlockingQueue { }; } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_INCLUDE_BACKEND_DATA_QUEUE_BLOCKING_QUEUE_H +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_DATA_QUEUE_BLOCKING_QUEUE_H diff --git a/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/data_queue.h b/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/data_queue.h index 6926122c9fa367e58647b53b0efc2eb95bc0cbf5..6d4d6d615afa24dac6caae1bf8e200d5aa3f44fc 100644 --- a/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/data_queue.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/data_queue.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_INCLUDE_BACKEND_DATA_QUEUE_DATA_QUEUE_H -#define MINDSPORE_CCSRC_INCLUDE_BACKEND_DATA_QUEUE_DATA_QUEUE_H +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_DATA_QUEUE_DATA_QUEUE_H +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_DATA_QUEUE_DATA_QUEUE_H #include #include @@ -75,4 +75,4 @@ class RUNTIME_HARDWARE_EXPORT DataQueue { }; } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_INCLUDE_BACKEND_DATA_QUEUE_DATA_QUEUE_H +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_DATA_QUEUE_DATA_QUEUE_H diff --git a/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/data_queue_mgr.h b/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/data_queue_mgr.h index b5b6c909db3b7512e18370bcde248ae2eaf43ade..aeb442286221f158622875f80f2de493f6074da8 100644 --- a/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/data_queue_mgr.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/data_queue/data_queue_mgr.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_INCLUDE_BACKEND_DATA_QUEUE_DATA_QUEUE_MGR_H -#define MINDSPORE_CCSRC_INCLUDE_BACKEND_DATA_QUEUE_DATA_QUEUE_MGR_H +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_DATA_QUEUE_DATA_QUEUE_MGR_H +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_DATA_QUEUE_DATA_QUEUE_MGR_H #include #include @@ -153,4 +153,4 @@ RUNTIME_HARDWARE_EXPORT void RetryPeakItemFromDataQueue(const AnfNodePtr &data_k } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_INCLUDE_BACKEND_DATA_QUEUE_DATA_QUEUE_MGR_H +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_DATA_QUEUE_DATA_QUEUE_MGR_H diff --git a/mindspore/ccsrc/runtime/hardware_abstract/gsm/aio_plugin.h b/mindspore/ccsrc/include/runtime/hardware_abstract/gsm/aio_plugin.h similarity index 93% rename from mindspore/ccsrc/runtime/hardware_abstract/gsm/aio_plugin.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/gsm/aio_plugin.h index e1a27367534b5f274a5ef22902a014326e295bbd..a8be3f38ae8cfe3956c7fdb40ed1e4a8d843512d 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/gsm/aio_plugin.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/gsm/aio_plugin.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_RUNTIME_DEVICE_GSM_FILE_AIO_PLUGIN_H_ -#define MINDSPORE_CCSRC_RUNTIME_DEVICE_GSM_FILE_AIO_PLUGIN_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_GSM_AIO_PLUGIN_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_GSM_AIO_PLUGIN_H_ #include #include @@ -110,4 +110,4 @@ extern "C" AIO_EXPORT AsyncIO *get_aio_instance(); } // namespace device } // namespace mindspore #undef LinuxAIO -#endif // MINDSPORE_CCSRC_RUNTIME_DEVICE_GSM_FILE_AIO_PLUGIN_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_GSM_AIO_PLUGIN_H_ diff --git a/mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/common_utils.h b/mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/common_utils.h index a3e3a83012ea39d32426b48b0086101be782085b..d6703cf1e7e1e8676d70d4678c8d063c4733377d 100644 --- a/mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/common_utils.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/common_utils.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_OPS_COMMON_COMMON_UTILS_H_ -#define MINDSPORE_OPS_COMMON_COMMON_UTILS_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_COMMON_UTILS_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_COMMON_UTILS_H_ #include #include @@ -295,4 +295,4 @@ inline void GetRawAddress(const std::vector &addrs, std::vector #include @@ -128,4 +128,4 @@ class RUNTIME_HARDWARE_EXPORT DeviceTensorStore { } // namespace runtime } // namespace mindspore -#endif // MINDSPORE_CCSRC_RUNTIME_FRAMEWORK_DEVICE_TENSOR_STORE_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_DEVICE_TENSOR_STORE_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ_manager.h b/mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/environ_manager.h similarity index 87% rename from mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ_manager.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/environ_manager.h index 8a41b23781b851136c48cb1aa3e2612a9dd31f33..4847527980fed1f10d0c85ae0856dbb03e9f92a1 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ_manager.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/environ_manager.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_ENVIRON_MANAGER_H_ -#define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_ENVIRON_MANAGER_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_ENVIRON_MANAGER_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_ENVIRON_MANAGER_H_ #include #include @@ -63,4 +63,4 @@ class RUNTIME_HARDWARE_EXPORT EnvironMgr { } // namespace kernel } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_ENVIRON_MANAGER_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_ENVIRON_MANAGER_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/philox_random.h b/mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/philox_random.h similarity index 94% rename from mindspore/ccsrc/runtime/hardware_abstract/kernel_base/philox_random.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/philox_random.h index 973a5751c536d0331d7690f7b19e31a0fd9d57a6..a6eb7bab13a59c0b88539b813c126e15c6f7fe3f 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/philox_random.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/kernel_base/philox_random.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_KERNEL_PHILOX_RANDOM_H_ -#define MINDSPORE_CCSRC_KERNEL_PHILOX_RANDOM_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_PHILOX_RANDOM_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_PHILOX_RANDOM_H_ #include #include @@ -152,4 +152,4 @@ RUNTIME_HARDWARE_EXPORT uint64_t GetSeed(const uint64_t &global_seed, const uint } // namespace random } // namespace kernel } // namespace mindspore -#endif // MINDSPORE_CCSRC_KERNEL_PHILOX_RANDOM_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_PHILOX_RANDOM_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/memory_manager.h b/mindspore/ccsrc/include/runtime/hardware_abstract/memory_manager/memory_manager.h similarity index 95% rename from mindspore/ccsrc/runtime/hardware_abstract/memory_manager/memory_manager.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/memory_manager/memory_manager.h index 166ce321a0951fa5a86ea6251500b0232a9e5472..a46556ea6b270952ef52eb4f01b2c5984270842d 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/memory_manager.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/memory_manager/memory_manager.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_RUNTIME_DEVICE_MEMORY_MANAGER_H_ -#define MINDSPORE_CCSRC_RUNTIME_DEVICE_MEMORY_MANAGER_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_MEMORY_MANAGER_MEMORY_MANAGER_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_MEMORY_MANAGER_MEMORY_MANAGER_H_ #include #include #include @@ -145,4 +145,4 @@ class RUNTIME_HARDWARE_EXPORT MemoryManager { }; } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_RUNTIME_DEVICE_MEMORY_MANAGER_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_MEMORY_MANAGER_MEMORY_MANAGER_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/pin_mem_pool.h b/mindspore/ccsrc/include/runtime/hardware_abstract/memory_manager/pin_mem_pool.h similarity index 86% rename from mindspore/ccsrc/runtime/hardware_abstract/memory_manager/pin_mem_pool.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/memory_manager/pin_mem_pool.h index 919f969199b8ecaea8ea8be3d3b86501a324831a..478747501fc42f4bfbaed0fc6f4129296a2ffaf3 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/pin_mem_pool.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/memory_manager/pin_mem_pool.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_RUNTIME_DEVICE_GSM_PIN_MEM_POOL_H_ -#define MINDSPORE_CCSRC_RUNTIME_DEVICE_GSM_PIN_MEM_POOL_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_MEMORY_MANAGER_PIN_MEM_POOL_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_MEMORY_MANAGER_PIN_MEM_POOL_H_ #include #include @@ -53,4 +53,4 @@ class RUNTIME_HARDWARE_EXPORT PinMemPool : public DynamicMemPoolBestFit, public } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_RUNTIME_DEVICE_GSM_PIN_MEM_POOL_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_MEMORY_MANAGER_PIN_MEM_POOL_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/swap_manager.h b/mindspore/ccsrc/include/runtime/hardware_abstract/memory_manager/swap_manager.h similarity index 88% rename from mindspore/ccsrc/runtime/hardware_abstract/memory_manager/swap_manager.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/memory_manager/swap_manager.h index da4ea4a226911246cded10ab9c0abbcc01e7df96..ae12fb047fab090fa9e81cc1005377a14b2bf686 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/swap_manager.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/memory_manager/swap_manager.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_RUNTIME_DEVICE_GSM_SWAP_MANAGER_H_ -#define MINDSPORE_CCSRC_RUNTIME_DEVICE_GSM_SWAP_MANAGER_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_MEMORY_MANAGER_SWAP_MANAGER_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_MEMORY_MANAGER_SWAP_MANAGER_H_ #include #include @@ -25,7 +25,7 @@ #include "include/runtime/memory/mem_pool/dynamic_mem_pool.h" #include "ir/device_address.h" #include "runtime/hardware_abstract/memory_manager/io_handle.h" -#include "runtime/hardware_abstract/memory_manager/pin_mem_pool.h" +#include "include/runtime/hardware_abstract/memory_manager/pin_mem_pool.h" #include "runtime/hardware_abstract/visible.h" namespace mindspore { @@ -76,4 +76,4 @@ using SwapManagerPtr = std::shared_ptr; } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_RUNTIME_DEVICE_GSM_SWAP_MANAGER_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_MEMORY_MANAGER_SWAP_MANAGER_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/stream/multi_stream_controller.h b/mindspore/ccsrc/include/runtime/hardware_abstract/stream/multi_stream_controller.h similarity index 90% rename from mindspore/ccsrc/runtime/hardware_abstract/stream/multi_stream_controller.h rename to mindspore/ccsrc/include/runtime/hardware_abstract/stream/multi_stream_controller.h index 60f3901151dc53535c07fcb7f9bc7c4733c87fdb..d4490456eb4b5dc42532d1f98aa33826697c3a6e 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/stream/multi_stream_controller.h +++ b/mindspore/ccsrc/include/runtime/hardware_abstract/stream/multi_stream_controller.h @@ -13,8 +13,8 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_RUNTIME_DEVICE_MULTI_STREAM_CONTROLLER_HEADER_H -#define MINDSPORE_CCSRC_RUNTIME_DEVICE_MULTI_STREAM_CONTROLLER_HEADER_H +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_STREAM_MULTI_STREAM_CONTROLLER_HEADER_H +#define MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_STREAM_MULTI_STREAM_CONTROLLER_HEADER_H #include @@ -85,4 +85,4 @@ class RUNTIME_HARDWARE_EXPORT MultiStreamController { using MultiStreamControllerPtr = std::shared_ptr; } // namespace device } // namespace mindspore -#endif +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIMR_HARDWARE_ABSTRACT_STREAM_MULTI_STREAM_CONTROLLER_HEADER_H diff --git a/mindspore/ccsrc/include/runtime/memory/mem_pool/abstract_dynamic_mem_pool.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/abstract_dynamic_mem_pool.h index 8baba6d19f887dacab25c5eb00b02a1a158a1e1f..fc5818239f004970a607d12cb61ba9035ab6e717 100644 --- a/mindspore/ccsrc/include/runtime/memory/mem_pool/abstract_dynamic_mem_pool.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/abstract_dynamic_mem_pool.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_ABSTRACT_DYNAMIC_MEM_POOL_H_ -#define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_ABSTRACT_DYNAMIC_MEM_POOL_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_ABSTRACT_DYNAMIC_MEM_POOL_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_ABSTRACT_DYNAMIC_MEM_POOL_H_ #include #include @@ -549,4 +549,4 @@ class BACKEND_EXPORT AbstractEnhancedDynamicMemPool : public AbstractDynamicMemP }; } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_ABSTRACT_DYNAMIC_MEM_POOL_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_ABSTRACT_DYNAMIC_MEM_POOL_H_ diff --git a/mindspore/ccsrc/include/runtime/memory/mem_pool/address_discretizer.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/address_discretizer.h index 572bb619b66f5ace153c9a22f391ab77fd6d058f..a37c1dab99c005cda9fb0ea22e4590f5b923bff4 100644 --- a/mindspore/ccsrc/include/runtime/memory/mem_pool/address_discretizer.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/address_discretizer.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_MEM_REUSE_ADDRESS_DISCRETIZER_H_ -#define MINDSPORE_CCSRC_BACKEND_MEM_REUSE_ADDRESS_DISCRETIZER_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_ADDRESS_DISCRETIZER_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_ADDRESS_DISCRETIZER_H_ #include #include @@ -60,4 +60,4 @@ class AddressDiscretizer { } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_MEM_REUSE_ADDRESS_DISCRETIZER_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_ADDRESS_DISCRETIZER_H_ diff --git a/mindspore/ccsrc/include/runtime/memory/mem_pool/dynamic_mem_pool.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/dynamic_mem_pool.h index e9e57ba8f32ced8a83866986011a52dfc855fbf6..cede42f7c11fdbe1bd86caae682d0f7d88fab624 100644 --- a/mindspore/ccsrc/include/runtime/memory/mem_pool/dynamic_mem_pool.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/dynamic_mem_pool.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_DYNAMIC_MEM_POOL_H_ -#define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_DYNAMIC_MEM_POOL_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_DYNAMIC_MEM_POOL_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_DYNAMIC_MEM_POOL_H_ #include #include @@ -406,4 +406,4 @@ struct MemoryTimeEvent { using MemoryTimeEventPtr = std::shared_ptr; } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_DYNAMIC_MEM_POOL_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_DYNAMIC_MEM_POOL_H_ diff --git a/mindspore/ccsrc/include/runtime/memory/mem_pool/max_segment_tree.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/max_segment_tree.h index d834e8fbb9b3fb8853f6c4721b71ca1ca5fca1c2..761edf036dc557c39fff11238d04dce08c30e354 100644 --- a/mindspore/ccsrc/include/runtime/memory/mem_pool/max_segment_tree.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/max_segment_tree.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_MEM_REUSE_MAX_SEGMENT_TREE_H_ -#define MINDSPORE_CCSRC_BACKEND_MEM_REUSE_MAX_SEGMENT_TREE_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MAX_SEGMENT_TREE_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MAX_SEGMENT_TREE_H_ #include #include @@ -178,4 +178,4 @@ class MaxSegmentTree { }; } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_MEM_REUSE_MAX_SEGMENT_TREE_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MAX_SEGMENT_TREE_H_ diff --git a/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_dynamic_allocator.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_dynamic_allocator.h index 684f61bc25f2478819019322823515aa392602cd..b1be3bb52ed24cc936194ce53ab217b1c186e456 100644 --- a/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_dynamic_allocator.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_dynamic_allocator.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_MEM_DYNAMIC_ALLOCATOR_H_ -#define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_MEM_DYNAMIC_ALLOCATOR_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_DYNAMIC_ALLOCATOR_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_DYNAMIC_ALLOCATOR_H_ #include #include @@ -346,4 +346,4 @@ class BACKEND_EXPORT DynamicMemPoolBestFit : virtual public DynamicMemPool { }; } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_MEM_DYNAMIC_ALLOCATOR_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_DYNAMIC_ALLOCATOR_H_ diff --git a/mindspore/ccsrc/runtime/memory/mem_pool/mem_env.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_env.h similarity index 89% rename from mindspore/ccsrc/runtime/memory/mem_pool/mem_env.h rename to mindspore/ccsrc/include/runtime/memory/mem_pool/mem_env.h index a405b1dd81baccbd3eda6a7362eaedbbe36e1a82..8f8e21775cb11a78408d0589aac6bfaa92a628fc 100644 --- a/mindspore/ccsrc/runtime/memory/mem_pool/mem_env.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_env.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_MEMORY_MEM_POOL_MEM_ENV_H_ -#define MINDSPORE_CCSRC_MEMORY_MEM_POOL_MEM_ENV_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_ENV_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_ENV_H_ #include #include @@ -45,4 +45,4 @@ BACKEND_EXPORT bool IsDisableAllocConfig(const std::string &alloc_config); } // namespace mem_pool } // namespace memory } // namespace mindspore -#endif // MINDSPORE_CCSRC_MEMORY_MEM_POOL_MEM_ENV_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_ENV_H_ diff --git a/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_pool_util.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_pool_util.h index 5d4097db34a4ec0e4ccee7f3aea167c36b2c4dd3..66acc50c068ecef4933d327fa7415c3fe6e349ef 100644 --- a/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_pool_util.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_pool_util.h @@ -14,13 +14,13 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_MEMORY_MEM_POOL_MEM_POOL_UTIL_H_ -#define MINDSPORE_CCSRC_MEMORY_MEM_POOL_MEM_POOL_UTIL_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_POOL_UTIL_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_POOL_UTIL_H_ #include #include -#include "runtime/memory/mem_pool/mem_env.h" +#include "include/runtime/memory/mem_pool/mem_env.h" #include "include/backend/visible.h" #include "utils/ms_utils.h" diff --git a/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_tracker.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_tracker.h index 692a70fa73a07e5a81df6764864b820498c57407..1828ded9642f245566a81a6192490a7f9358a489 100644 --- a/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_tracker.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/mem_tracker.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_MEM_TRACKER_H_ -#define MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_MEM_TRACKER_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_TRACKER_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_TRACKER_H_ #include #include #include @@ -307,4 +307,4 @@ class BACKEND_EXPORT MemTrackerManager { } // namespace tracker } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_OPTIMIZER_MEM_REUSE_MEM_TRACKER_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_MEM_TRACKER_H_ diff --git a/mindspore/ccsrc/include/runtime/memory/mem_pool/race_checker.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/race_checker.h index 4609ddb6d899c9fafbddd461eecc5431d672989e..55b0897dd6863c9539370967cff2b0cb48445591 100644 --- a/mindspore/ccsrc/include/runtime/memory/mem_pool/race_checker.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/race_checker.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_MEM_REUSE_RACE_CHECKER_H_ -#define MINDSPORE_CCSRC_BACKEND_MEM_REUSE_RACE_CHECKER_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_RACE_CHECKER_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_RACE_CHECKER_H_ #include #include @@ -61,4 +61,4 @@ class RaceChecker { } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_MEM_REUSE_RACE_CHECKER_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_RACE_CHECKER_H_ diff --git a/mindspore/ccsrc/include/runtime/memory/mem_pool/tracker_graph.h b/mindspore/ccsrc/include/runtime/memory/mem_pool/tracker_graph.h index 044b6458979dc1aaf461d3023a2fedb3962f0ae8..457dbee3463bb8e0e7591ce895d7e7bcff1cc54e 100644 --- a/mindspore/ccsrc/include/runtime/memory/mem_pool/tracker_graph.h +++ b/mindspore/ccsrc/include/runtime/memory/mem_pool/tracker_graph.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_MEM_REUSE_TRACKER_GRAPH_H_ -#define MINDSPORE_CCSRC_BACKEND_MEM_REUSE_TRACKER_GRAPH_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_TRACKER_GRAPH_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_TRACKER_GRAPH_H_ #include #include @@ -90,4 +90,4 @@ bool NeedSkipRaceCheck(const TaskInfoPtr &task_info); } // namespace tracker } // namespace device } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_MEM_REUSE_TRACKER_GRAPH_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_MEMORY_MEM_POOL_TRACKER_GRAPH_H_ diff --git a/mindspore/ccsrc/runtime/pipeline/async_rqueue.h b/mindspore/ccsrc/include/runtime/pipeline/async_rqueue.h similarity index 93% rename from mindspore/ccsrc/runtime/pipeline/async_rqueue.h rename to mindspore/ccsrc/include/runtime/pipeline/async_rqueue.h index 47b6a6d63c46b403502552525af1c78c142899c3..92b9b8dec3e7aa5ae486083a8820fb1981aa7beb 100644 --- a/mindspore/ccsrc/runtime/pipeline/async_rqueue.h +++ b/mindspore/ccsrc/include/runtime/pipeline/async_rqueue.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_MINDSPORE_CCSRC_RUNTIME_PYNATIVE_ASYNC_ASYNC_R_QUEUE_H_ -#define MINDSPORE_MINDSPORE_CCSRC_RUNTIME_PYNATIVE_ASYNC_ASYNC_R_QUEUE_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_PIPELINE_ASYNC_R_QUEUE_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_PIPELINE_ASYNC_R_QUEUE_H_ #include #include @@ -120,4 +120,4 @@ class RUNTIME_PIPELINE_EXPORT AsyncRQueue { using AsyncRQueuePtr = std::unique_ptr; } // namespace mindspore -#endif // MINDSPORE_MINDSPORE_CCSRC_RUNTIME_PYNATIVE_ASYNC_ASYNC_R_QUEUE_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_PIPELINE_ASYNC_R_QUEUE_H_ diff --git a/mindspore/ccsrc/runtime/pipeline/pipeline.h b/mindspore/ccsrc/include/runtime/pipeline/pipeline.h similarity index 89% rename from mindspore/ccsrc/runtime/pipeline/pipeline.h rename to mindspore/ccsrc/include/runtime/pipeline/pipeline.h index 3f912e3da0312d55e14ec7c214e47a02f4ceff03..1faebd5c99758107b5680361fd8f4218faf3151c 100644 --- a/mindspore/ccsrc/runtime/pipeline/pipeline.h +++ b/mindspore/ccsrc/include/runtime/pipeline/pipeline.h @@ -13,13 +13,13 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#ifndef MINDSPORE_MINDSPORE_CCSRC_RUNTIME_PIPELINE_PIPELINE_H_ -#define MINDSPORE_MINDSPORE_CCSRC_RUNTIME_PIPELINE_PIPELINE_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_PIPELINE_PIPELINE_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_PIPELINE_PIPELINE_H_ #include #include "utils/ms_utils.h" #include "runtime/pipeline/visible.h" -#include "runtime/pipeline/async_rqueue.h" +#include "include/runtime/pipeline/async_rqueue.h" namespace mindspore { namespace runtime { @@ -73,4 +73,4 @@ class RUNTIME_PIPELINE_EXPORT Pipeline { }; } // namespace runtime } // namespace mindspore -#endif // MINDSPORE_MINDSPORE_CCSRC_RUNTIME_PIPELINE_PIPELINE_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_PIPELINE_PIPELINE_H_ diff --git a/mindspore/ccsrc/include/runtime/utils/runtime_conf/runtime_conf.h b/mindspore/ccsrc/include/runtime/utils/runtime_conf/runtime_conf.h index 508795e0efbf06465d837a516298b1725429154c..b06629999d40f6064bc7d412ef76247e1f5a9aa7 100644 --- a/mindspore/ccsrc/include/runtime/utils/runtime_conf/runtime_conf.h +++ b/mindspore/ccsrc/include/runtime/utils/runtime_conf/runtime_conf.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_INCLUDE_COMMON_RUNTIME_CONF_RUNTIME_CONF_H_ -#define MINDSPORE_CCSRC_INCLUDE_COMMON_RUNTIME_CONF_RUNTIME_CONF_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_UTILS_RUNTIME_CONF_RUNTIME_CONF_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_UTILS_RUNTIME_CONF_RUNTIME_CONF_H_ #include #include @@ -164,4 +164,4 @@ RUNTIME_UTILS_EXPORT void ComputeThreadNums(size_t *actor_thread_num, size_t *ac } // namespace runtime } // namespace mindspore -#endif // MINDSPORE_CCSRC_INCLUDE_COMMON_RUNTIME_CONF_RUNTIME_CONF_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_UTILS_RUNTIME_CONF_RUNTIME_CONF_H_ diff --git a/mindspore/ccsrc/include/runtime/utils/runtime_conf/runtime_env.h b/mindspore/ccsrc/include/runtime/utils/runtime_conf/runtime_env.h index 287da5621d1e00f58a674066996ace35072be0e9..18b641c73211b1b337251e665b9daf5311889841 100644 --- a/mindspore/ccsrc/include/runtime/utils/runtime_conf/runtime_env.h +++ b/mindspore/ccsrc/include/runtime/utils/runtime_conf/runtime_env.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_INCLUDE_COMMON_RUNTIME_CONF_RUNTIME_ENV_H_ -#define MINDSPORE_CCSRC_INCLUDE_COMMON_RUNTIME_CONF_RUNTIME_ENV_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_UTILS_RUNTIME_CONF_RUNTIME_ENV_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_UTILS_RUNTIME_CONF_RUNTIME_ENV_H_ #include #include @@ -67,4 +67,4 @@ RUNTIME_UTILS_EXPORT bool IsEnableRuntimeConfig(const std::string &runtime_confi RUNTIME_UTILS_EXPORT bool IsDisableRuntimeConfig(const std::string &runtime_config); } // namespace runtime } // namespace mindspore -#endif // MINDSPORE_CCSRC_INCLUDE_COMMON_RUNTIME_CONF_RUNTIME_ENV_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_UTILS_RUNTIME_CONF_RUNTIME_ENV_H_ diff --git a/mindspore/ccsrc/include/runtime/utils/runtime_conf/thread_bind_core.h b/mindspore/ccsrc/include/runtime/utils/runtime_conf/thread_bind_core.h index 3c8caea61e1aaa912f608f3774f3ce6ee23ed90f..4c33814d2d9ebd5a0cdac770a4f7ad28a624bed2 100644 --- a/mindspore/ccsrc/include/runtime/utils/runtime_conf/thread_bind_core.h +++ b/mindspore/ccsrc/include/runtime/utils/runtime_conf/thread_bind_core.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_INCLUDE_COMMON_RUNTIME_CONF_THREAD_BIND_CORE_H_ -#define MINDSPORE_CCSRC_INCLUDE_COMMON_RUNTIME_CONF_THREAD_BIND_CORE_H_ +#ifndef MINDSPORE_CCSRC_INCLUDE_RUNTIME_UTILS_RUNTIME_CONF_THREAD_BIND_CORE_H_ +#define MINDSPORE_CCSRC_INCLUDE_RUNTIME_UTILS_RUNTIME_CONF_THREAD_BIND_CORE_H_ #include #include @@ -64,4 +64,4 @@ class RUNTIME_UTILS_EXPORT ThreadBindCore { } // namespace runtime } // namespace mindspore -#endif // MINDSPORE_CCSRC_INCLUDE_COMMON_RUNTIME_CONF_THREAD_BIND_CORE_H_ +#endif // MINDSPORE_CCSRC_INCLUDE_RUNTIME_UTILS_RUNTIME_CONF_THREAD_BIND_CORE_H_ diff --git a/mindspore/ccsrc/plugin/ascend/ascend_device_context.h b/mindspore/ccsrc/plugin/ascend/ascend_device_context.h index e446e1595a5edca7e6cd567cae720c147ed1f6a6..764103217f1b76bcc2f44ee69667eba3fe2913d8 100644 --- a/mindspore/ccsrc/plugin/ascend/ascend_device_context.h +++ b/mindspore/ccsrc/plugin/ascend/ascend_device_context.h @@ -20,7 +20,7 @@ #include #include #include "runtime/hardware_abstract/device_context/device_context.h" -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" #include "utils/ms_context.h" #include "plugin/ascend/res_manager/collective/ascend_collective_comm_lib.h" #include "plugin/ascend/kernel_executor/ascend_kernel_executor.h" diff --git a/mindspore/ccsrc/plugin/ascend/kernel_executor/ascend_kernel_executor.cc b/mindspore/ccsrc/plugin/ascend/kernel_executor/ascend_kernel_executor.cc index 14fcc33f5377c7a02672e6504051cb7f51b60d70..a3250edbccf80a38edd2deb1bfad9b5bdf8a705d 100644 --- a/mindspore/ccsrc/plugin/ascend/kernel_executor/ascend_kernel_executor.cc +++ b/mindspore/ccsrc/plugin/ascend/kernel_executor/ascend_kernel_executor.cc @@ -57,7 +57,7 @@ #endif #include "mindspore/ops/kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "pyboost/pyboost_utils.h" #include "pyboost/op_runner.h" diff --git a/mindspore/ccsrc/plugin/ascend/kernel_executor/ascend_kernel_executor.h b/mindspore/ccsrc/plugin/ascend/kernel_executor/ascend_kernel_executor.h index 34be8389f2b585107689c294c71c2f7582ac022c..5fb0e9d670f5405ce746c470525102f10c46f0ac 100644 --- a/mindspore/ccsrc/plugin/ascend/kernel_executor/ascend_kernel_executor.h +++ b/mindspore/ccsrc/plugin/ascend/kernel_executor/ascend_kernel_executor.h @@ -25,7 +25,7 @@ #include #include #include "runtime/hardware_abstract/device_context/device_context.h" -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" #include "include/utils/anfalgo.h" #include "include/backend/anf_runtime_algorithm.h" diff --git a/mindspore/ccsrc/plugin/ascend/kernel_executor/rts/move_to.cc b/mindspore/ccsrc/plugin/ascend/kernel_executor/rts/move_to.cc index 857b5b9cc74ac657f8596192da77d0cbcc470524..110b656bf81a9fcf0a0b4705f9c0e78dbcac2631 100644 --- a/mindspore/ccsrc/plugin/ascend/kernel_executor/rts/move_to.cc +++ b/mindspore/ccsrc/plugin/ascend/kernel_executor/rts/move_to.cc @@ -24,7 +24,7 @@ #include "include/utils/anfalgo.h" #include "include/utils/utils.h" #include "include/backend/anf_runtime_algorithm.h" -#include "runtime/hardware_abstract/memory_manager/swap_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/swap_manager.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "utils/log_adapter.h" #include "plugin/ascend/res_manager/symbol_interface/acl_rt_symbol.h" diff --git a/mindspore/ccsrc/plugin/ascend/kernel_executor/rts/move_to.h b/mindspore/ccsrc/plugin/ascend/kernel_executor/rts/move_to.h index 13beb253f19f8e7bcdd66352f28371d8036e874c..188715096fe477b4c908671e22a022123d0f04e9 100644 --- a/mindspore/ccsrc/plugin/ascend/kernel_executor/rts/move_to.h +++ b/mindspore/ccsrc/plugin/ascend/kernel_executor/rts/move_to.h @@ -23,7 +23,7 @@ #include #include "plugin/ascend/kernel_executor/rts/rt_kernel.h" -#include "runtime/hardware_abstract/memory_manager/swap_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/swap_manager.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/ascend_res_manager.cc b/mindspore/ccsrc/plugin/ascend/res_manager/ascend_res_manager.cc index efcde1ac9deaa26026c83cc17fe2fb4667887cb3..f864e5fcd7ec0eae7aeef28048dabb9beb1acdb1 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/ascend_res_manager.cc +++ b/mindspore/ccsrc/plugin/ascend/res_manager/ascend_res_manager.cc @@ -32,7 +32,7 @@ #include "ir/tensor_new.h" #include "hccl/hccl.h" -#include "runtime/hardware_abstract/collective/collective_comm_lib_loader.h" +#include "include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h" #include "plugin/ascend/res_manager/mem_manager/ascend_memory_manager.h" #include "plugin/ascend/res_manager/mem_manager/ascend_vmm_adapter.h" #include "plugin/ascend/res_manager/mbuf_manager/tensorreport_utils.h" @@ -63,7 +63,7 @@ #include "pybind_api/gil_scoped_long_running.h" #include "mindspore/core/include/device_address/convert_tensor_utils.h" #include "include/backend/common/ms_device_shape_transfer.h" -#include "runtime/hardware_abstract/memory_manager/swap_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/swap_manager.h" #include "runtime/hardware_abstract/utils.h" #include "include/utils/callback.h" #include "plugin/ascend/res_manager/hal_manager/ascend_err_manager.h" diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/ascend_collective_comm_lib.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/ascend_collective_comm_lib.h index 29ca422e51aa3fd36898555d25cbd5cbadcf28d1..7c0553cc6b98723e7713443ee6e5d33d5c8df75c 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/ascend_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/ascend_collective_comm_lib.h @@ -22,7 +22,7 @@ #include #include #include "utils/hash_map.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "plugin/ascend/res_manager/collective/ascend_communication_group.h" #ifndef EXPORT_WRAPPER diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/ascend_communication_group.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/ascend_communication_group.h index 6443ce1f8cadffd018830ad7066b3dc881458d17..5a3ef3e71db82370e748f70f4c2813f4bb93cfff 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/ascend_communication_group.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/ascend_communication_group.h @@ -23,7 +23,7 @@ #include #include #include "hccl/hccl.h" -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/ccool_collective_comm_lib.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/ccool_collective_comm_lib.h index b6e970ed32d25bc77c6285b7f778ff1f5e1b75ad..c3ebb0d5493fdd6ff8dc11f5dab6a2b5e95b191b 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/ccool_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/ccool_collective_comm_lib.h @@ -24,7 +24,7 @@ #include #include "utils/ms_utils.h" #include "include/runtime/hardware_abstract/kernel_base/kernel.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "plugin/ascend/res_manager/event/ascend_event.h" #include "plugin/ascend/res_manager/collective/ccool_communication_group.h" #include "plugin/ascend/res_manager/collective/ascend_collective_comm_lib.h" diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/ccool_communication_group.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/ccool_communication_group.h index 61af37cd2bccf27070a097732add816627d2f39f..530327bf8a47ba3b5b52a1415d0bee25b167d8c2 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/ccool_communication_group.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/ccool_communication_group.h @@ -23,8 +23,8 @@ #include #include #include -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" #include "plugin/ascend/res_manager/collective/ascend_collective_comm_lib.h" #include "plugin/ascend/res_manager/collective/ascend_communication_group.h" #include "plugin/ascend/res_manager/collective/leaper_trans.h" diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/dummy_ascend_collective_comm_lib.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/dummy_ascend_collective_comm_lib.h index 535b87ae755b7ba1faef5e8a60929fce6c9f6319..b9c56d9b3774ddb54505f4f7532634b1307cf578 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/dummy_ascend_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/dummy_ascend_collective_comm_lib.h @@ -19,8 +19,8 @@ #include #include -#include "runtime/hardware_abstract/collective/communication_group.h" -#include "runtime/hardware_abstract/collective/dummy_collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/dummy_collective_communication_lib.h" #ifndef EXPORT_WRAPPER #define EXPORT_WRAPPER __attribute__((visibility("default"))) diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/dvm_collective_comm_lib.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/dvm_collective_comm_lib.h index 0d8bc0c00f2d2a00de564fafb80bd3f69268ecaf..60dbe6c00c9e6d566e696579e5b88eda641b2d40 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/dvm_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/dvm_collective_comm_lib.h @@ -21,7 +21,7 @@ #include #include #include -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "plugin/ascend/res_manager/collective/dvm_communication_group.h" #ifndef EXPORT_WRAPPER diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/dvm_communication_group.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/dvm_communication_group.h index e3da46946ad6df23f3164b10d9842fecf50f8c81..bf6a593686fe0677fbac017cb4d556b77b024cec 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/dvm_communication_group.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/dvm_communication_group.h @@ -21,7 +21,7 @@ #include #include #include "kernel/ascend/dvm/dvm.h" -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" using CommPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/lowlatency_collective_comm_lib.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/lowlatency_collective_comm_lib.h index f8f96b81b99eb985298d7560adfadc2cae109418..537428c3dec25d3ced2a20cc8da2342eb364b7d5 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/lowlatency_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/lowlatency_collective_comm_lib.h @@ -22,7 +22,7 @@ #include #include #include "utils/dlopen_macro.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "plugin/ascend/res_manager/collective/lowlatency_communication_group.h" #ifndef EXPORT_WRAPPER diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/lowlatency_communication_group.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/lowlatency_communication_group.h index d6c230a3cdb1ec90bc7d717c5ef8cbc47cbcdade..4f46e0a9287a2665be1d686fafe8797e6589a3dd 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/lowlatency_communication_group.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/lowlatency_communication_group.h @@ -22,7 +22,7 @@ #include #include "lcal.h" #include "lcal_api.h" -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" using namespace Lcal; using LcclPtr = std::shared_ptr; diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/multi_ascend_collective_comm_lib.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/multi_ascend_collective_comm_lib.h index 37668405f702e7663b5a993ffc45f3ac67f99c8c..3c0cfe6469999a6b60b6341fac3cbb612433bcf1 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/multi_ascend_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/multi_ascend_collective_comm_lib.h @@ -26,9 +26,9 @@ #include #include #endif -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" -#include "runtime/hardware_abstract/collective/collective_comm_lib_loader.h" -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" #include "plugin/ascend/res_manager/collective/multi_ascend_communication_group.h" #include "plugin/ascend/res_manager/collective/ascend_collective_comm_lib.h" #include "plugin/ascend/res_manager/collective/dvm_collective_comm_lib.h" diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/collective/multi_ascend_communication_group.h b/mindspore/ccsrc/plugin/ascend/res_manager/collective/multi_ascend_communication_group.h index e9a94e5f36bd285de10a5140e1c856c777e58428..89a2afeb4e196a18d4810e211c77a8d78d1f0c04 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/collective/multi_ascend_communication_group.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/collective/multi_ascend_communication_group.h @@ -20,7 +20,7 @@ #include #include #include -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" #include "plugin/ascend/res_manager/collective/ascend_communication_group.h" #ifdef ENABLE_INTERNAL_KERNELS #include "plugin/ascend/res_manager/collective/lowlatency_communication_group.h" diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_memory_manager.h b/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_memory_manager.h index 5ea2cde8a1a32225675e3a1f81d23384a5a71b8c..f9618d178e74a413d071ff4a55200f00185c433f 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_memory_manager.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_memory_manager.h @@ -21,7 +21,7 @@ #include #include -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" #include "plugin/ascend/res_manager/mem_manager/ascend_memory_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_memory_pool.cc b/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_memory_pool.cc index 3aa31c03de6e89ca343051983e2ced31f34406ef..c1caeb9977e231e01250e0e78db3a049f5d4e16c 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_memory_pool.cc +++ b/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_memory_pool.cc @@ -33,7 +33,7 @@ #include "utils/log_adapter.h" #include "utils/ms_context.h" #include "utils/ms_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/runtime/utils/runtime_conf/runtime_conf.h" #include "include/runtime/utils/runtime_conf/runtime_env.h" #include "utils/distributed_meta.h" diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_pin_mem_pool.h b/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_pin_mem_pool.h index 36144167ca322fb644adc411bb560b37bc022456..8d8c88bb6a44b239a58ba04e29b4c0717aeae5f9 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_pin_mem_pool.h +++ b/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_pin_mem_pool.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_ASCEND_PIN_MEM_POOL_H_ #define MINDSPORE_CCSRC_RUNTIME_DEVICE_ASCEND_ASCEND_PIN_MEM_POOL_H_ -#include "runtime/hardware_abstract/memory_manager/pin_mem_pool.h" +#include "include/runtime/hardware_abstract/memory_manager/pin_mem_pool.h" #include "plugin/ascend/res_manager/visible.h" namespace mindspore { diff --git a/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_pluggable_mem_allocator.cc b/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_pluggable_mem_allocator.cc index a7d400e4ea61642a2e5a1161462c21dbd9e672a4..39f6472231c1dd65905c9e84f11400aed862ede2 100644 --- a/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_pluggable_mem_allocator.cc +++ b/mindspore/ccsrc/plugin/ascend/res_manager/mem_manager/ascend_pluggable_mem_allocator.cc @@ -16,7 +16,7 @@ #include "plugin/ascend/res_manager/mem_manager/ascend_pluggable_mem_allocator.h" #include -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/plugin/ascend/stress_detect/stress_detect.cc b/mindspore/ccsrc/plugin/ascend/stress_detect/stress_detect.cc index e4d5576abfe291b60f6695b78357d5f863ce79cc..d0e2bec4dd41ad7c88c72da6aed378fd62d58477 100644 --- a/mindspore/ccsrc/plugin/ascend/stress_detect/stress_detect.cc +++ b/mindspore/ccsrc/plugin/ascend/stress_detect/stress_detect.cc @@ -25,7 +25,7 @@ #include "mindspore/core/include/utils/device_manager_conf.h" #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "kernel/ascend/acl_ir/op_api_convert.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ccsrc/plugin/cpu/cpu_device_context.h b/mindspore/ccsrc/plugin/cpu/cpu_device_context.h index 9d5f7479595637c58b815416296121f530c955ee..2171c386e6d7813385ab63b197094659d27c1baa 100644 --- a/mindspore/ccsrc/plugin/cpu/cpu_device_context.h +++ b/mindspore/ccsrc/plugin/cpu/cpu_device_context.h @@ -23,9 +23,9 @@ #include #include "runtime/hardware_abstract/device_context/device_context.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" -#include "runtime/hardware_abstract/collective/collective_comm_lib_loader.h" -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" #include "plugin/cpu/res_manager/cpu_res_manager.h" namespace mindspore { diff --git a/mindspore/ccsrc/plugin/cpu/res_manager/collective/mpi_collective_comm_lib.h b/mindspore/ccsrc/plugin/cpu/res_manager/collective/mpi_collective_comm_lib.h index 06efdea10a01c40804468d2053e4ea1b3adcd7cd..2352d8b3e9da9ece90333b1f8ce076dd89b58709 100644 --- a/mindspore/ccsrc/plugin/cpu/res_manager/collective/mpi_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/cpu/res_manager/collective/mpi_collective_comm_lib.h @@ -21,7 +21,7 @@ #include #include #include -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "plugin/cpu/res_manager/collective/mpi_communication_group.h" #ifndef EXPORT_MPI_WRAPPER diff --git a/mindspore/ccsrc/plugin/cpu/res_manager/collective/mpi_communication_group.h b/mindspore/ccsrc/plugin/cpu/res_manager/collective/mpi_communication_group.h index d0537a9054789a4c88fe8ef9541d4b900598b634..b045cc694c4c065e5c4a0f597d3d92da2c93a0af 100644 --- a/mindspore/ccsrc/plugin/cpu/res_manager/collective/mpi_communication_group.h +++ b/mindspore/ccsrc/plugin/cpu/res_manager/collective/mpi_communication_group.h @@ -21,7 +21,7 @@ #include #include #include -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_collective_comm_lib.cc b/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_collective_comm_lib.cc index b04fe7adc800ae8d15926d97f536ed2d4f836bae..57f4e8cdb4280521fafccb29a673e2beae2566eb 100644 --- a/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_collective_comm_lib.cc +++ b/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_collective_comm_lib.cc @@ -19,7 +19,7 @@ #include #include "utils/ms_context.h" #include "include/cluster/topology/constants.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "plugin/cpu/res_manager/collective/allreduce_impl.h" namespace mindspore { diff --git a/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_collective_comm_lib.h b/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_collective_comm_lib.h index 885907eb80059a1966b13ab4142184dea5d1266e..9d4869a55c617c12980244c397f6f6271a8d1308 100644 --- a/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_collective_comm_lib.h @@ -21,7 +21,7 @@ #include #include #include -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "include/cluster/topology/cluster_context.h" #include "cluster/rpc/core/collective_ops_impl.h" #include "plugin/cpu/res_manager/collective/ms_communication_group.h" diff --git a/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_communication_group.h b/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_communication_group.h index 100e21cb388c8550aa378892a46e9bb7084958d9..b5d5cab4454cbe4770f65057f512269a6ef0d02c 100644 --- a/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_communication_group.h +++ b/mindspore/ccsrc/plugin/cpu/res_manager/collective/ms_communication_group.h @@ -20,7 +20,7 @@ #include #include #include -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/plugin/cpu/res_manager/cpu_res_manager.cc b/mindspore/ccsrc/plugin/cpu/res_manager/cpu_res_manager.cc index b44b4c6d68c94446bca175731066aaaaa493049d..899f315a60de591a4f173486a05a6582430ee7b2 100644 --- a/mindspore/ccsrc/plugin/cpu/res_manager/cpu_res_manager.cc +++ b/mindspore/ccsrc/plugin/cpu/res_manager/cpu_res_manager.cc @@ -21,13 +21,13 @@ #include #include "ir/tensor_new.h" #include "utils/ms_context.h" -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" #include "mindspore/core/include/device_address/convert_tensor_utils.h" #include "runtime/hardware_abstract/device_context/device_context.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "runtime/hardware_abstract/utils.h" -#include "runtime/hardware_abstract/collective/collective_comm_lib_loader.h" +#include "include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h" #if defined(__linux__) && defined(WITH_BACKEND) #include "plugin/cpu/res_manager/collective/ms_collective_comm_lib.h" #endif diff --git a/mindspore/ccsrc/plugin/cpu/res_manager/cpu_res_manager.h b/mindspore/ccsrc/plugin/cpu/res_manager/cpu_res_manager.h index f3b788fc5b5fdab45ae2244e6a5741c9ef62531a..7f2fdb4ca3b60e8b8652cfbc82f0e6a9cbaa143e 100644 --- a/mindspore/ccsrc/plugin/cpu/res_manager/cpu_res_manager.h +++ b/mindspore/ccsrc/plugin/cpu/res_manager/cpu_res_manager.h @@ -19,7 +19,7 @@ #include #include #include -#include "runtime/hardware_abstract/memory_manager/swap_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/swap_manager.h" #include "runtime/hardware_abstract/device_context/device_context.h" #include "plugin/cpu/res_manager/mem_manager/cpu_memory_manager.h" diff --git a/mindspore/ccsrc/plugin/cpu/res_manager/mem_manager/cpu_memory_manager.h b/mindspore/ccsrc/plugin/cpu/res_manager/mem_manager/cpu_memory_manager.h index 62e6acbd37c4307780b80388295bb2d023faeba0..3546b9862d9ba9c5f9c4b66bad29b85e6dbbb01d 100644 --- a/mindspore/ccsrc/plugin/cpu/res_manager/mem_manager/cpu_memory_manager.h +++ b/mindspore/ccsrc/plugin/cpu/res_manager/mem_manager/cpu_memory_manager.h @@ -20,7 +20,7 @@ #include #include #include "ir/device_address.h" -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" #include "plugin/cpu/res_manager/mem_manager/cpu_memory_pool.h" namespace mindspore { diff --git a/mindspore/ccsrc/plugin/gpu/res_manager/collective/nvidia_collective_comm_lib.h b/mindspore/ccsrc/plugin/gpu/res_manager/collective/nvidia_collective_comm_lib.h index f8ffa1fca9e1986e91b29383cd67afc5c3457c75..2bc42399cf0fa1d6c2a2022dfeccd7344e5fcab9 100644 --- a/mindspore/ccsrc/plugin/gpu/res_manager/collective/nvidia_collective_comm_lib.h +++ b/mindspore/ccsrc/plugin/gpu/res_manager/collective/nvidia_collective_comm_lib.h @@ -23,7 +23,7 @@ #include #include #include "utils/dlopen_macro.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "plugin/gpu/res_manager/collective/nvidia_communication_group.h" #ifndef EXPORT_NCCL_WRAPPER diff --git a/mindspore/ccsrc/plugin/gpu/res_manager/collective/nvidia_communication_group.h b/mindspore/ccsrc/plugin/gpu/res_manager/collective/nvidia_communication_group.h index b5dc06c076ccd5a732593c0fec3d0e825f402e3f..03db34769b7d54eb6d1bdccebdb99f19cc6c36c9 100644 --- a/mindspore/ccsrc/plugin/gpu/res_manager/collective/nvidia_communication_group.h +++ b/mindspore/ccsrc/plugin/gpu/res_manager/collective/nvidia_communication_group.h @@ -21,7 +21,7 @@ #include #include #include -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/plugin/gpu/res_manager/gpu_res_manager.cc b/mindspore/ccsrc/plugin/gpu/res_manager/gpu_res_manager.cc index 4475d198a96b3370c6f9163c1137bacc87676f4b..68a881b0bdfb1b50c2d6927163f5a5507593c8e6 100644 --- a/mindspore/ccsrc/plugin/gpu/res_manager/gpu_res_manager.cc +++ b/mindspore/ccsrc/plugin/gpu/res_manager/gpu_res_manager.cc @@ -33,7 +33,7 @@ #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "runtime/hardware_abstract/utils.h" #include "utils/dlopen_macro.h" -#include "runtime/hardware_abstract/collective/collective_comm_lib_loader.h" +#include "include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h" #ifdef ENABLE_MPI #include "plugin/cpu/res_manager/collective/ms_collective_comm_lib.h" #endif diff --git a/mindspore/ccsrc/plugin/gpu/res_manager/gpu_res_manager.h b/mindspore/ccsrc/plugin/gpu/res_manager/gpu_res_manager.h index 125c663a160e1ff1fc73e738b26a1f07b675fa85..51c54ad50f338cfe8b98f6cc484c8e8295b5c8b5 100644 --- a/mindspore/ccsrc/plugin/gpu/res_manager/gpu_res_manager.h +++ b/mindspore/ccsrc/plugin/gpu/res_manager/gpu_res_manager.h @@ -22,7 +22,7 @@ #include #include #include "runtime/hardware_abstract/device_context/device_context.h" -#include "runtime/hardware_abstract/memory_manager/swap_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/swap_manager.h" #include "plugin/gpu/res_manager/gpu_res_manager.h" #include "plugin/gpu/res_manager/mem_manager/gpu_memory_manager.h" diff --git a/mindspore/ccsrc/plugin/gpu/res_manager/mem_manager/gpu_memory_manager.h b/mindspore/ccsrc/plugin/gpu/res_manager/mem_manager/gpu_memory_manager.h index 0188bcbb48755a35e0bdcadc723d3c4df1045a0b..6d687b4443a5ba4c8ad0f538a5346e0a330c3a98 100644 --- a/mindspore/ccsrc/plugin/gpu/res_manager/mem_manager/gpu_memory_manager.h +++ b/mindspore/ccsrc/plugin/gpu/res_manager/mem_manager/gpu_memory_manager.h @@ -19,7 +19,7 @@ #include #include #include -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" #include "include/backend/visible.h" namespace mindspore { diff --git a/mindspore/ccsrc/plugin/gpu/res_manager/mem_manager/gpu_pin_mem_pool.h b/mindspore/ccsrc/plugin/gpu/res_manager/mem_manager/gpu_pin_mem_pool.h index 805d29482d0f21e1d11120799f9418dfd2f63e2e..33d59ae68736755c7b09569d74245fc66fe0efca 100644 --- a/mindspore/ccsrc/plugin/gpu/res_manager/mem_manager/gpu_pin_mem_pool.h +++ b/mindspore/ccsrc/plugin/gpu/res_manager/mem_manager/gpu_pin_mem_pool.h @@ -16,7 +16,7 @@ #ifndef MINDSPORE_CCSRC_PLUGIN_DEVICE_GPU_HAL_DEVICE_GPU_PIN_MEM_POOL_H_ #define MINDSPORE_CCSRC_PLUGIN_DEVICE_GPU_HAL_DEVICE_GPU_PIN_MEM_POOL_H_ -#include "runtime/hardware_abstract/memory_manager/pin_mem_pool.h" +#include "include/runtime/hardware_abstract/memory_manager/pin_mem_pool.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/pybind_api/init.cc b/mindspore/ccsrc/pybind_api/init.cc index 65b6c2c300344d48b7c72ec7d14a08d44060279f..7c5e8d3287cd226b14030569cb8034e8f46187eb 100644 --- a/mindspore/ccsrc/pybind_api/init.cc +++ b/mindspore/ccsrc/pybind_api/init.cc @@ -43,7 +43,7 @@ #include "include/cluster/rpc/tcp_store.h" #include "backend/backend_manager/backend_manager.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "include/runtime/memory/mem_pool/mem_dynamic_allocator.h" #include "frontend/parallel/tensor_layout/tensor_transform.h" #include "pybind_api/gil_scoped_long_running.h" diff --git a/mindspore/ccsrc/pybind_api/ir/tensor/storage/storage_base.cc b/mindspore/ccsrc/pybind_api/ir/tensor/storage/storage_base.cc index 0d91a50dcdbd9b2b13f8d903d5b1fa38293d5eb2..f60cfeca244eef690c6b1c42de5531d94d8da9a8 100644 --- a/mindspore/ccsrc/pybind_api/ir/tensor/storage/storage_base.cc +++ b/mindspore/ccsrc/pybind_api/ir/tensor/storage/storage_base.cc @@ -19,8 +19,8 @@ #include "runtime/hardware_abstract/utils.h" #include "runtime/hardware_abstract/device_context/device_context.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" -#include "runtime/pipeline/pipeline.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/pipeline/pipeline.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "include/runtime/memory/mem_pool/mem_tracker.h" #include "runtime/pipeline/task/task.h" diff --git a/mindspore/ccsrc/pybind_api/ir/tensor/tensor_index_py.cc b/mindspore/ccsrc/pybind_api/ir/tensor/tensor_index_py.cc index a8c89a99f19e6575b07400f2ec65641f8aaf3759..312a912e51ca6f9cb00a2f15ac5250079a44d45f 100644 --- a/mindspore/ccsrc/pybind_api/ir/tensor/tensor_index_py.cc +++ b/mindspore/ccsrc/pybind_api/ir/tensor/tensor_index_py.cc @@ -36,7 +36,7 @@ #include "mindspore/ops/op_def/auto_generate/gen_ops_primitive_s.h" #include "mindspore/ccsrc/pyboost/functions/auto_generate/functions.h" #include "mindspore/ccsrc/pyboost/functions/auto_grad_guard.h" -#include "mindspore/ccsrc/runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "mindspore/ccsrc/runtime/hardware_abstract/utils.h" #include "mindspore/ccsrc/pybind_api/ir/tensor/tensor_api/auto_generate/tensor_api.h" #include "mindspore/core/include/ir/device_address_maker.h" diff --git a/mindspore/ccsrc/pybind_api/ir/tensor/tensor_py_reg.cc b/mindspore/ccsrc/pybind_api/ir/tensor/tensor_py_reg.cc index 4d57799475105ef40d6240c3db7f39627f48ac46..d5839ced8d54dc4f8d62047a0afc124fbe9a661d 100644 --- a/mindspore/ccsrc/pybind_api/ir/tensor/tensor_py_reg.cc +++ b/mindspore/ccsrc/pybind_api/ir/tensor/tensor_py_reg.cc @@ -31,7 +31,7 @@ #include "include/utils/pynative/adapter.h" #include "include/utils/exception.h" #include "include/utils/pyobj_manager.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pynative/utils/runtime/op_executor.h" #include "frontend/jit/trace/trace_recorder.h" #include "pybind_api/ir/tensor/storage/storage_py.h" diff --git a/mindspore/ccsrc/pybind_api/runtime/event_py.cc b/mindspore/ccsrc/pybind_api/runtime/event_py.cc index 36f8920be20ce205966369547332488b0d665bd0..998df151ea58b8db39a4282f7438bdb6d7e1fbb8 100644 --- a/mindspore/ccsrc/pybind_api/runtime/event_py.cc +++ b/mindspore/ccsrc/pybind_api/runtime/event_py.cc @@ -22,7 +22,7 @@ #include "include/utils/pybind_api/api_register.h" #include "pynative/forward/pyboost/forward_task.h" #include "pynative/utils/pynative_utils.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" namespace mindspore { namespace hal { diff --git a/mindspore/ccsrc/pybind_api/runtime/memory_py.cc b/mindspore/ccsrc/pybind_api/runtime/memory_py.cc index 9ed26a60a87ee232f4b9d37b226d67f6da331092..1e3c9a1e8bb0d9a2cf79dbd9691ea2edc7dc7186 100644 --- a/mindspore/ccsrc/pybind_api/runtime/memory_py.cc +++ b/mindspore/ccsrc/pybind_api/runtime/memory_py.cc @@ -17,11 +17,11 @@ #include #include #include -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "ir/device_address.h" #include "runtime/hardware_abstract/device_context/device_context.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" namespace mindspore { namespace hal { diff --git a/mindspore/ccsrc/pybind_api/runtime/stream_py.cc b/mindspore/ccsrc/pybind_api/runtime/stream_py.cc index 27438837a6fd0e38870e047ef4453c2a2da392e9..2ff4811fc410e3b95ab698c6f49a3a9e8c5956b2 100644 --- a/mindspore/ccsrc/pybind_api/runtime/stream_py.cc +++ b/mindspore/ccsrc/pybind_api/runtime/stream_py.cc @@ -15,9 +15,9 @@ */ #include "pybind_api/runtime/stream_py.h" #include -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "utils/ms_context.h" #include "include/utils/pybind_api/api_register.h" #include "pybind_api/runtime/utils_py.h" diff --git a/mindspore/ccsrc/pybind_api/runtime/utils_py.cc b/mindspore/ccsrc/pybind_api/runtime/utils_py.cc index 9255022110553bbf0a86971a340519979e9cfe3d..eb12034d8ff756fb6f356aaae15c40be401a5760 100644 --- a/mindspore/ccsrc/pybind_api/runtime/utils_py.cc +++ b/mindspore/ccsrc/pybind_api/runtime/utils_py.cc @@ -15,14 +15,14 @@ */ #include "pybind_api/runtime/utils_py.h" #include -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "utils/ms_context.h" #include "include/utils/pybind_api/api_register.h" #include "include/runtime/memory/mem_pool/mem_tracker.h" #include "include/utils/convert_utils_py.h" #include "runtime/hardware_abstract/device_context/device_context.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" namespace mindspore { namespace hal { diff --git a/mindspore/ccsrc/pybind_api/tools/clean_tdt_channel_py.cc b/mindspore/ccsrc/pybind_api/tools/clean_tdt_channel_py.cc index 04c74ab91a092ce6e21f1d94803f9fdf5c8ba01d..143ccbebe9f79b3fa93ed55b7ae34bfc0a902441 100644 --- a/mindspore/ccsrc/pybind_api/tools/clean_tdt_channel_py.cc +++ b/mindspore/ccsrc/pybind_api/tools/clean_tdt_channel_py.cc @@ -17,7 +17,7 @@ #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "utils/ms_context.h" #include "include/utils/pybind_api/api_register.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" namespace mindspore { namespace { diff --git a/mindspore/ccsrc/pybind_api/tools/param_util_py.cc b/mindspore/ccsrc/pybind_api/tools/param_util_py.cc index f5c9afeb0e9696cbc0e4923681eecfcca7d38f61..1de1cc02edbbc93ae07d510d7b50f60a6d495147 100644 --- a/mindspore/ccsrc/pybind_api/tools/param_util_py.cc +++ b/mindspore/ccsrc/pybind_api/tools/param_util_py.cc @@ -22,7 +22,7 @@ #include "utils/ms_context.h" #include "include/utils/pybind_api/api_register.h" #include "include/utils/tensor_py.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "runtime/hardware_abstract/utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/pybind_api/tools/stress_detect_py.cc b/mindspore/ccsrc/pybind_api/tools/stress_detect_py.cc index 8642854f895f51c97f9cbfabd612ed0598b50b18..c19ad3550b276804c0be5bf96c88c8ccf4a19ccf 100644 --- a/mindspore/ccsrc/pybind_api/tools/stress_detect_py.cc +++ b/mindspore/ccsrc/pybind_api/tools/stress_detect_py.cc @@ -15,11 +15,11 @@ */ #include "pybind_api/tools/stress_detect_py.h" #include -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "utils/ms_context.h" #include "include/utils/pybind_api/api_register.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "runtime/hardware_abstract/device_context/device_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/pybind_api/utils/reuse_data_ptr_py.cc b/mindspore/ccsrc/pybind_api/utils/reuse_data_ptr_py.cc index 7f71a68522c955042aef7cd0f7c4993adee3e410..01d9b4f39baf08f0fae672ef58778d179d8d52fe 100644 --- a/mindspore/ccsrc/pybind_api/utils/reuse_data_ptr_py.cc +++ b/mindspore/ccsrc/pybind_api/utils/reuse_data_ptr_py.cc @@ -21,7 +21,7 @@ #include "utils/log_adapter.h" #include "mindapi/base/format.h" #include "include/utils/pybind_api/api_register.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "pynative/utils/pynative_utils.h" #include "include/utils/convert_utils_py.h" diff --git a/mindspore/ccsrc/pyboost/comm_handle.cc b/mindspore/ccsrc/pyboost/comm_handle.cc index bd15042ca1c9946fa0d9beca8f467478cfc32bdf..585c0c87b88efad6ba45caa59f7fe55f7bbb11a1 100644 --- a/mindspore/ccsrc/pyboost/comm_handle.cc +++ b/mindspore/ccsrc/pyboost/comm_handle.cc @@ -20,7 +20,7 @@ #include "pynative/utils/runtime/op_executor.h" #include "pynative/utils/runtime/task/device_task.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" namespace mindspore { namespace kernel { namespace pyboost { diff --git a/mindspore/ccsrc/pyboost/customize/op_common.cc b/mindspore/ccsrc/pyboost/customize/op_common.cc index 677ae0f340f3af9a0ffa22d09b352939248fad9b..c1f415ecff38f5cac8a804afaadee427dffb59ec 100644 --- a/mindspore/ccsrc/pyboost/customize/op_common.cc +++ b/mindspore/ccsrc/pyboost/customize/op_common.cc @@ -19,7 +19,7 @@ #include "mindspore/ops/op_def/framework_ops.h" #include "mindspore/ccsrc/pyboost/auto_generate/maximum.h" #include "mindspore/ccsrc/pyboost/auto_generate/minimum.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "mindspore/ops/op_def/auto_generate/gen_ops_primitive_t.h" namespace mindspore { diff --git a/mindspore/ccsrc/pyboost/functions/auto_grad_guard.cc b/mindspore/ccsrc/pyboost/functions/auto_grad_guard.cc index 3997d5a1f39c2da3ad4816913e7bc7c4a6389766..f00b29c13b9fb31adf83b56037e5c7b1ebdbf3c4 100644 --- a/mindspore/ccsrc/pyboost/functions/auto_grad_guard.cc +++ b/mindspore/ccsrc/pyboost/functions/auto_grad_guard.cc @@ -16,7 +16,7 @@ #include "mindspore/ccsrc/pyboost/functions/auto_grad_guard.h" #include "utils/ms_context.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "utils/device_manager_conf.h" namespace mindspore { diff --git a/mindspore/ccsrc/pyboost/op_runner.h b/mindspore/ccsrc/pyboost/op_runner.h index 5766077dcb143c55bf368b160f8a166bdd615e87..1771aa4ca7cfaeed713455a338a95fa56e46cf96 100644 --- a/mindspore/ccsrc/pyboost/op_runner.h +++ b/mindspore/ccsrc/pyboost/op_runner.h @@ -33,7 +33,7 @@ #include "ops/infer_info/infer_info_utils.h" #include "include/runtime/memory/mem_pool/mem_tracker.h" #include "mindspore/ccsrc/pyboost/comm_handle.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace tensor { @@ -83,14 +83,14 @@ class PYBOOST_API OpRunner : public std::enable_shared_from_this { } template - void GenerateInputAbstract(T &... args) { + void GenerateInputAbstract(T &...args) { input_abs_.clear(); (input_abs_.emplace_back(kAbstractConverter.ConvertAbstract(args)), ...); } // Member function for Infer and creating output tensors. template - void InferOutput(T &... args) { + void InferOutput(T &...args) { runtime::ProfilerRecorder profiler(runtime::ProfilerModule::kPynative, runtime::ProfilerEvent::kPyBoostInferOutput, primitive_->name(), false); if (output_value_simple_info_ = ops::DoGeneralInfer(primitive_, args...); output_value_simple_info_ != nullptr) { @@ -116,7 +116,7 @@ class PYBOOST_API OpRunner : public std::enable_shared_from_this { // A static function used for the "customize" operator to generate the operator's output Tensor. template - static void InferOpOutput(const std::shared_ptr &op, T &... args) { + static void InferOpOutput(const std::shared_ptr &op, T &...args) { op->InferOutput(args...); } @@ -136,7 +136,7 @@ class PYBOOST_API OpRunner : public std::enable_shared_from_this { } template - void ProfileTrackerInput(const Args &... args) { + void ProfileTrackerInput(const Args &...args) { if (MS_UNLIKELY(mindspore::runtime::ProfilerAnalyzer::GetInstance().profiler_enable())) { static auto ascend_profiler = mindspore::profiler::Profiler::GetInstance(kAscendDevice); if (ascend_profiler != nullptr && ascend_profiler->EnableRecordShapes()) { @@ -186,7 +186,7 @@ class PYBOOST_API OpRunner : public std::enable_shared_from_this { return; } std::vector tensors; - std::apply([this, &tensors](const Args &... args) { (CollectTrackerTensor(args, &tensors), ...); }, tuple); + std::apply([this, &tensors](const Args &...args) { (CollectTrackerTensor(args, &tensors), ...); }, tuple); TrackerOutputTensors(tensors); } diff --git a/mindspore/ccsrc/pyboost/pyboost_utils.cc b/mindspore/ccsrc/pyboost/pyboost_utils.cc index a1839e6585616a79dc20dbbd48b451bec8885884..5cd39be538f7c76c937c3613bad50588f26c5aaa 100644 --- a/mindspore/ccsrc/pyboost/pyboost_utils.cc +++ b/mindspore/ccsrc/pyboost/pyboost_utils.cc @@ -29,7 +29,7 @@ #include "ops/infer_info/infer_info_utils.h" #include "ops/op_def.h" #include "pynative/utils/runtime/op_executor.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pybind_api/gil_scoped_long_running.h" #include "mindspore/ccsrc/pyboost/auto_generate/cast.h" #include "mindspore/ops/op_def/array_ops.h" diff --git a/mindspore/ccsrc/pynative/backward/grad.h b/mindspore/ccsrc/pynative/backward/grad.h index 78b7108ad1651f0718323cad68e12e35330edc9c..225ff06def49ebd7bc14bb126a22c73f88cd6bad 100644 --- a/mindspore/ccsrc/pynative/backward/grad.h +++ b/mindspore/ccsrc/pynative/backward/grad.h @@ -29,7 +29,7 @@ #include "pynative/utils/base.h" #include "pynative/backward/top_cell.h" #include "pynative/backward/jit_grad/jit_grad.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pynative/backward/op_grad/bprop_task.h" #include "include/utils/pynative/variable.h" #include "frontend/jit/ps/resource.h" diff --git a/mindspore/ccsrc/pynative/backward/hook/custom_function.cc b/mindspore/ccsrc/pynative/backward/hook/custom_function.cc index c4557fe98d153d874dae4e8323b778fbe2367eff..8afaabcd0981451cf99d5015f44fb0b705bc7a91 100644 --- a/mindspore/ccsrc/pynative/backward/hook/custom_function.cc +++ b/mindspore/ccsrc/pynative/backward/hook/custom_function.cc @@ -16,7 +16,7 @@ #include "pynative/backward/hook/custom_function.h" #include "pynative/backward/hook/function_py.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pynative/backward/op_grad/func_builder.h" #include "pynative/utils/pynative_execute.h" #include "include/utils/python_adapter.h" diff --git a/mindspore/ccsrc/pynative/backward/hook/hook_py.cc b/mindspore/ccsrc/pynative/backward/hook/hook_py.cc index d0a5e1ceea968440586967b4cf170437f4183b04..6decd2a1445b4f79a9b0f6b7f3c04f23d80105af 100644 --- a/mindspore/ccsrc/pynative/backward/hook/hook_py.cc +++ b/mindspore/ccsrc/pynative/backward/hook/hook_py.cc @@ -24,7 +24,7 @@ #include "include/utils/pynative/adapter.h" #include "include/utils/pynative/hook.h" #include "frontend/jit/ps/pipeline.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pynative/backward/grad_utils.h" #include "pynative/backward/op_grad/func_grad.h" diff --git a/mindspore/ccsrc/pynative/backward/op_grad/func_grad.cc b/mindspore/ccsrc/pynative/backward/op_grad/func_grad.cc index cf6c58c4dd7755526c73e12f549617d9c095126c..0cec9c8cab50680d4d67372eaada0066f4195a46 100644 --- a/mindspore/ccsrc/pynative/backward/op_grad/func_grad.cc +++ b/mindspore/ccsrc/pynative/backward/op_grad/func_grad.cc @@ -28,7 +28,7 @@ #include "include/utils/pynative/common_utils.h" #include "pynative/utils/pynative_utils.h" #include "mindspore/ops/op_def/framework_ops.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pynative/backward/hook/custom_function.h" #include "pynative/backward/grad_utils.h" #include "frontend/operator/primitive_py.h" diff --git a/mindspore/ccsrc/pynative/backward/op_grad/view_grad.h b/mindspore/ccsrc/pynative/backward/op_grad/view_grad.h index c98dafa5d8155a2efb44aea33d6033b135035193..f1996b8dace520fe8c273adade366ebeb940e77e 100644 --- a/mindspore/ccsrc/pynative/backward/op_grad/view_grad.h +++ b/mindspore/ccsrc/pynative/backward/op_grad/view_grad.h @@ -25,7 +25,7 @@ #include "pynative/backward/op_grad/func_grad.h" #include "pyboost/functions/auto_grad_guard.h" #include "pynative/backward/grad_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore::pynative::autograd { template diff --git a/mindspore/ccsrc/pynative/forward/op_graph/forward.cc b/mindspore/ccsrc/pynative/forward/op_graph/forward.cc index b176a711755b2333271c66acb779822529723774..9d3b1c1639d5b8c416bf7c233544c2f74a4fcad6 100644 --- a/mindspore/ccsrc/pynative/forward/op_graph/forward.cc +++ b/mindspore/ccsrc/pynative/forward/op_graph/forward.cc @@ -35,7 +35,7 @@ #include "tools/profiler/profiling.h" using mindspore::profiler::ProfilerManager; #include "frontend/operator/ops_front_infer_function.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "backend/common/device_address_utils.h" #include "backend/common/kernel_graph/session_basic.h" #include "include/runtime/utils/runtime_conf/runtime_conf.h" diff --git a/mindspore/ccsrc/pynative/forward/op_graph/forward.h b/mindspore/ccsrc/pynative/forward/op_graph/forward.h index ad496286f6ae00ddc2a35a70750b1e74bce4d665..1d964920d97cf2615f9a4e6282a18149e692a1c2 100644 --- a/mindspore/ccsrc/pynative/forward/op_graph/forward.h +++ b/mindspore/ccsrc/pynative/forward/op_graph/forward.h @@ -29,7 +29,7 @@ #include "pynative/forward/op_graph/do_infer.h" #include "ir/cell.h" #include "mindspore/ops/view/view_strides_calculator.h" -#include "runtime/pipeline/async_rqueue.h" +#include "include/runtime/pipeline/async_rqueue.h" #include "pynative/utils/runtime/op_backend/op_backend.h" #include "ir/device_type.h" diff --git a/mindspore/ccsrc/pynative/parallel/reducer.cc b/mindspore/ccsrc/pynative/parallel/reducer.cc index d727a726ae3919a698374d62185bfb2e6d957588..273393febce54378c4f4d17afe235c64f45fb13c 100644 --- a/mindspore/ccsrc/pynative/parallel/reducer.cc +++ b/mindspore/ccsrc/pynative/parallel/reducer.cc @@ -21,7 +21,7 @@ #include #include "include/cluster/init.h" #include "tools/profiler/profiler.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pyboost/functions/auto_generate/functions.h" #include "pyboost/functions/auto_grad_guard.h" #include "pynative/backward/hook/hook_py.h" diff --git a/mindspore/ccsrc/pynative/utils/pynative_execute.cc b/mindspore/ccsrc/pynative/utils/pynative_execute.cc index c9ce6be2ff187d2177b9744855499a2e21c0c584..65c046399fd70333bd3d82cf5ac754a19c4e0b19 100644 --- a/mindspore/ccsrc/pynative/utils/pynative_execute.cc +++ b/mindspore/ccsrc/pynative/utils/pynative_execute.cc @@ -38,7 +38,7 @@ #include "ir/cell.h" #include "include/utils/python_utils.h" #include "mindspore/ccsrc/pyboost/kernel_mod_cache.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/utils/convert_utils_py.h" #include "include/utils/pynative/adapter.h" #include "include/utils/pynative/variable.h" diff --git a/mindspore/ccsrc/pynative/utils/pynative_utils.cc b/mindspore/ccsrc/pynative/utils/pynative_utils.cc index 150583883366ebb0f7c721f85cee3f429deaa1f8..cd13cf8428c6f01031e37d1b8e37ba72da9e2ce7 100644 --- a/mindspore/ccsrc/pynative/utils/pynative_utils.cc +++ b/mindspore/ccsrc/pynative/utils/pynative_utils.cc @@ -43,7 +43,7 @@ #include "mindspore/ops/op_def/other_ops.h" #include "pynative/utils/predict_out_type_map.h" #include "mindspore/ccsrc/pyboost/auto_generate/contiguous.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/utils/pynative/abstract_converter.h" #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "pynative/backward/grad_utils.h" diff --git a/mindspore/ccsrc/pynative/utils/runtime/op_backend/op_backend.cc b/mindspore/ccsrc/pynative/utils/runtime/op_backend/op_backend.cc index f7b2014762e5c3aef0215710d220f644b89d1da6..147c9821fe06290d43556a4a8d2b91661f82af51 100644 --- a/mindspore/ccsrc/pynative/utils/runtime/op_backend/op_backend.cc +++ b/mindspore/ccsrc/pynative/utils/runtime/op_backend/op_backend.cc @@ -24,7 +24,7 @@ #include "pynative/utils/runtime/op_runner.h" #include "include/runtime/utils/runtime_conf/runtime_conf.h" #include "backend/common/device_address_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pybind_api/gil_scoped_long_running.h" #include "include/runtime/memory/mem_pool/mem_tracker.h" #include "ir/tensor_new.h" diff --git a/mindspore/ccsrc/pynative/utils/runtime/op_executor.cc b/mindspore/ccsrc/pynative/utils/runtime/op_executor.cc index 2df63ed45444d08feaa29a1c3d10b398c81bddd2..9206fe4146e9b6fdee2fc5bb78f1dfdbecb0ee35 100644 --- a/mindspore/ccsrc/pynative/utils/runtime/op_executor.cc +++ b/mindspore/ccsrc/pynative/utils/runtime/op_executor.cc @@ -16,7 +16,7 @@ #include "pynative/utils/runtime/op_executor.h" #include "pybind_api/gil_scoped_long_running.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/runtime/utils/runtime_conf/runtime_conf.h" #include "include/runtime/memory/mem_pool/mem_dynamic_allocator.h" diff --git a/mindspore/ccsrc/pynative/utils/runtime/op_executor.h b/mindspore/ccsrc/pynative/utils/runtime/op_executor.h index 9a65d3696e9426539187eb055b76bb20aaba16a9..302174d996d1b8dc4538365ad924ac1919d85be0 100644 --- a/mindspore/ccsrc/pynative/utils/runtime/op_executor.h +++ b/mindspore/ccsrc/pynative/utils/runtime/op_executor.h @@ -30,7 +30,7 @@ #include "runtime/hardware_abstract/device_context/device_context.h" #include "include/utils/visible.h" #include "pynative/utils/runtime/task/device_task.h" -#include "runtime/pipeline/async_rqueue.h" +#include "include/runtime/pipeline/async_rqueue.h" namespace mindspore { using Tensor = tensor::Tensor; diff --git a/mindspore/ccsrc/pynative/utils/runtime/task/device_task.cc b/mindspore/ccsrc/pynative/utils/runtime/task/device_task.cc index 4d56fa2d29fe18e23b3f4c9af81fb27ad78a9014..e97280898d5ce84421c375701d83f6bd799cdfe3 100644 --- a/mindspore/ccsrc/pynative/utils/runtime/task/device_task.cc +++ b/mindspore/ccsrc/pynative/utils/runtime/task/device_task.cc @@ -17,7 +17,7 @@ #include #include "tools/profiler/profiler.h" #include "pynative/utils/runtime/task/device_task.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace runtime { diff --git a/mindspore/ccsrc/runtime/core/actors/base/kernel_actor.cc b/mindspore/ccsrc/runtime/core/actors/base/kernel_actor.cc index 65bc970d78eb9f2255095d307fdd43afb8ff0621..36c1601d6f212ecae80dcfc3d8a7be4a930e217d 100644 --- a/mindspore/ccsrc/runtime/core/actors/base/kernel_actor.cc +++ b/mindspore/ccsrc/runtime/core/actors/base/kernel_actor.cc @@ -21,7 +21,7 @@ #include #include -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "backend/common/device_address_utils.h" #include "runtime/core/actors/base/memory_manager_actor.h" #include "runtime/core/actors/base/output_actor.h" diff --git a/mindspore/ccsrc/runtime/core/actors/base/kernel_runner.cc b/mindspore/ccsrc/runtime/core/actors/base/kernel_runner.cc index e3d558c2cfb2284507ecffeade464e811ebd1b91..9b1462416e193892d989b759f5fa6a0825db6376 100644 --- a/mindspore/ccsrc/runtime/core/actors/base/kernel_runner.cc +++ b/mindspore/ccsrc/runtime/core/actors/base/kernel_runner.cc @@ -29,7 +29,7 @@ #include "runtime/core/actors/base/debug_actor.h" #include "include/backend/debug/execute_order_tracker/kernel_cache.h" #include "runtime/core/graph_executor/kernel_capture/graph_capture_manager.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "async/async.h" #include "utils/log_adapter.h" #include "utils/ms_exception.h" diff --git a/mindspore/ccsrc/runtime/core/actors/base/super_kernel_actor.h b/mindspore/ccsrc/runtime/core/actors/base/super_kernel_actor.h index e4cf718609df080e06fe0b43ea27269261626577..cc419eb22510d6348708b196969deaf573afee76 100644 --- a/mindspore/ccsrc/runtime/core/actors/base/super_kernel_actor.h +++ b/mindspore/ccsrc/runtime/core/actors/base/super_kernel_actor.h @@ -31,7 +31,7 @@ #include "runtime/core/actors/dynamic_shape/kernel_async_infer_actor.h" #include "runtime/core/actors/dynamic_shape/kernel_async_resize_actor.h" #include "runtime/hardware_abstract/device_context/device_context.h" -#include "runtime/pipeline/async_rqueue.h" +#include "include/runtime/pipeline/async_rqueue.h" #include "tools/profiler/profiling.h" #include "ir/anf.h" @@ -115,8 +115,8 @@ class SuperKernelActor : public DebugAwareActor { const { return kernel_input_to_graph_input_indices_; } - const mindspore::HashMap>>> - &kernel_input_to_actor_output_indices() const { + const mindspore::HashMap>>> & + kernel_input_to_actor_output_indices() const { return kernel_input_to_actor_output_indices_; } const std::set> &input_params_no_user() const { return input_params_no_user_; } diff --git a/mindspore/ccsrc/runtime/core/graph_scheduler/base/graph_scheduler.cc b/mindspore/ccsrc/runtime/core/graph_scheduler/base/graph_scheduler.cc index ff5aa20fda1335d80acc2d5d1247c600ad3061e1..592016c38b3912a647ba10dc0ceaf0bc235181c0 100644 --- a/mindspore/ccsrc/runtime/core/graph_scheduler/base/graph_scheduler.cc +++ b/mindspore/ccsrc/runtime/core/graph_scheduler/base/graph_scheduler.cc @@ -41,7 +41,7 @@ #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "include/runtime/utils/runtime_conf/runtime_conf.h" #include "include/runtime/utils/runtime_conf/thread_bind_core.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "runtime/core/graph_executor/pipeline/runtime_pipeline.h" #include "tools/error_handler/error_handler.h" #include "tools/profiler/profiler.h" diff --git a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_comm_lib_loader.cc b/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_comm_lib_loader.cc index 813fdf9ca2430a4b85733f83713e55dff63258d5..203c51f1facfb9dc349d7e46872bdbcd4d3730ed 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_comm_lib_loader.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_comm_lib_loader.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware_abstract/collective/collective_comm_lib_loader.h" +#include "include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h" #include "utils/ms_context.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_communication_lib.cc b/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_communication_lib.cc index aba80e5ac3a9ffb5b08eca4cfe4d3496dba10987..304d4e1cd3d6d3b68bf8c5ef07ee26c99cf46e29 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_communication_lib.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_communication_lib.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_manager.cc b/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_manager.cc index 0f8deebcb04f2913c9b4d83e291bffc1e618d868..2ed0985c86b7b44ee4521cfe5410cbd228b0439d 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_manager.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/collective/collective_manager.cc @@ -33,8 +33,8 @@ #include "utils/distributed_meta.h" #include "include/runtime/utils/runtime_conf/runtime_env.h" #include "include/utils/callback.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" -#include "runtime/hardware_abstract/collective/dummy_collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/dummy_collective_communication_lib.h" #include "utils/ms_exception.h" #include "tools/profiler/mstx/mstx_impl.h" #include "pybind11/pybind11.h" diff --git a/mindspore/ccsrc/runtime/hardware_abstract/collective/communication_group.cc b/mindspore/ccsrc/runtime/hardware_abstract/collective/communication_group.cc index fc968b80dcca498df48d2a8800c7d855cc8892f9..cbd63245c7bcb97ccc30a228a293c504076dbc5c 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/collective/communication_group.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/collective/communication_group.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware_abstract/collective/communication_group.h" +#include "include/runtime/hardware_abstract/collective/communication_group.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware_abstract/collective/dummy_collective_communication_lib.cc b/mindspore/ccsrc/runtime/hardware_abstract/collective/dummy_collective_communication_lib.cc index 04486386b31b68218d9a1f98d4f969ec89275348..559ac0c08ff416c1c538064f4a7e937402e5811a 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/collective/dummy_collective_communication_lib.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/collective/dummy_collective_communication_lib.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/hardware_abstract/collective/dummy_collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/dummy_collective_communication_lib.h" #include #include #include diff --git a/mindspore/ccsrc/runtime/hardware_abstract/device_context/device_context.cc b/mindspore/ccsrc/runtime/hardware_abstract/device_context/device_context.cc index 2b9e7864821a9891a1efa45e76a488070a8731cb..524955e6266ad67b909bb76193bc9bd139a553e6 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/device_context/device_context.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/device_context/device_context.cc @@ -16,7 +16,7 @@ #include "runtime/hardware_abstract/device_context/device_context.h" #include "utils/ms_context.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace device { diff --git a/mindspore/ccsrc/runtime/hardware_abstract/device_context/device_context_manager.cc b/mindspore/ccsrc/runtime/hardware_abstract/device_context/device_context_manager.cc index 7b26959b089773e57249e7efd8430a3d19ade6b4..b41ac4472725aa74a2c6a668c98b745a03e6c8fd 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/device_context/device_context_manager.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/device_context/device_context_manager.cc @@ -30,7 +30,7 @@ #include "utils/dlopen_macro.h" #include "utils/os.h" #include "include/utils/anfalgo.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "utils/ms_exception.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/hardware_abstract/gsm/aio_plugin.cc b/mindspore/ccsrc/runtime/hardware_abstract/gsm/aio_plugin.cc index 62c51cbab4f46209ffde47ad10a63d4770943ed9..00a8e1ff86bef0a71b41845f8990a356fac8d1fb 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/gsm/aio_plugin.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/gsm/aio_plugin.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/hardware_abstract/gsm/aio_plugin.h" +#include "include/runtime/hardware_abstract/gsm/aio_plugin.h" #include #include diff --git a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ.h b/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ.h index f5363dd24007c331883959baed35cfb300e3cd8d..a132a71756e61bb6b786984b246f20a862d8b91b 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ.h +++ b/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ.h @@ -14,8 +14,8 @@ * limitations under the License. */ -#ifndef MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_ENVIRON_H_ -#define MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_ENVIRON_H_ +#ifndef MINDSPORE_CCSRC_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_ENVIRON_H_ +#define MINDSPORE_CCSRC_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_ENVIRON_H_ #include #include @@ -88,4 +88,4 @@ using EnvironPtr = std::shared_ptr; } // namespace kernel } // namespace mindspore -#endif // MINDSPORE_CCSRC_BACKEND_KERNEL_COMPILER_ENVIRON_H_ +#endif // MINDSPORE_CCSRC_RUNTIMR_HARDWARE_ABSTRACT_KERNEL_BASE_ENVIRON_H_ diff --git a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ_manager.cc b/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ_manager.cc index 5416c5c870084921aebfc01a7ebfd20132d7d437..789c1343d2282e74610f22bba25067299138699c 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ_manager.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/environ_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware_abstract/kernel_base/environ_manager.h" +#include "include/runtime/hardware_abstract/kernel_base/environ_manager.h" #include "utils/ms_utils.h" #include "utils/log_adapter.h" #include "include/utils/utils.h" diff --git a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/philox_random.cc b/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/philox_random.cc index 711cc0103eec4a28779279c6dae0b644b9241900..cde56bdb639721dd90a7caf337bc2bc5f6641ac0 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/philox_random.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/kernel_base/philox_random.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" #include namespace mindspore { diff --git a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/memory_manager.cc b/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/memory_manager.cc index a04746950027a06eca79a64cb397af657b578e8d..edb32d32b82df03411e0511f6f47bcf8eb8c9cf8 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/memory_manager.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/memory_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware_abstract/memory_manager/memory_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/memory_manager.h" #include #include "utils/ms_context.h" diff --git a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/pin_mem_pool.cc b/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/pin_mem_pool.cc index 224923f167fddacd7ce2e6f6f066a58d102a445d..832087a64121d5f91e69ef8cf72b4eae0bf2fc8b 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/pin_mem_pool.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/pin_mem_pool.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware_abstract/memory_manager/pin_mem_pool.h" +#include "include/runtime/hardware_abstract/memory_manager/pin_mem_pool.h" #include #include #include diff --git a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/swap_manager.cc b/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/swap_manager.cc index d89e9b093bf84d908970a991f2eb3f66fa83d260..5c82dce9b88009f06e38e182d7fbeef95185d8b0 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/swap_manager.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/memory_manager/swap_manager.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/hardware_abstract/memory_manager/swap_manager.h" +#include "include/runtime/hardware_abstract/memory_manager/swap_manager.h" #include #include diff --git a/mindspore/ccsrc/runtime/hardware_abstract/stream/multi_stream_controller.cc b/mindspore/ccsrc/runtime/hardware_abstract/stream/multi_stream_controller.cc index 08629cb63651c008f43697709ed362625142750f..1a3059d127bba377d84055250ecd17c11b3e3470 100644 --- a/mindspore/ccsrc/runtime/hardware_abstract/stream/multi_stream_controller.cc +++ b/mindspore/ccsrc/runtime/hardware_abstract/stream/multi_stream_controller.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include #include diff --git a/mindspore/ccsrc/runtime/memory/mem_pool/mem_env.cc b/mindspore/ccsrc/runtime/memory/mem_pool/mem_env.cc index 3160eba6412343fc56812f286a07733b25ebfe7c..88bd52f8a11af39eeccf47a113605b216ec6adbe 100644 --- a/mindspore/ccsrc/runtime/memory/mem_pool/mem_env.cc +++ b/mindspore/ccsrc/runtime/memory/mem_pool/mem_env.cc @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/memory/mem_pool/mem_env.h" +#include "include/runtime/memory/mem_pool/mem_env.h" #include "utils/ms_utils.h" namespace mindspore { diff --git a/mindspore/ccsrc/runtime/pipeline/async_rqueue.cc b/mindspore/ccsrc/runtime/pipeline/async_rqueue.cc index 030d12b88531fbb1b563e154e889979a7df1fe2d..f08a1a724f6d399eb38ece7a6db9ca949312774d 100644 --- a/mindspore/ccsrc/runtime/pipeline/async_rqueue.cc +++ b/mindspore/ccsrc/runtime/pipeline/async_rqueue.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "runtime/pipeline/async_rqueue.h" +#include "include/runtime/pipeline/async_rqueue.h" #include #if !defined(_WIN32) && !defined(_WIN64) && !defined(__APPLE__) diff --git a/mindspore/ccsrc/runtime/pipeline/pipeline.cc b/mindspore/ccsrc/runtime/pipeline/pipeline.cc index 405c3d600a0e622f1983c0253f05ee49b0fe1b97..67e425b99f2ec9a1b9886a9b4ac916a1cf09d6d5 100644 --- a/mindspore/ccsrc/runtime/pipeline/pipeline.cc +++ b/mindspore/ccsrc/runtime/pipeline/pipeline.cc @@ -13,9 +13,9 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include -#include "runtime/pipeline/async_rqueue.h" +#include "include/runtime/pipeline/async_rqueue.h" #include "pybind_api/gil_scoped_long_running.h" namespace mindspore { diff --git a/mindspore/ccsrc/tools/data_dump/debugger/debugger_utils.cc b/mindspore/ccsrc/tools/data_dump/debugger/debugger_utils.cc index d117260b6168ca773f41d75d6c0b632cc77b96c8..f3ca9137c6127c6fc880e5fcbcc0f102f88c2091 100644 --- a/mindspore/ccsrc/tools/data_dump/debugger/debugger_utils.cc +++ b/mindspore/ccsrc/tools/data_dump/debugger/debugger_utils.cc @@ -43,7 +43,7 @@ #include "runtime/hardware_abstract/device_context/device_context.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "runtime/hardware_abstract/utils.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "backend/common/device_address_utils.h" constexpr int kFailure = 1; diff --git a/mindspore/ccsrc/tools/data_dump/device_statistic/check_overflow.cc b/mindspore/ccsrc/tools/data_dump/device_statistic/check_overflow.cc index 04a11f7d41c11fd0bcd3cb91bd2b2c48c65a44c7..dd6526375e7c5cd1ae158f651cd5283c29e3e437 100644 --- a/mindspore/ccsrc/tools/data_dump/device_statistic/check_overflow.cc +++ b/mindspore/ccsrc/tools/data_dump/device_statistic/check_overflow.cc @@ -22,7 +22,7 @@ #include #include "tools/data_dump/debugger/debugger_utils.h" #include "include/utils/common.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "runtime/hardware_abstract/device_context/device_context.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "tools/data_dump/device_statistic/kernel_factory.h" diff --git a/mindspore/ccsrc/tools/silent_detect/checksum/checksum.cc b/mindspore/ccsrc/tools/silent_detect/checksum/checksum.cc index 5a80a97cad418a519f790b93c5c725bfcc23d28a..1bfbe0d2ca727330a5494f841764e77c68e404dc 100644 --- a/mindspore/ccsrc/tools/silent_detect/checksum/checksum.cc +++ b/mindspore/ccsrc/tools/silent_detect/checksum/checksum.cc @@ -22,7 +22,7 @@ #include "runtime/hardware_abstract/device_context/device_context.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "runtime/hardware_abstract/utils.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" #include "tools/silent_detect/checksum/checksum_kernel.h" #include "tools/silent_detect/checksum/checksum_mgr.h" diff --git a/mindspore/ccsrc/utils/pynative/common_utils.cc b/mindspore/ccsrc/utils/pynative/common_utils.cc index 6a6106f1890e81a0e0e83c503ed29d14c7593f13..5db4d7b0435e70792f49b6c8cf63093d53119e53 100644 --- a/mindspore/ccsrc/utils/pynative/common_utils.cc +++ b/mindspore/ccsrc/utils/pynative/common_utils.cc @@ -27,7 +27,7 @@ #include "utils/ms_context.h" #include "mindspore/ccsrc/utils/ir_dump/anf_ir_dump.h" #include "include/utils/tensor_py.h" -#include "mindspore/ccsrc/runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/utils/pynative/variable.h" namespace mindspore { diff --git a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/aclnn_utils.cc b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/aclnn_utils.cc index 0b2e2764f29ce0dd075afa4ed375cb472ea0d226..b4c8dd843895058838fa75c280e6cc6b34dadeac 100644 --- a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/aclnn_utils.cc +++ b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/aclnn_utils.cc @@ -17,7 +17,7 @@ #include #include #include "kernel/ascend/acl_ir/op_api_util.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { namespace pyboost { diff --git a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h index e85a20e1eabdafe30f21463836f25ef74a5f2785..4eec6404a88c1d352acc96c05a424ee9f20682e0 100644 --- a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h +++ b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h @@ -26,7 +26,7 @@ #include #include #include "backend/common/device_address_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/runtime/utils/runtime_conf/runtime_conf.h" #include "kernel/ascend/acl_ir/op_api_exec.h" #include "kernel/ascend/acl_ir/op_api_convert.h" @@ -80,7 +80,7 @@ using CacheTuple = std::tuple auto { \ + [](const std::string &api_str, const auto &...args) -> auto { \ std::unique_lock lock(mutex_); \ if (MS_UNLIKELY(capacity_ == 0)) { \ auto [ws_size, executor, cache, release_func] = GEN_EXECUTOR(api_str, args...); \ @@ -134,8 +134,7 @@ using CacheTuple = std::tuple auto { \ + auto &...args) -> auto { \ static auto simu = common::IsCompileSimulation(); \ if (simu) { \ MS_LOG(EXCEPTION) << "For " << aclnn_name << ", the output shape depends on the actual execution," \ @@ -254,8 +253,7 @@ using CacheTuple = std::tuple #include "mindspore/ccsrc/pyboost/functions/auto_grad_guard.h" -#include "mindspore/ccsrc/runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/utils/pynative/variable.h" namespace mindspore { diff --git a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/masked_select.cc b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/masked_select.cc index 927e7c6bbc7eb6a86ab73cecfdbbc4d49b753518..2a3af666dcfd31b2062c0b2a70bdf30b763b71a5 100644 --- a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/masked_select.cc +++ b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/masked_select.cc @@ -19,7 +19,7 @@ #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h" #include "plugin/ascend/res_manager/stream_manager/ascend_stream_manager.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/non_zero.cc b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/non_zero.cc index 58d144859c5893055b167f0a454ea31c10f86fdd..0e87d4eb7e45032b735143505f4b3f1b2a8da3bc 100755 --- a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/non_zero.cc +++ b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/non_zero.cc @@ -21,7 +21,7 @@ #include "mindspore/ccsrc/pyboost/customize/op_common.h" #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "mindspore/ccsrc/pyboost/op_runner.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique2.cc b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique2.cc index 92d1718193aea4a701c1aec80dc2e48edb76b4c9..81b93b902fb7fc04dd403a284423933d9ee1e892 100644 --- a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique2.cc +++ b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique2.cc @@ -20,7 +20,7 @@ #include "mindspore/ccsrc/pyboost/op_register.h" #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique_consecutive.cc b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique_consecutive.cc index f070a8e9fea4a7c428e802ba15601fe5bc3a36eb..29c5b6e52368a4035909a587e9491e22e38fa8b7 100644 --- a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique_consecutive.cc +++ b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique_consecutive.cc @@ -20,7 +20,7 @@ #include "mindspore/ccsrc/pyboost/op_register.h" #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique_dim.cc b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique_dim.cc index 320c5084436ddf570c1fcd9751712dcd0f2db1a7..cee8baea9edf4b1aaba197d58429d6809199ae4a 100644 --- a/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique_dim.cc +++ b/mindspore/ops/kernel/ascend/aclnn/pyboost_impl/customize/unique_dim.cc @@ -20,7 +20,7 @@ #include "mindspore/ccsrc/pyboost/op_register.h" #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/ascend/dvm/pyboost_impl/lazy_fusion_kernel.cc b/mindspore/ops/kernel/ascend/dvm/pyboost_impl/lazy_fusion_kernel.cc index 55821db8387b0ef2f0b92422a7a733109bbea6a4..6a37bca8103f287865d5c0edb632d980354500ce 100644 --- a/mindspore/ops/kernel/ascend/dvm/pyboost_impl/lazy_fusion_kernel.cc +++ b/mindspore/ops/kernel/ascend/dvm/pyboost_impl/lazy_fusion_kernel.cc @@ -19,9 +19,9 @@ #include "kernel/ascend/dvm/pyboost_impl/lazy_fusion_flags.h" #include "plugin/ascend/res_manager/stream_manager/ascend_stream_manager.h" #include "tools/profiler/profiling.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "utils/file_utils.h" -#include "runtime/hardware_abstract/stream/multi_stream_controller.h" +#include "include/runtime/hardware_abstract/stream/multi_stream_controller.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/ascend/dvm/pyboost_impl/lazy_fusion_op.cc b/mindspore/ops/kernel/ascend/dvm/pyboost_impl/lazy_fusion_op.cc index c6af2c3b9bdfcd110edcc45c0e9b431c74c95b00..cdb9134e3f9c1bf7ba2f49d9dd5d97117f163629 100644 --- a/mindspore/ops/kernel/ascend/dvm/pyboost_impl/lazy_fusion_op.cc +++ b/mindspore/ops/kernel/ascend/dvm/pyboost_impl/lazy_fusion_op.cc @@ -24,7 +24,7 @@ #include "infer/ops_func_impl/tile.h" #include "kernel/ascend/dvm/pyboost_impl/lazy_fusion_kernel.h" #include "kernel/ascend/dvm/pyboost_impl/lazy_fusion_flags.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "view/view_strides_calculator.h" #include "mindspore/ops/op_def/auto_generate/gen_ops_primitive_a.h" #include "mindspore/ops/op_def/auto_generate/gen_ops_primitive_b.h" @@ -166,7 +166,7 @@ ShapeVector GetReduceDim(const std::optional &dim, size_t rank) { } template -void DvmCall(const std::string &op_name, OpRunner *op, const F &func, const Args &... inputs) { +void DvmCall(const std::string &op_name, OpRunner *op, const F &func, const Args &...inputs) { size_t stream = op->stream_id(); const DeviceContext *context = op->device_context(); PyBoostUtils::PrepareOpInputs(context, stream, inputs...); @@ -452,7 +452,7 @@ struct MatMulAdapter { }; template -void DumpOp(const std::string &op_name, OpRunner *op, const Args &... inputs) { +void DumpOp(const std::string &op_name, OpRunner *op, const Args &...inputs) { if (LazyFusionFlags::GetInstance().dump_as_text) { auto k = g_lazy_fusion_manager.Get(op->device_context(), op->stream_id()); k->DumpOp(op_name, op->outputs(), inputs...); diff --git a/mindspore/ops/kernel/ascend/hccl/hccl_kernel.h b/mindspore/ops/kernel/ascend/hccl/hccl_kernel.h index 67b3113d70cdb7c380361a99117366cb9ec501f9..9c3ff0cdc7009b94bc93570fe617e843c39956d2 100644 --- a/mindspore/ops/kernel/ascend/hccl/hccl_kernel.h +++ b/mindspore/ops/kernel/ascend/hccl/hccl_kernel.h @@ -29,7 +29,7 @@ #include "hccl/hcom.h" #include "hccl/hccl_types.h" #include "utils/ms_utils.h" -#include "runtime/hardware_abstract/collective/collective_comm_lib_loader.h" +#include "include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h" #include "plugin/ascend/res_manager/collective/ascend_collective_comm_lib.h" #ifdef ENABLE_INTERNAL_KERNELS #include "plugin/ascend/res_manager/collective/lowlatency_collective_comm_lib.h" diff --git a/mindspore/ops/kernel/ascend/hccl/hcom_util.h b/mindspore/ops/kernel/ascend/hccl/hcom_util.h index 384345be3c62de2f57e55c051702972c8b31dd1c..1d007c124ea28104bea7c4e9daeb059561ff4447 100644 --- a/mindspore/ops/kernel/ascend/hccl/hcom_util.h +++ b/mindspore/ops/kernel/ascend/hccl/hcom_util.h @@ -26,7 +26,7 @@ #include "hccl/base.h" #include "include/utils/contract.h" #include "hccl/hccl_types.h" -#include "runtime/hardware_abstract/collective/collective_communication_lib.h" +#include "include/runtime/hardware_abstract/collective/collective_communication_lib.h" #include "utils/shape_utils.h" #include "include/runtime/hardware_abstract/kernel_base/kernel.h" #include "mindspore/ops/op_def/framework_op_name.h" diff --git a/mindspore/ops/kernel/ascend/hccl/pyboost/comm_common.cc b/mindspore/ops/kernel/ascend/hccl/pyboost/comm_common.cc index 8ab7eb0b6f511a25be6e6a158808f8554e05db19..5ddeb8e8e2aacdf6e3d12d0bf7da70d084573fad 100644 --- a/mindspore/ops/kernel/ascend/hccl/pyboost/comm_common.cc +++ b/mindspore/ops/kernel/ascend/hccl/pyboost/comm_common.cc @@ -25,7 +25,7 @@ #include "plugin/ascend/res_manager/symbol_interface/acl_rt_symbol.h" #include "plugin/ascend/res_manager/symbol_interface/symbol_utils.h" #include "mindspore/ccsrc/pyboost/comm_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/backend/debug/execute_order_tracker/kernel_cache.h" #include "include/runtime/utils/runtime_conf/runtime_conf.h" #include "include/runtime/utils/runtime_conf/runtime_env.h" diff --git a/mindspore/ops/kernel/ascend/internal/pyboost/internal_kernel_info.h b/mindspore/ops/kernel/ascend/internal/pyboost/internal_kernel_info.h index 1d497a87447c7beefe81fe9de24a15c353098acb..7a5bb5d216570fd0907c00d518c1a3494471f140 100644 --- a/mindspore/ops/kernel/ascend/internal/pyboost/internal_kernel_info.h +++ b/mindspore/ops/kernel/ascend/internal/pyboost/internal_kernel_info.h @@ -40,7 +40,7 @@ #include "mindspore/ccsrc/pyboost/op_runner.h" #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "kernel/ascend/aclnn/pyboost_impl/aclnn_utils.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "pynative/utils/runtime/op_executor.h" namespace mindspore { diff --git a/mindspore/ops/kernel/cpu/eigen/gamma_cpu_kernel.h b/mindspore/ops/kernel/cpu/eigen/gamma_cpu_kernel.h index b5adbcff1ebc2db276625a08159c17b833c7dcc4..a166b308f9fab37938db02570f54bb0316aad10c 100644 --- a/mindspore/ops/kernel/cpu/eigen/gamma_cpu_kernel.h +++ b/mindspore/ops/kernel/cpu/eigen/gamma_cpu_kernel.h @@ -25,7 +25,7 @@ #include "kernel/cpu/cpu_kernel.h" #include "include/runtime/hardware_abstract/kernel_base/ms_factory.h" #include "mindspore/ops/kernel/cpu/utils/random_util.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" #include "mindspore/ops/infer/random_gamma.h" namespace mindspore { diff --git a/mindspore/ops/kernel/cpu/eigen/parameterized_truncated_normal_cpu_kernel.cc b/mindspore/ops/kernel/cpu/eigen/parameterized_truncated_normal_cpu_kernel.cc index 0517e4341726ce3d909571922708771fd7b7cb50..e01fbdacece449472a38f75c337af22de7b3970e 100644 --- a/mindspore/ops/kernel/cpu/eigen/parameterized_truncated_normal_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/eigen/parameterized_truncated_normal_cpu_kernel.cc @@ -25,7 +25,7 @@ #include "kernel/cpu/eigen/eigen_common_utils.h" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" #include "mindspore/ops/infer/parameterized_truncated_normal.h" namespace mindspore { @@ -270,8 +270,8 @@ void ParameterizedTruncatedNormalCpuKernelMod::GenerateCase3(const int64_t size, return; } -const std::vector> - &ParameterizedTruncatedNormalCpuKernelMod::GetFuncList() const { +const std::vector> & +ParameterizedTruncatedNormalCpuKernelMod::GetFuncList() const { static const std::vector> func_list = { {KernelAttr() .AddInputAttr(kNumberTypeInt32) diff --git a/mindspore/ops/kernel/cpu/eigen/random_poisson_cpu_kernel.cc b/mindspore/ops/kernel/cpu/eigen/random_poisson_cpu_kernel.cc index c716450dbd3f87b5a04acc9bac45102f15a31fe2..ddc3afa2becd99522efdfc7f761baaf551078d4f 100644 --- a/mindspore/ops/kernel/cpu/eigen/random_poisson_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/eigen/random_poisson_cpu_kernel.cc @@ -20,20 +20,18 @@ #include "unsupported/Eigen/CXX11/Tensor" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { namespace { using KernelRunFunc = RandomPoissonCpuKernelMod::KernelRunFunc; #define ADD_KERNEL(shape_dtype, rate_dtype, output_dtype, rate_type, output_type) \ - { \ - KernelAttr() \ - .AddInputAttr(kNumberType##shape_dtype) \ - .AddInputAttr(kNumberType##rate_dtype) \ - .AddOutputAttr(kNumberType##output_dtype), \ - &RandomPoissonCpuKernelMod::LaunchKernel \ - } + {KernelAttr() \ + .AddInputAttr(kNumberType##shape_dtype) \ + .AddInputAttr(kNumberType##rate_dtype) \ + .AddOutputAttr(kNumberType##output_dtype), \ + &RandomPoissonCpuKernelMod::LaunchKernel} static unsigned int s_seed = static_cast(time(nullptr)); #ifndef _MSC_VER diff --git a/mindspore/ops/kernel/cpu/native/bernoulli_cpu_kernel.h b/mindspore/ops/kernel/cpu/native/bernoulli_cpu_kernel.h index 43124facb51be0d6d7e57d53034c55f7bd8c3726..aeb9b82bd0525639fee5a95052016539dcaabd1b 100644 --- a/mindspore/ops/kernel/cpu/native/bernoulli_cpu_kernel.h +++ b/mindspore/ops/kernel/cpu/native/bernoulli_cpu_kernel.h @@ -27,7 +27,7 @@ #include "kernel/cpu/cpu_kernel.h" #include "include/runtime/hardware_abstract/kernel_base/ms_factory.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/native/dropout_cpu_kernel.cc b/mindspore/ops/kernel/cpu/native/dropout_cpu_kernel.cc index 37f3d81e71ec69421144b80c7afbddf717a94f52..7f16f861cf1510448009f75c0701374e65bcb0e3 100644 --- a/mindspore/ops/kernel/cpu/native/dropout_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/native/dropout_cpu_kernel.cc @@ -22,7 +22,7 @@ #include #include "mindspore/ops/infer/ops_func_impl/dropout.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/native/environ/environ_cpu_create.cc b/mindspore/ops/kernel/cpu/native/environ/environ_cpu_create.cc index ad10a1b6a3c8de6b7aa42825a111ad6c689d5c2e..2021e4dd67ca3c2e1932a98b805dad0ecf8cafd3 100644 --- a/mindspore/ops/kernel/cpu/native/environ/environ_cpu_create.cc +++ b/mindspore/ops/kernel/cpu/native/environ/environ_cpu_create.cc @@ -15,7 +15,7 @@ */ #include "kernel/cpu/native/environ/environ_cpu_create.h" -#include "runtime/hardware_abstract/kernel_base/environ_manager.h" +#include "include/runtime/hardware_abstract/kernel_base/environ_manager.h" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" namespace mindspore { diff --git a/mindspore/ops/kernel/cpu/native/environ/environ_cpu_destroy_all.cc b/mindspore/ops/kernel/cpu/native/environ/environ_cpu_destroy_all.cc index a9db789b98aedc7571599a05f5d0bbed3ca211e0..700ab97fbc5e72c26cd7326198aa9c407a5961d1 100644 --- a/mindspore/ops/kernel/cpu/native/environ/environ_cpu_destroy_all.cc +++ b/mindspore/ops/kernel/cpu/native/environ/environ_cpu_destroy_all.cc @@ -15,7 +15,7 @@ */ #include "kernel/cpu/native/environ/environ_cpu_destroy_all.h" -#include "runtime/hardware_abstract/kernel_base/environ_manager.h" +#include "include/runtime/hardware_abstract/kernel_base/environ_manager.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/native/environ/environ_cpu_get.cc b/mindspore/ops/kernel/cpu/native/environ/environ_cpu_get.cc index 8b281a66ebeb92ac675248359b6a536c246e0d8a..1874d728832044901acc619fb2997aa5d0f1be3f 100644 --- a/mindspore/ops/kernel/cpu/native/environ/environ_cpu_get.cc +++ b/mindspore/ops/kernel/cpu/native/environ/environ_cpu_get.cc @@ -15,7 +15,7 @@ */ #include "kernel/cpu/native/environ/environ_cpu_get.h" -#include "runtime/hardware_abstract/kernel_base/environ_manager.h" +#include "include/runtime/hardware_abstract/kernel_base/environ_manager.h" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" namespace mindspore { diff --git a/mindspore/ops/kernel/cpu/native/environ/environ_cpu_set.cc b/mindspore/ops/kernel/cpu/native/environ/environ_cpu_set.cc index 41fd0c55b1bae37ee2927f3b066dfa5ef33eafac..459f2f580578dc7840a05061800fc000bf7ad11a 100644 --- a/mindspore/ops/kernel/cpu/native/environ/environ_cpu_set.cc +++ b/mindspore/ops/kernel/cpu/native/environ/environ_cpu_set.cc @@ -15,7 +15,7 @@ */ #include "kernel/cpu/native/environ/environ_cpu_set.h" -#include "runtime/hardware_abstract/kernel_base/environ_manager.h" +#include "include/runtime/hardware_abstract/kernel_base/environ_manager.h" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" #include "utils/ms_context.h" #include "runtime/hardware_abstract/device_context/device_context_manager.h" diff --git a/mindspore/ops/kernel/cpu/native/multinomial_cpu_kernel.cc b/mindspore/ops/kernel/cpu/native/multinomial_cpu_kernel.cc index 4f591ab3f1e2086618d4ffdd7adc34a9e05c773b..d578fdfce6eefe61b0240ba160c8d1d93418a77e 100644 --- a/mindspore/ops/kernel/cpu/native/multinomial_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/native/multinomial_cpu_kernel.cc @@ -29,7 +29,7 @@ #include "kernel/cpu/cpu_kernel.h" #include "include/runtime/hardware_abstract/kernel_base/ms_factory.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/native/multinomial_with_replacement_cpu_kernel.h b/mindspore/ops/kernel/cpu/native/multinomial_with_replacement_cpu_kernel.h index 2ce878f6856cd001785fc817f088dac48b97361b..05c69a1d35496188a36b44fc9faab255d68b756f 100644 --- a/mindspore/ops/kernel/cpu/native/multinomial_with_replacement_cpu_kernel.h +++ b/mindspore/ops/kernel/cpu/native/multinomial_with_replacement_cpu_kernel.h @@ -27,7 +27,7 @@ #include "kernel/cpu/cpu_kernel.h" #include "include/runtime/hardware_abstract/kernel_base/ms_factory.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/native/random_categorical_cpu_kernel.cc b/mindspore/ops/kernel/cpu/native/random_categorical_cpu_kernel.cc index 13a51fbf161384d451693f52651607c04a76ae34..1b1f13a3f88c92141dd42dd87e5c18604af5d303 100644 --- a/mindspore/ops/kernel/cpu/native/random_categorical_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/native/random_categorical_cpu_kernel.cc @@ -22,7 +22,7 @@ #include #include "infer/random_categorical.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { @@ -31,14 +31,12 @@ namespace { using KernelRunFunc = RandomCategoricalCpuKernel::KernelRunFunc; #define RANDOM_CATEGORICAL_ADD_KERNEL(logits_dtype, nun_sample_dtype, seed_dtype, output_dtype, logits_type, \ output_type) \ - { \ - KernelAttr() \ - .AddInputAttr(kNumberType##logits_dtype) \ - .AddInputAttr(kNumberType##nun_sample_dtype) \ - .AddInputAttr(kNumberType##seed_dtype) \ - .AddOutputAttr(kNumberType##output_dtype), \ - &RandomCategoricalCpuKernel::LaunchKernel \ - } + {KernelAttr() \ + .AddInputAttr(kNumberType##logits_dtype) \ + .AddInputAttr(kNumberType##nun_sample_dtype) \ + .AddInputAttr(kNumberType##seed_dtype) \ + .AddOutputAttr(kNumberType##output_dtype), \ + &RandomCategoricalCpuKernel::LaunchKernel} } // namespace const std::vector> &RandomCategoricalCpuKernel::GetFuncList() const { diff --git a/mindspore/ops/kernel/cpu/native/random_choice_with_mask_cpu_kernel.cc b/mindspore/ops/kernel/cpu/native/random_choice_with_mask_cpu_kernel.cc index e96c2e9131ac940b35ac8ed61a15ca182f891791..9d4a2305e9bd938d4b0f577416c4d938ac2c10c1 100644 --- a/mindspore/ops/kernel/cpu/native/random_choice_with_mask_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/native/random_choice_with_mask_cpu_kernel.cc @@ -17,7 +17,7 @@ #include "kernel/cpu/native/random_choice_with_mask_cpu_kernel.h" #include "mindspore/ops/infer/random_choice_with_mask.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" #include "ops_utils/op_utils.h" namespace mindspore { diff --git a/mindspore/ops/kernel/cpu/native/random_cpu_kernel.cc b/mindspore/ops/kernel/cpu/native/random_cpu_kernel.cc index f6dfa38daa8d7f024b8ea4c92cd3d8d8a324e04f..bb01d932791398793579fec35c7ce8c3a387e443 100644 --- a/mindspore/ops/kernel/cpu/native/random_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/native/random_cpu_kernel.cc @@ -23,7 +23,7 @@ #endif #include "mindspore/ops/op_def/random_ops.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/native/random_shuffle_cpu_kernel.cc b/mindspore/ops/kernel/cpu/native/random_shuffle_cpu_kernel.cc index 289abd8d634377283f2b906ef2419a1d025e5512..cd2d11c744df5611a32959d48a5900efb87c4803 100644 --- a/mindspore/ops/kernel/cpu/native/random_shuffle_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/native/random_shuffle_cpu_kernel.cc @@ -19,7 +19,7 @@ #include #include #include "mindspore/ops/infer/random_shuffle.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" #include "ops_utils/op_utils.h" namespace mindspore { diff --git a/mindspore/ops/kernel/cpu/native/sample_distorted_bounding_box_v2_cpu_kernel.h b/mindspore/ops/kernel/cpu/native/sample_distorted_bounding_box_v2_cpu_kernel.h index 67efeb175ec5d0b424b1b93fd0586337ddba318e..e3e0b5a47e2b57809dc9f6b62828262aee378e3d 100644 --- a/mindspore/ops/kernel/cpu/native/sample_distorted_bounding_box_v2_cpu_kernel.h +++ b/mindspore/ops/kernel/cpu/native/sample_distorted_bounding_box_v2_cpu_kernel.h @@ -22,7 +22,7 @@ #include #include #include "kernel/cpu/cpu_kernel.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" #include "include/runtime/hardware_abstract/kernel_base/ms_factory.h" namespace mindspore { diff --git a/mindspore/ops/kernel/cpu/native/standard_laplace_cpu_kernel.cc b/mindspore/ops/kernel/cpu/native/standard_laplace_cpu_kernel.cc index cb7f23abb40f6ceb67b0d7a2e994c8b7e151cad9..14af0491de67abb9ae329ae196bdcae4f613fb62 100644 --- a/mindspore/ops/kernel/cpu/native/standard_laplace_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/native/standard_laplace_cpu_kernel.cc @@ -16,7 +16,7 @@ #include "kernel/cpu/native/standard_laplace_cpu_kernel.h" #include -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/native/truncated_normal_cpu_kernel.cc b/mindspore/ops/kernel/cpu/native/truncated_normal_cpu_kernel.cc index 665128a233ed15b5d937e0ad44f65ba73a121450..0b1f28d4feaede0ce7c39e1a79ccf7f331fb9104 100644 --- a/mindspore/ops/kernel/cpu/native/truncated_normal_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/native/truncated_normal_cpu_kernel.cc @@ -25,7 +25,7 @@ #include "mindspore/ops/infer/truncated_normal.h" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/native/uniform_candidate_sampler_cpu_kernel.cc b/mindspore/ops/kernel/cpu/native/uniform_candidate_sampler_cpu_kernel.cc index 3b8d4cf528643dda5a21333f8d84ee91c8080d3e..7b520ad3154ae4fad69ff849886b87bce26f3019 100644 --- a/mindspore/ops/kernel/cpu/native/uniform_candidate_sampler_cpu_kernel.cc +++ b/mindspore/ops/kernel/cpu/native/uniform_candidate_sampler_cpu_kernel.cc @@ -22,7 +22,7 @@ #include #include "mindspore/ops/op_def/random_ops.h" #include "mindspore/ops/infer/uniform_candidate_sampler.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" #include "ops_utils/op_utils.h" #include "mindspore/ops/op_def/auto_generate/gen_ops_primitive_u.h" diff --git a/mindspore/ops/kernel/cpu/native/uniform_cpu_kernel.h b/mindspore/ops/kernel/cpu/native/uniform_cpu_kernel.h index 668fb42ff255214c0041a2ea14f3d46191643c03..11b3b79499a3debc5929077c7dbebd4efd70c33f 100644 --- a/mindspore/ops/kernel/cpu/native/uniform_cpu_kernel.h +++ b/mindspore/ops/kernel/cpu/native/uniform_cpu_kernel.h @@ -27,7 +27,7 @@ #include "kernel/cpu/cpu_kernel.h" #include "include/runtime/hardware_abstract/kernel_base/ms_factory.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/pyboost/customize/masked_select.cc b/mindspore/ops/kernel/cpu/pyboost/customize/masked_select.cc index e75283d7f389e512ec5281c245d148f0e721946c..ba82975230b0df6983cab21a5f6efe25c44bf3f6 100644 --- a/mindspore/ops/kernel/cpu/pyboost/customize/masked_select.cc +++ b/mindspore/ops/kernel/cpu/pyboost/customize/masked_select.cc @@ -22,7 +22,7 @@ #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "mindspore/ccsrc/pyboost/op_runner.h" #include "mindspore/ccsrc/pyboost/customize/op_common.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/pyboost/customize/non_zero.cc b/mindspore/ops/kernel/cpu/pyboost/customize/non_zero.cc index 90ec1fd12794277921e75840fdf8f8ee370045e7..5dce42987ae5971afdb99557848b6aaad7f2ccf3 100755 --- a/mindspore/ops/kernel/cpu/pyboost/customize/non_zero.cc +++ b/mindspore/ops/kernel/cpu/pyboost/customize/non_zero.cc @@ -22,7 +22,7 @@ #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "mindspore/ccsrc/pyboost/op_runner.h" #include "mindspore/ccsrc/pyboost/customize/op_common.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/pyboost/customize/unique_consecutive.cc b/mindspore/ops/kernel/cpu/pyboost/customize/unique_consecutive.cc index 0b2a44b2c249d2ba52c346ac86412d7c87f22bf9..0137c2e0befa2f7f5938128471f39a0bbc9e31a3 100644 --- a/mindspore/ops/kernel/cpu/pyboost/customize/unique_consecutive.cc +++ b/mindspore/ops/kernel/cpu/pyboost/customize/unique_consecutive.cc @@ -22,7 +22,7 @@ #include "runtime/hardware_abstract/device_context/device_context_manager.h" #include "mindspore/ccsrc/pyboost/op_runner.h" #include "mindspore/ccsrc/pyboost/customize/op_common.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/cpu/utils/random_util.h b/mindspore/ops/kernel/cpu/utils/random_util.h index 036caf6b24d3ab4201b4c7c5cf5bba249b889928..8ea30bf082470a9156bb9934c3f9154482016d26 100644 --- a/mindspore/ops/kernel/cpu/utils/random_util.h +++ b/mindspore/ops/kernel/cpu/utils/random_util.h @@ -22,7 +22,7 @@ #include #include #include "Eigen/Core" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" using mutex = std::mutex; using mutex_lock = std::lock_guard; diff --git a/mindspore/ops/kernel/gpu/cuda/math/multinomial_gpu_kernel.cc b/mindspore/ops/kernel/gpu/cuda/math/multinomial_gpu_kernel.cc index 3a6f7f497d9cba4e373703ef8b97eccb5aa7c4c2..683f32eaab948776bb663d0ef3bcfed12112b112 100644 --- a/mindspore/ops/kernel/gpu/cuda/math/multinomial_gpu_kernel.cc +++ b/mindspore/ops/kernel/gpu/cuda/math/multinomial_gpu_kernel.cc @@ -15,7 +15,7 @@ */ #include "kernel/gpu/cuda/math/multinomial_gpu_kernel.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/math/random_op_gpu_kernel.h b/mindspore/ops/kernel/gpu/cuda/math/random_op_gpu_kernel.h index 64342b4f3641af853557b8ad5c99a6ef5d3270a5..29a8291bd8e08994385666deba931ef4d02905b4 100644 --- a/mindspore/ops/kernel/gpu/cuda/math/random_op_gpu_kernel.h +++ b/mindspore/ops/kernel/gpu/cuda/math/random_op_gpu_kernel.h @@ -28,7 +28,7 @@ #include "kernel/gpu/cuda_impl/cuda_ops/random_op_impl.cuh" #include "include/curand.h" #include "utils/ms_context.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/math/random_truncatednorm_gpu_kernel.h b/mindspore/ops/kernel/gpu/cuda/math/random_truncatednorm_gpu_kernel.h index c1eb9dea7fffc11d775af3302a6afce2f09c4e8d..2796222ecb458fca43f48d954c68f46c3c4c88a0 100644 --- a/mindspore/ops/kernel/gpu/cuda/math/random_truncatednorm_gpu_kernel.h +++ b/mindspore/ops/kernel/gpu/cuda/math/random_truncatednorm_gpu_kernel.h @@ -31,7 +31,7 @@ #include "kernel/gpu/gpu_kernel_factory.h" #include "kernel/gpu/cuda_impl/cuda_ops/random_op_impl.cuh" #include "utils/ms_context.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/nn/dropout_gpu_kernel.cc b/mindspore/ops/kernel/gpu/cuda/nn/dropout_gpu_kernel.cc index a2b8c04d1641027a665774e9a7f9bc1f640e3244..8a5d61cba365b06f901512bace2d9626dbe7c9e2 100644 --- a/mindspore/ops/kernel/gpu/cuda/nn/dropout_gpu_kernel.cc +++ b/mindspore/ops/kernel/gpu/cuda/nn/dropout_gpu_kernel.cc @@ -17,7 +17,7 @@ #include #include #include "mindspore/ops/infer/ops_func_impl/dropout.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/random/parameterized_truncated_normal_gpu_kernel.h b/mindspore/ops/kernel/gpu/cuda/random/parameterized_truncated_normal_gpu_kernel.h index 79e311dacd69fc7db47607f9de7a6413255c3943..506b6a456616704613b3457969f4548921546e78 100644 --- a/mindspore/ops/kernel/gpu/cuda/random/parameterized_truncated_normal_gpu_kernel.h +++ b/mindspore/ops/kernel/gpu/cuda/random/parameterized_truncated_normal_gpu_kernel.h @@ -22,7 +22,7 @@ #include #include "kernel/gpu/gpu_kernel.h" #include "include/runtime/hardware_abstract/kernel_base/ms_factory.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/random/random_categorical_gpu_kernel.h b/mindspore/ops/kernel/gpu/cuda/random/random_categorical_gpu_kernel.h index cff3e9216fbdad17dca28ea9fd92055e277f81e0..088673a87350b62637b8dd8c8804dbf9c00846b5 100644 --- a/mindspore/ops/kernel/gpu/cuda/random/random_categorical_gpu_kernel.h +++ b/mindspore/ops/kernel/gpu/cuda/random/random_categorical_gpu_kernel.h @@ -27,7 +27,7 @@ #include "kernel/gpu/gpu_kernel_factory.h" #include "kernel/gpu/cuda_impl/cuda_ops/random_categorical.cuh" #include "mindspore/ops/infer/random_categorical.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/random/random_choice_with_mask_gpu_kernel.cc b/mindspore/ops/kernel/gpu/cuda/random/random_choice_with_mask_gpu_kernel.cc index 708f45d987565058c65fb3188e702ab76d721517..638e6aa5be0793ffb06d5177a1c506c4f3139ee5 100644 --- a/mindspore/ops/kernel/gpu/cuda/random/random_choice_with_mask_gpu_kernel.cc +++ b/mindspore/ops/kernel/gpu/cuda/random/random_choice_with_mask_gpu_kernel.cc @@ -16,7 +16,7 @@ #include "kernel/gpu/cuda/random/random_choice_with_mask_gpu_kernel.h" #include "mindspore/ops/infer/random_choice_with_mask.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/random/random_poisson_gpu_kernel.h b/mindspore/ops/kernel/gpu/cuda/random/random_poisson_gpu_kernel.h index 8e5ae0af94a3d787029beeea4fc7f3ad702a5ca5..e1b4fc72c03fe19a7146bd7286efe7e7970e7b58 100644 --- a/mindspore/ops/kernel/gpu/cuda/random/random_poisson_gpu_kernel.h +++ b/mindspore/ops/kernel/gpu/cuda/random/random_poisson_gpu_kernel.h @@ -28,7 +28,7 @@ #include "kernel/gpu/gpu_kernel.h" #include "kernel/gpu/gpu_kernel_factory.h" #include "kernel/gpu/cuda_impl/cuda_ops/random_op_impl.cuh" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/random/random_shuffle_gpu_kernel.cc b/mindspore/ops/kernel/gpu/cuda/random/random_shuffle_gpu_kernel.cc index e0e85d37ff87b6e11eb446fc46fd16f5df20a86f..6f2c34a1fccaeb68b826082c82f0c2a3d86e5b06 100644 --- a/mindspore/ops/kernel/gpu/cuda/random/random_shuffle_gpu_kernel.cc +++ b/mindspore/ops/kernel/gpu/cuda/random/random_shuffle_gpu_kernel.cc @@ -24,7 +24,7 @@ #include "ir/anf.h" #include "utils/log_adapter.h" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" #include "include/cuda_fp16.h" #include "kernel/gpu/cuda_impl/cuda_ops/complex.h" #include "kernel/gpu/cuda_impl/cuda_ops/random_shuffle_impl.cuh" diff --git a/mindspore/ops/kernel/gpu/cuda/random/random_standard_laplace_gpu_kernel.h b/mindspore/ops/kernel/gpu/cuda/random/random_standard_laplace_gpu_kernel.h index ed2c475ae721d7ee2f771b87808fdb5045d8cfab..e09a7f2abb2c027b7ca211717a6a2d5c151e78e2 100644 --- a/mindspore/ops/kernel/gpu/cuda/random/random_standard_laplace_gpu_kernel.h +++ b/mindspore/ops/kernel/gpu/cuda/random/random_standard_laplace_gpu_kernel.h @@ -32,7 +32,7 @@ #include "kernel/gpu/gpu_kernel.h" #include "kernel/gpu/gpu_kernel_factory.h" #include "kernel/gpu/cuda_impl/cuda_ops/random_op_impl.cuh" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/random/uniform_candidate_sampler_gpu_kernel.cc b/mindspore/ops/kernel/gpu/cuda/random/uniform_candidate_sampler_gpu_kernel.cc index afcc1da854729257458acbb12fd1785951c8b7eb..43ee2f2df47434f97646b867599cc3da324bd5ad 100644 --- a/mindspore/ops/kernel/gpu/cuda/random/uniform_candidate_sampler_gpu_kernel.cc +++ b/mindspore/ops/kernel/gpu/cuda/random/uniform_candidate_sampler_gpu_kernel.cc @@ -17,7 +17,7 @@ #include "kernel/gpu/cuda/random/uniform_candidate_sampler_gpu_kernel.h" #include #include "mindspore/ops/infer/uniform_candidate_sampler.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/cuda/random/uniform_gpu_kernel.h b/mindspore/ops/kernel/gpu/cuda/random/uniform_gpu_kernel.h index 6a2f414581980a22dee010e8183ff183e85ccf4f..47e14057a81bacf5d44ab887f7f4551b5c31f48e 100644 --- a/mindspore/ops/kernel/gpu/cuda/random/uniform_gpu_kernel.h +++ b/mindspore/ops/kernel/gpu/cuda/random/uniform_gpu_kernel.h @@ -22,7 +22,7 @@ #include #include "kernel/gpu/gpu_kernel_factory.h" #include "mindspore/ops/infer/uniform.h" -#include "runtime/hardware_abstract/kernel_base/philox_random.h" +#include "include/runtime/hardware_abstract/kernel_base/philox_random.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/environ/environ_gpu_create.cc b/mindspore/ops/kernel/gpu/environ/environ_gpu_create.cc index c3a6c6109c9c0e94a42ffb6c54296260bc430436..3104148d39b21ac0e92fea53d259ba545693b094 100644 --- a/mindspore/ops/kernel/gpu/environ/environ_gpu_create.cc +++ b/mindspore/ops/kernel/gpu/environ/environ_gpu_create.cc @@ -15,7 +15,7 @@ */ #include "kernel/gpu/environ/environ_gpu_create.h" -#include "runtime/hardware_abstract/kernel_base/environ_manager.h" +#include "include/runtime/hardware_abstract/kernel_base/environ_manager.h" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" namespace mindspore { diff --git a/mindspore/ops/kernel/gpu/environ/environ_gpu_destroy_all.cc b/mindspore/ops/kernel/gpu/environ/environ_gpu_destroy_all.cc index ee50298cba8268f4f1a0b1fa845efcb4f5e8e47b..1e2b487b1c095b481e5c1b11ab5e18e873302656 100644 --- a/mindspore/ops/kernel/gpu/environ/environ_gpu_destroy_all.cc +++ b/mindspore/ops/kernel/gpu/environ/environ_gpu_destroy_all.cc @@ -15,7 +15,7 @@ */ #include "kernel/gpu/environ/environ_gpu_destroy_all.h" -#include "runtime/hardware_abstract/kernel_base/environ_manager.h" +#include "include/runtime/hardware_abstract/kernel_base/environ_manager.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/environ/environ_gpu_get.cc b/mindspore/ops/kernel/gpu/environ/environ_gpu_get.cc index b34947a61e2ab089f19ef278bf0427ce26b43253..ec6a3010f220c51eb316f48fd944d776febcba7a 100644 --- a/mindspore/ops/kernel/gpu/environ/environ_gpu_get.cc +++ b/mindspore/ops/kernel/gpu/environ/environ_gpu_get.cc @@ -15,7 +15,7 @@ */ #include "kernel/gpu/environ/environ_gpu_get.h" -#include "runtime/hardware_abstract/kernel_base/environ_manager.h" +#include "include/runtime/hardware_abstract/kernel_base/environ_manager.h" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" namespace mindspore { diff --git a/mindspore/ops/kernel/gpu/environ/environ_gpu_set.cc b/mindspore/ops/kernel/gpu/environ/environ_gpu_set.cc index 5789e8b30c8fc7f412198ec520bdd1f9de092a8b..5e99e6594ada7abde5aa10239dd2e9d8c2266236 100644 --- a/mindspore/ops/kernel/gpu/environ/environ_gpu_set.cc +++ b/mindspore/ops/kernel/gpu/environ/environ_gpu_set.cc @@ -15,7 +15,7 @@ */ #include "kernel/gpu/environ/environ_gpu_set.h" -#include "runtime/hardware_abstract/kernel_base/environ_manager.h" +#include "include/runtime/hardware_abstract/kernel_base/environ_manager.h" #include "include/runtime/hardware_abstract/kernel_base/common_utils.h" #include "plugin/gpu/res_manager/mem_manager/gpu_memory_allocator.h" diff --git a/mindspore/ops/kernel/gpu/nccl/nccl_gpu_kernel.h b/mindspore/ops/kernel/gpu/nccl/nccl_gpu_kernel.h index b17e2db968e0d859c224e6a3b9eccb7865ab46ec..4b767390f0d94ac3d53de6b3826f965eb72e15aa 100644 --- a/mindspore/ops/kernel/gpu/nccl/nccl_gpu_kernel.h +++ b/mindspore/ops/kernel/gpu/nccl/nccl_gpu_kernel.h @@ -26,7 +26,7 @@ #include "kernel/gpu/kernel_constants.h" #include "plugin/gpu/res_manager/collective/nvidia_collective_comm_lib.h" #include "plugin/gpu/res_manager/mem_manager/gpu_memory_allocator.h" -#include "runtime/hardware_abstract/collective/collective_comm_lib_loader.h" +#include "include/runtime/hardware_abstract/collective/collective_comm_lib_loader.h" namespace mindspore { namespace kernel { diff --git a/mindspore/ops/kernel/gpu/pyboost/customize/masked_select.cc b/mindspore/ops/kernel/gpu/pyboost/customize/masked_select.cc index 2dbf8b5f8376b1ec51a04e293817cae21203398a..56441465e50a9a91d18153f9a9403fbe4d87a404 100644 --- a/mindspore/ops/kernel/gpu/pyboost/customize/masked_select.cc +++ b/mindspore/ops/kernel/gpu/pyboost/customize/masked_select.cc @@ -19,7 +19,7 @@ #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "mindspore/ccsrc/pyboost/op_runner.h" #include "mindspore/ccsrc/pyboost/customize/op_common.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/runtime/utils/runtime_conf/runtime_conf.h" namespace mindspore { diff --git a/mindspore/ops/kernel/gpu/pyboost/customize/non_zero.cc b/mindspore/ops/kernel/gpu/pyboost/customize/non_zero.cc index aa68965cd502859995b0fe678531aa309084747f..222483dddcae03c447d992246f6c639835d56454 100755 --- a/mindspore/ops/kernel/gpu/pyboost/customize/non_zero.cc +++ b/mindspore/ops/kernel/gpu/pyboost/customize/non_zero.cc @@ -19,7 +19,7 @@ #include "mindspore/ccsrc/pyboost/pyboost_utils.h" #include "mindspore/ccsrc/pyboost/op_runner.h" #include "mindspore/ccsrc/pyboost/customize/op_common.h" -#include "runtime/pipeline/pipeline.h" +#include "include/runtime/pipeline/pipeline.h" #include "include/runtime/utils/runtime_conf/runtime_conf.h" namespace mindspore {