From b6630f1c1453d16a1df09de64d7194b9a457e465 Mon Sep 17 00:00:00 2001 From: yangruoqi713 Date: Sun, 11 Jul 2021 18:30:50 +0800 Subject: [PATCH] [MSLITE][Develop] move lite api: delegate, kernel to mindspore/include --- {mindspore/lite/include => include/api}/delegate.h | 2 +- {mindspore/lite/include => include/api}/kernel.h | 0 mindspore/lite/include/registry/register_kernel.h | 2 +- mindspore/lite/src/delegate/delegate.cc | 2 +- mindspore/lite/src/delegate/delegate_utils.h | 2 +- mindspore/lite/src/delegate/npu/npu_delegate.h | 2 +- mindspore/lite/src/delegate/npu/npu_graph.h | 2 +- mindspore/lite/src/delegate/npu/npu_subgraph.h | 2 +- mindspore/lite/src/delegate/npu/transpose_kernel.h | 2 +- mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.h | 2 +- mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.h | 4 ++-- mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.h | 2 +- mindspore/lite/src/inner_kernel.h | 2 +- mindspore/lite/src/lite_kernel.h | 4 ++-- mindspore/lite/src/lite_session.h | 2 +- mindspore/lite/src/scheduler.h | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) rename {mindspore/lite/include => include/api}/delegate.h (99%) rename {mindspore/lite/include => include/api}/kernel.h (100%) diff --git a/mindspore/lite/include/delegate.h b/include/api/delegate.h similarity index 99% rename from mindspore/lite/include/delegate.h rename to include/api/delegate.h index cf43e40f81a..9d7032c5db3 100644 --- a/mindspore/lite/include/delegate.h +++ b/include/api/delegate.h @@ -21,7 +21,7 @@ #include #include #include "schema/model_generated.h" -#include "include/kernel.h" +#include "include/api/kernel.h" namespace mindspore { typedef enum { diff --git a/mindspore/lite/include/kernel.h b/include/api/kernel.h similarity index 100% rename from mindspore/lite/include/kernel.h rename to include/api/kernel.h diff --git a/mindspore/lite/include/registry/register_kernel.h b/mindspore/lite/include/registry/register_kernel.h index fc274fd42e3..1c521b78352 100644 --- a/mindspore/lite/include/registry/register_kernel.h +++ b/mindspore/lite/include/registry/register_kernel.h @@ -24,7 +24,7 @@ #include "schema/model_generated.h" #include "include/api/context.h" #include "include/api/types.h" -#include "include/kernel.h" +#include "include/api/kernel.h" #include "ir/dtype/type_id.h" namespace mindspore { diff --git a/mindspore/lite/src/delegate/delegate.cc b/mindspore/lite/src/delegate/delegate.cc index 1d9c9da7f62..a4f16e3fc83 100644 --- a/mindspore/lite/src/delegate/delegate.cc +++ b/mindspore/lite/src/delegate/delegate.cc @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "include/delegate.h" +#include "include/api/delegate.h" namespace mindspore { const schema::Primitive *DelegateModel::GetPrimitive(kernel::Kernel *kernel) const { if (primitives_.find(kernel) != primitives_.end()) { diff --git a/mindspore/lite/src/delegate/delegate_utils.h b/mindspore/lite/src/delegate/delegate_utils.h index 7c142437e90..9e9af1be2ca 100644 --- a/mindspore/lite/src/delegate/delegate_utils.h +++ b/mindspore/lite/src/delegate/delegate_utils.h @@ -17,7 +17,7 @@ #define MINDSPORE_LITE_SRC_DELEGATE_DELEGATE_UTILS #include #include "include/ms_tensor.h" -#include "include/delegate.h" +#include "include/api/delegate.h" #include "src/common/log_adapter.h" #include "src/delegate/tensorrt/op/tensorrt_op.h" diff --git a/mindspore/lite/src/delegate/npu/npu_delegate.h b/mindspore/lite/src/delegate/npu/npu_delegate.h index 0156c2d8c45..d78c351e1e6 100644 --- a/mindspore/lite/src/delegate/npu/npu_delegate.h +++ b/mindspore/lite/src/delegate/npu/npu_delegate.h @@ -19,7 +19,7 @@ #include #include -#include "include/delegate.h" +#include "include/api/delegate.h" #include "include/context.h" #include "src/delegate/npu/npu_manager.h" #include "src/delegate/npu/pass/npu_pass_manager.h" diff --git a/mindspore/lite/src/delegate/npu/npu_graph.h b/mindspore/lite/src/delegate/npu/npu_graph.h index 5839816921f..9ffd1d6e1f9 100644 --- a/mindspore/lite/src/delegate/npu/npu_graph.h +++ b/mindspore/lite/src/delegate/npu/npu_graph.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/kernel.h" +#include "include/api/kernel.h" #include "src/delegate/npu/op/npu_op.h" #include "src/delegate/npu/npu_executor.h" diff --git a/mindspore/lite/src/delegate/npu/npu_subgraph.h b/mindspore/lite/src/delegate/npu/npu_subgraph.h index 1a6876c5421..72c3fdfdf1d 100644 --- a/mindspore/lite/src/delegate/npu/npu_subgraph.h +++ b/mindspore/lite/src/delegate/npu/npu_subgraph.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/kernel.h" +#include "include/api/kernel.h" #include "src/delegate/npu/npu_executor.h" namespace mindspore { diff --git a/mindspore/lite/src/delegate/npu/transpose_kernel.h b/mindspore/lite/src/delegate/npu/transpose_kernel.h index d8248b98648..9cea452db11 100644 --- a/mindspore/lite/src/delegate/npu/transpose_kernel.h +++ b/mindspore/lite/src/delegate/npu/transpose_kernel.h @@ -19,7 +19,7 @@ #include #include #include "include/graph/op/all_ops.h" -#include "include/kernel.h" +#include "include/api/kernel.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.h b/mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.h index 29e382c8eff..d9526bdb82c 100644 --- a/mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.h +++ b/mindspore/lite/src/delegate/tensorrt/op/tensorrt_op.h @@ -20,7 +20,7 @@ #include #include #include -#include "include/kernel.h" +#include "include/api/kernel.h" #include "src/common/log_adapter.h" #include "include/errorcode.h" diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.h b/mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.h index 8bc8a7d80a5..26d6c7dc9d7 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.h +++ b/mindspore/lite/src/delegate/tensorrt/tensorrt_delegate.h @@ -18,9 +18,9 @@ #include #include #include -#include "include/delegate.h" +#include "include/api/delegate.h" #include "src/delegate/tensorrt/tensorrt_subgraph.h" -#include "include/kernel.h" +#include "include/api/kernel.h" #include "include/errorcode.h" #include "src/common/log_adapter.h" diff --git a/mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.h b/mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.h index 1e31a28dc60..1ea628e093e 100644 --- a/mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.h +++ b/mindspore/lite/src/delegate/tensorrt/tensorrt_subgraph.h @@ -19,7 +19,7 @@ #include #include #include -#include "include/kernel.h" +#include "include/api/kernel.h" #include "src/delegate/tensorrt/tensorrt_runtime.h" #include "src/delegate/tensorrt/tensorrt_utils.h" diff --git a/mindspore/lite/src/inner_kernel.h b/mindspore/lite/src/inner_kernel.h index 58dbe6b573d..6ce8ba9c3ff 100644 --- a/mindspore/lite/src/inner_kernel.h +++ b/mindspore/lite/src/inner_kernel.h @@ -30,7 +30,7 @@ #include "schema/model_generated.h" #include "src/cxx_api/tensor/tensor_impl.h" #include "include/api/context.h" -#include "include/kernel.h" +#include "include/api/kernel.h" namespace mindspore::kernel { class InnerKernel : public Kernel { diff --git a/mindspore/lite/src/lite_kernel.h b/mindspore/lite/src/lite_kernel.h index 0398b540ea2..6e3861613e3 100644 --- a/mindspore/lite/src/lite_kernel.h +++ b/mindspore/lite/src/lite_kernel.h @@ -32,10 +32,10 @@ #include "include/errorcode.h" #include "schema/model_generated.h" #include "include/context.h" -#include "include/kernel.h" +#include "include/api/kernel.h" #include "src/cxx_api/tensor/tensor_impl.h" #include "src/inner_kernel.h" -#include "include/delegate.h" +#include "include/api/delegate.h" namespace mindspore::kernel { enum KERNEL_ARCH { kCPU, kGPU, kAPU, kNPU, kCustom, kDelegate, kKernelArch_MIN = kCPU, kKernelArch_MAX = kAPU }; diff --git a/mindspore/lite/src/lite_session.h b/mindspore/lite/src/lite_session.h index 1eb864e70d2..5fbc25f4cb3 100644 --- a/mindspore/lite/src/lite_session.h +++ b/mindspore/lite/src/lite_session.h @@ -31,7 +31,7 @@ #include "src/executor.h" #include "src/tensor.h" #include "src/tensorlist.h" -#include "include/delegate.h" +#include "include/api/delegate.h" #if GPU_OPENCL #include "src/runtime/gpu/opencl/opencl_runtime.h" #elif GPU_VULKAN diff --git a/mindspore/lite/src/scheduler.h b/mindspore/lite/src/scheduler.h index 227ae8c5ab3..3be3b1756f4 100644 --- a/mindspore/lite/src/scheduler.h +++ b/mindspore/lite/src/scheduler.h @@ -28,7 +28,7 @@ #include "src/inner_context.h" #include "include/model.h" #include "src/scheduler_cb.h" -#include "include/delegate.h" +#include "include/api/delegate.h" namespace mindspore::lite { class Scheduler {