From b3ee4037aca872137e739ecf49cdcfa4f7753859 Mon Sep 17 00:00:00 2001 From: yangyongjie Date: Mon, 7 Nov 2022 11:37:09 +0800 Subject: [PATCH] move oem file to framework native Signed-off-by: yangyongjie --- README_zh.md | 2 +- frameworks/native/compilation.h | 4 ++-- {interfaces/oem/cpp_api => frameworks/native}/cpp_type.h | 6 +++--- {interfaces/oem/cpp_api => frameworks/native}/device.h | 0 frameworks/native/device_manager.h | 2 +- frameworks/native/device_registrar.cpp | 2 +- .../oem/cpp_api => frameworks/native}/device_registrar.h | 2 +- frameworks/native/execution_plan.cpp | 2 +- frameworks/native/execution_plan.h | 4 ++-- frameworks/native/executor.h | 2 +- frameworks/native/hdi_device.h | 2 +- frameworks/native/hdi_prepared_model.h | 4 ++-- frameworks/native/memory_manager.cpp | 2 +- frameworks/native/nn_tensor.h | 2 +- .../oem/cpp_api => frameworks/native}/prepared_model.h | 0 frameworks/native/transform.h | 2 +- .../components/device_registrar/device_registrar_test.cpp | 2 +- .../components/memory_manager/memory_manager_test.cpp | 2 +- 18 files changed, 21 insertions(+), 21 deletions(-) rename {interfaces/oem/cpp_api => frameworks/native}/cpp_type.h (90%) rename {interfaces/oem/cpp_api => frameworks/native}/device.h (100%) rename {interfaces/oem/cpp_api => frameworks/native}/device_registrar.h (97%) rename {interfaces/oem/cpp_api => frameworks/native}/prepared_model.h (100%) diff --git a/README_zh.md b/README_zh.md index f516f93..ac837ab 100644 --- a/README_zh.md +++ b/README_zh.md @@ -23,7 +23,7 @@ Neural Network Runtime与MindSpore Lite使用MindIR统一模型的中间表达 │   └── drivers # 设备驱动开发样例存放目录 ├── frameworks │   └── native # 框架代码存放目录 -│   └── op # 算子头文件和实现存放目录 +│   └── ops # 算子头文件和实现存放目录 ├── interfaces # 接口存放目录 │   ├── innerkits # 系统内部接口文件存放目录 │   └── kits # 对外开放接口文件存放目录 diff --git a/frameworks/native/compilation.h b/frameworks/native/compilation.h index 0c76ef3..a85f6a5 100644 --- a/frameworks/native/compilation.h +++ b/frameworks/native/compilation.h @@ -18,8 +18,8 @@ #include "inner_model.h" #include "execution_plan.h" -#include "interfaces/oem/cpp_api/device.h" -#include "interfaces/oem/cpp_api/cpp_type.h" +#include "device.h" +#include "cpp_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/interfaces/oem/cpp_api/cpp_type.h b/frameworks/native/cpp_type.h similarity index 90% rename from interfaces/oem/cpp_api/cpp_type.h rename to frameworks/native/cpp_type.h index 719b599..7e906cc 100644 --- a/interfaces/oem/cpp_api/cpp_type.h +++ b/frameworks/native/cpp_type.h @@ -13,8 +13,8 @@ * limitations under the License. */ -#ifndef NEURAL_NETWORK_RUNTIME_OEM_CPP_API_TYPE_H -#define NEURAL_NETWORK_RUNTIME_OEM_CPP_API_TYPE_H +#ifndef NEURAL_NETWORK_RUNTIME_CPP_API_TYPE_H +#define NEURAL_NETWORK_RUNTIME_CPP_API_TYPE_H #include #include @@ -61,4 +61,4 @@ struct IOTensor { } // NeuralNetworkRuntime } // OHOS -#endif // NEURAL_NETWORK_RUNTIME_OEM_CPP_API_TYPE_H \ No newline at end of file +#endif // NEURAL_NETWORK_RUNTIME_CPP_API_TYPE_H \ No newline at end of file diff --git a/interfaces/oem/cpp_api/device.h b/frameworks/native/device.h similarity index 100% rename from interfaces/oem/cpp_api/device.h rename to frameworks/native/device.h diff --git a/frameworks/native/device_manager.h b/frameworks/native/device_manager.h index 1f15c36..20d4bf0 100644 --- a/frameworks/native/device_manager.h +++ b/frameworks/native/device_manager.h @@ -23,7 +23,7 @@ #include #include -#include "interfaces/oem/cpp_api/device.h" +#include "device.h" #include "interfaces/kits/c/neural_network_runtime_type.h" namespace OHOS { diff --git a/frameworks/native/device_registrar.cpp b/frameworks/native/device_registrar.cpp index 3d50ef4..fa2f6ff 100644 --- a/frameworks/native/device_registrar.cpp +++ b/frameworks/native/device_registrar.cpp @@ -13,7 +13,7 @@ * limitations under the License. */ -#include "interfaces/oem/cpp_api/device_registrar.h" +#include "device_registrar.h" #include "device_manager.h" #include "common/log.h" diff --git a/interfaces/oem/cpp_api/device_registrar.h b/frameworks/native/device_registrar.h similarity index 97% rename from interfaces/oem/cpp_api/device_registrar.h rename to frameworks/native/device_registrar.h index 9d3c832..a964529 100644 --- a/interfaces/oem/cpp_api/device_registrar.h +++ b/frameworks/native/device_registrar.h @@ -20,7 +20,7 @@ #include #include -#include "interfaces/oem/cpp_api/device.h" +#include "device.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/execution_plan.cpp b/frameworks/native/execution_plan.cpp index e9a7c72..b1ddfe3 100644 --- a/frameworks/native/execution_plan.cpp +++ b/frameworks/native/execution_plan.cpp @@ -18,7 +18,7 @@ #include #include "common/log.h" -#include "interfaces/oem/cpp_api/cpp_type.h" +#include "cpp_type.h" namespace OHOS { diff --git a/frameworks/native/execution_plan.h b/frameworks/native/execution_plan.h index 6a6b254..9644a32 100644 --- a/frameworks/native/execution_plan.h +++ b/frameworks/native/execution_plan.h @@ -18,8 +18,8 @@ #include "frameworks/native/nn_tensor.h" #include "interfaces/kits/c/neural_network_runtime_type.h" -#include "interfaces/oem/cpp_api/prepared_model.h" -#include "interfaces/oem/cpp_api/device.h" +#include "prepared_model.h" +#include "device.h" namespace OHOS { diff --git a/frameworks/native/executor.h b/frameworks/native/executor.h index bbe3d93..f7a98eb 100644 --- a/frameworks/native/executor.h +++ b/frameworks/native/executor.h @@ -20,7 +20,7 @@ #include "execution_plan.h" #include "nn_tensor.h" #include "interfaces/kits/c/neural_network_runtime.h" -#include "interfaces/oem/cpp_api/device.h" +#include "device.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/hdi_device.h b/frameworks/native/hdi_device.h index ba52530..d795832 100644 --- a/frameworks/native/hdi_device.h +++ b/frameworks/native/hdi_device.h @@ -19,7 +19,7 @@ #include "refbase.h" #include "hdi_interfaces.h" -#include "interfaces/oem/cpp_api/device.h" +#include "device.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/hdi_prepared_model.h b/frameworks/native/hdi_prepared_model.h index 538ab05..d111977 100644 --- a/frameworks/native/hdi_prepared_model.h +++ b/frameworks/native/hdi_prepared_model.h @@ -21,8 +21,8 @@ #include "refbase.h" #include "hdi_interfaces.h" -#include "interfaces/oem/cpp_api/prepared_model.h" -#include "interfaces/oem/cpp_api/cpp_type.h" +#include "prepared_model.h" +#include "cpp_type.h" namespace OHOS { namespace NeuralNetworkRuntime { diff --git a/frameworks/native/memory_manager.cpp b/frameworks/native/memory_manager.cpp index 2c87ada..7c437cd 100644 --- a/frameworks/native/memory_manager.cpp +++ b/frameworks/native/memory_manager.cpp @@ -19,7 +19,7 @@ #include #include -#include "interfaces/oem/cpp_api/cpp_type.h" +#include "cpp_type.h" #include "common/log.h" namespace OHOS { diff --git a/frameworks/native/nn_tensor.h b/frameworks/native/nn_tensor.h index 1b8cf20..2d55141 100644 --- a/frameworks/native/nn_tensor.h +++ b/frameworks/native/nn_tensor.h @@ -19,7 +19,7 @@ #include #include -#include "interfaces/oem/cpp_api/cpp_type.h" +#include "cpp_type.h" #include "interfaces/kits/c/neural_network_runtime.h" namespace OHOS { diff --git a/interfaces/oem/cpp_api/prepared_model.h b/frameworks/native/prepared_model.h similarity index 100% rename from interfaces/oem/cpp_api/prepared_model.h rename to frameworks/native/prepared_model.h diff --git a/frameworks/native/transform.h b/frameworks/native/transform.h index 7021611..2472ad3 100644 --- a/frameworks/native/transform.h +++ b/frameworks/native/transform.h @@ -18,7 +18,7 @@ #include "hdi_interfaces.h" #include "interfaces/kits/c/neural_network_runtime_type.h" -#include "interfaces/oem/cpp_api/cpp_type.h" +#include "cpp_type.h" #include "mindir.h" #include "mindir_types.h" #include "ops_builder.h" diff --git a/test/unittest/components/device_registrar/device_registrar_test.cpp b/test/unittest/components/device_registrar/device_registrar_test.cpp index 4f1ec7c..b96079c 100644 --- a/test/unittest/components/device_registrar/device_registrar_test.cpp +++ b/test/unittest/components/device_registrar/device_registrar_test.cpp @@ -20,7 +20,7 @@ #include #include "common/log.h" -#include "interfaces/oem/cpp_api/device_registrar.h" +#include "frameworks/native/device_registrar.h" #include "frameworks/native/hdi_device.h" #include "frameworks/native/device_manager.h" #include "test/unittest/common/mock_idevice.h" diff --git a/test/unittest/components/memory_manager/memory_manager_test.cpp b/test/unittest/components/memory_manager/memory_manager_test.cpp index eba193d..2a9f9b0 100644 --- a/test/unittest/components/memory_manager/memory_manager_test.cpp +++ b/test/unittest/components/memory_manager/memory_manager_test.cpp @@ -22,7 +22,7 @@ #include -#include "interfaces/oem/cpp_api/cpp_type.h" +#include "frameworks/native/cpp_type.h" #include "frameworks/native/memory_manager.h" #include "test/unittest/common/file_utils.h" -- Gitee