diff --git a/README_zh.md b/README_zh.md index f516f93e360fc40cf63834470927ee77167f70bc..ac837ab06dc5198cc6c426c76593941c0c5b2f56 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 0c76ef3cf49965d4cfce7e8aa1793c2ba5ea6101..a85f6a50294257721020dfd91c0ba68de598395f 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 719b599860ef309307ebbf1d93e5d2d14dafbe9d..7e906cc29944f26a918044980668fdfb5ae14714 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 1f15c369a6fe8e62fe752cb574e367de02005a8c..20d4bf05834c6cbac02191ffa1f743730ebbfb9e 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 3d50ef47779f12c581e4373bb04659f3d9c59ed8..fa2f6ff73c8c1b819bc4bd4ee8b911bd8bd75aaf 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 9d3c8329bc28b6cdf111c9029c0436af8f718ebc..a9645299821087407c45202087110eca1b8365ea 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 e9a7c72b3dad8ecb1252970d66d55c5ec2c258d9..b1ddfe3ac53676fb016bd9aeebd9bd1deaabfd01 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 6a6b254660fe5bef17907a41862ba8d6949ed1b0..9644a321d12b0120f24af6835e7eb035548c7445 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 bbe3d933a53a2f1fbb15e88988ed135ae81c1415..f7a98eb094f35c4235e8f04b5d92e9746f7dff63 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 ba5253012ecfcda97bc959c3da1e1fd66c983f7e..d795832e4ff5456b3fa1cb050831d35a713ae121 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 538ab053b2c35a463e1a68ed3fc4309409a98ff1..d111977b329e3377a95c0de03ae825b1121410cf 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 2c87adaeef0f8bd417a5076a0da488bd7841cef9..7c437cd2ac5c1ed0aecf57c7331125ff72e6a3e1 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 1b8cf20109996bcadc6993ec390951bbf1f5500f..2d551415056ce70c145def112bf31797745526af 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 70216118dbed98666a2ead9f9f98507b5a2965ef..2472ad3f8d1ca8e77912ac3e4f521d7ce7825c1b 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 4f1ec7cee8563a456d0c5001350a9827bfa1b4ea..b96079c82c7ae9fe40e6e00f7e30c17aa1ffc647 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 eba193dd3a78bd69b28f0673be0aa303fee23aef..2a9f9b0116afb387cf08ed2dc230b89cfc824b0a 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"