From a6924928b2942c7cdce3be7ebfac2b7d17e15170 Mon Sep 17 00:00:00 2001 From: TonyWang222 Date: Tue, 14 Feb 2023 15:02:37 +0800 Subject: [PATCH] add nnrt device info and gpu device info Change-Id: I38bdecd75f5beadc7cc51987bb490c11e3fc59c0 Signed-off-by: TonyWang222 --- .../reference/native-apis/_mind_spore.md | 10 +++++++--- .../application-dev/reference/native-apis/model_8h.md | 4 ++-- .../application-dev/reference/native-apis/types_8h.md | 2 +- 3 files changed, 10 insertions(+), 6 deletions(-) diff --git a/zh-cn/application-dev/reference/native-apis/_mind_spore.md b/zh-cn/application-dev/reference/native-apis/_mind_spore.md index 0551f211c2..b9b8073fb7 100644 --- a/zh-cn/application-dev/reference/native-apis/_mind_spore.md +++ b/zh-cn/application-dev/reference/native-apis/_mind_spore.md @@ -73,7 +73,7 @@ | [OH_AI_CompCode](#oh_ai_compcode) {
OH_AI_COMPCODE_CORE = 0x00000000u,
OH_AI_COMPCODE_LITE = 0xF0000000u } | Minspore不同组件的代码、 | | [OH_AI_Status](#oh_ai_status) {
OH_AI_STATUS_SUCCESS = 0,
OH_AI_STATUS_CORE_FAILED = OH_AI_COMPCODE_CORE \| 0x1,
OH_AI_STATUS_LITE_ERROR = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -1),
OH_AI_STATUS_LITE_NULLPTR = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -2),
OH_AI_STATUS_LITE_PARAM_INVALID = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -3),
OH_AI_STATUS_LITE_NO_CHANGE = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -4),
OH_AI_STATUS_LITE_SUCCESS_EXIT = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -5),
OH_AI_STATUS_LITE_MEMORY_FAILED = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -6),
OH_AI_STATUS_LITE_NOT_SUPPORT = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -7),
OH_AI_STATUS_LITE_THREADPOOL_ERROR = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -8),
OH_AI_STATUS_LITE_UNINITIALIZED_OBJ = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -9),
OH_AI_STATUS_LITE_OUT_OF_TENSOR_RANGE,
OH_AI_STATUS_LITE_INPUT_TENSOR_ERROR,
OH_AI_STATUS_LITE_REENTRANT_ERROR = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -102),
OH_AI_STATUS_LITE_GRAPH_FILE_ERROR,
OH_AI_STATUS_LITE_NOT_FIND_OP = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -300), OH_AI_STATUS_LITE_INVALID_OP_NAME = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -301),
OH_AI_STATUS_LITE_INVALID_OP_ATTR = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -302),
OH_AI_STATUS_LITE_OP_EXECUTE_FAILURE,
OH_AI_STATUS_LITE_FORMAT_ERROR = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -400),
OH_AI_STATUS_LITE_INFER_ERROR = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -500),
OH_AI_STATUS_LITE_INFER_INVALID = OH_AI_COMPCODE_LITE \| (0x0FFFFFFF & -501),
OH_AI_STATUS_LITE_INPUT_PARAM_INVALID } | Minspore的状态码。 | | [OH_AI_ModelType](#oh_ai_modeltype) {
OH_AI_MODELTYPE_MINDIR = 0,
OH_AI_MODELTYPE_INVALID = 0xFFFFFFFF } | 模型文件的类型。 | -| [OH_AI_DeviceType](#oh_ai_devicetype) {
OH_AI_DEVICETYPE_CPU = 0,
OH_AI_DEVICETYPE_KIRIN_NPU,
OH_AI_DEVICETYPE_INVALID = 100 } | 设备类型，该信息。 | +| [OH_AI_DeviceType](#oh_ai_devicetype) {
OH_AI_DEVICETYPE_CPU = 0,
OH_AI_DEVICETYPE_KIRIN_GPU,
OH_AI_DEVICETYPE_KIRIN_NPU,
OH_AI_DEVICETYPE_NNRT = 60,
OH_AI_DEVICETYPE_INVALID = 100 } | 设备类型信息，包含了目前支持的设备类型。 | ### 函数 @@ -363,7 +363,9 @@ enum OH_AI_DeviceType | 枚举值 | 描述 | | -------- | -------- | | OH_AI_DEVICETYPE_CPU | 设备类型是CPU。 | -| OH_AI_DEVICETYPE_KIRIN_NPU | 设备类型是麒麟NPU。 | +| OH_AI_DEVICETYPE_GPU | 设备类型是GPU。预留选项，暂不支持。 | +| OH_AI_DEVICETYPE_KIRIN_NPU | 设备类型是麒麟NPU。预留选项，暂不支持。 | +| OH_AI_DEVICETYPE_NNRT | 设备类型是NNRt。OHOS设备范围是[60,80)。 | | OH_AI_DEVICETYPE_INVALID | 设备类型无效。 | @@ -913,7 +915,8 @@ OH_AI_API OH_AI_Status OH_AI_ModelBuild (OH_AI_ModelHandle model, const void * m **描述：** -从内存缓冲区加载并编译MindSpore模型。 +从内存缓冲区加载并编译MindSpore模型。 +注意，同一个{@link OH_AI_ContextHandle}变量仅能传递给{@link OH_AI_ModelBuild}或者{@link OH_AI_ModelBuildFromFile}一次，如果多次调用该函数需要创建多个不同的{@link OH_AI_ContextHandle}。 **参数:** @@ -940,6 +943,7 @@ OH_AI_API OH_AI_Status OH_AI_ModelBuildFromFile (OH_AI_ModelHandle model, const **描述：** 通过模型文件加载并编译MindSpore模型。 +注意，同一个{@link OH_AI_ContextHandle}变量仅能传递给{@link OH_AI_ModelBuild}或者{@link OH_AI_ModelBuildFromFile}一次，如果多次调用该函数需要创建多个不同的{@link OH_AI_ContextHandle}。 **参数:** diff --git a/zh-cn/application-dev/reference/native-apis/model_8h.md b/zh-cn/application-dev/reference/native-apis/model_8h.md index cc40752409..ba5537b4b5 100644 --- a/zh-cn/application-dev/reference/native-apis/model_8h.md +++ b/zh-cn/application-dev/reference/native-apis/model_8h.md @@ -50,8 +50,8 @@ | -------- | -------- | | [OH_AI_ModelCreate](_mind_spore.md#oh_ai_modelcreate) () | 创建一个模型对象。 | | [OH_AI_ModelDestroy](_mind_spore.md#oh_ai_modeldestroy) (OH_AI_ModelHandle \*model) | 释放一个模型对象。 | -| [OH_AI_ModelBuild](_mind_spore.md#oh_ai_modelbuild) (OH_AI_ModelHandle model, const void \*model_data,
size_t data_size, OH_AI_ModelType model_type,
const OH_AI_ContextHandle model_context) | 从内存缓冲区加载并编译MindSpore模型。 | -| [OH_AI_ModelBuildFromFile](_mind_spore.md#oh_ai_modelbuildfromfile) (OH_AI_ModelHandle model,
const char \*model_path, OH_AI_ModelType model_type, const OH_AI_ContextHandle model_context) | 通过模型文件加载并编译MindSpore模型。 | +| [OH_AI_ModelBuild](_mind_spore.md#oh_ai_modelbuild) (OH_AI_ModelHandle model, const void \*model_data,
size_t data_size, OH_AI_ModelType model_type,
const OH_AI_ContextHandle model_context) | 从内存缓冲区加载并编译MindSpore模型。注意，同一个{@link OH_AI_ContextHandle}变量仅能传递给{@link OH_AI_ModelBuild}或者{@link OH_AI_ModelBuildFromFile}一次，如果多次调用该函数需要创建多个不同的{@link OH_AI_ContextHandle}。 | +| [OH_AI_ModelBuildFromFile](_mind_spore.md#oh_ai_modelbuildfromfile) (OH_AI_ModelHandle model,
const char \*model_path, OH_AI_ModelType model_type, const OH_AI_ContextHandle model_context) | 通过模型文件加载并编译MindSpore模型。注意，同一个{@link OH_AI_ContextHandle}变量仅能传递给{@link OH_AI_ModelBuild}或者{@link OH_AI_ModelBuildFromFile}一次，如果多次调用该函数需要创建多个不同的{@link OH_AI_ContextHandle}。 | | [OH_AI_ModelResize](_mind_spore.md#oh_ai_modelresize) (OH_AI_ModelHandle model, const OH_AI_TensorHandleArray inputs,
OH_AI_ShapeInfo \*shape_infos, size_t shape_info_num) | 调整已编译模型的输入形状。 | | [OH_AI_ModelPredict](_mind_spore.md#oh_ai_modelpredict) (OH_AI_ModelHandle model, const OH_AI_TensorHandleArray inputs, OH_AI_TensorHandleArray \*outputs, const OH_AI_KernelCallBack before, const OH_AI_KernelCallBack after) | 执行模型推理。 | | [OH_AI_ModelGetInputs](_mind_spore.md#oh_ai_modelgetinputs) (const OH_AI_ModelHandle model) | 获取模型的输入张量数组结构体。 | diff --git a/zh-cn/application-dev/reference/native-apis/types_8h.md b/zh-cn/application-dev/reference/native-apis/types_8h.md index f9dda2dfa2..0dc102e3aa 100644 --- a/zh-cn/application-dev/reference/native-apis/types_8h.md +++ b/zh-cn/application-dev/reference/native-apis/types_8h.md @@ -30,4 +30,4 @@ | 枚举名称 | 描述 | | -------- | -------- | | [OH_AI_ModelType](_mind_spore.md#oh_ai_modeltype) {
OH_AI_MODELTYPE_MINDIR = 0,
OH_AI_MODELTYPE_INVALID = 0xFFFFFFFF } | 模型文件的类型。 | -| [OH_AI_DeviceType](_mind_spore.md#oh_ai_devicetype) {
OH_AI_DEVICETYPE_CPU = 0,
OH_AI_DEVICETYPE_KIRIN_NPU,
OH_AI_DEVICETYPE_INVALID = 100 } | 设备类型信息，包含了目前支持的设备类型。 | +| [OH_AI_DeviceType](_mind_spore.md#oh_ai_devicetype) {
OH_AI_DEVICETYPE_CPU = 0,
OH_AI_DEVICETYPE_KIRIN_GPU,
OH_AI_DEVICETYPE_KIRIN_NPU,
OH_AI_DEVICETYPE_NNRT = 60,
OH_AI_DEVICETYPE_INVALID = 100 } | 设备类型信息，包含了目前支持的设备类型。 | -- GitLab