gnh1201/wasm-micro-runtime
1
0
Fork 0
mirror of https://github.com/bytecodealliance/wasm-micro-runtime.git synced 2025-06-07 21:59:16 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

fix wasi-nn abi definitions (#4307)

Browse Source 
sync with a more appropriate version of the definitions.

as we use the "wasi_ephemeral_nn", which is p1-based, it seems
more appropriate to use definitions from witx, not wit.

it's a bit unfortunate p2-based wasi-nn made gratuitous changes
like this from p1.

note: this is an ABI change.
This commit is contained in:
YAMAMOTO Takashi 2025-06-03 14:22:48 +09:00 committed by GitHub
parent 16c46751ac
commit ae6e490ad5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 8 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/iwasm/libraries/wasi-nn/README.md
View File

@ -37,7 +37,7 @@ There is a big difference between the two sets of functions, `tensor_type`.
```c ```c
#if WASM_ENABLE_WASI_EPHEMERAL_NN != 0 #if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
typedef enum { fp16 = 0, fp32, fp64, bf16, u8, i32, i64 } tensor_type; typedef enum { fp16 = 0, fp32, fp64, u8, i32, i64 } tensor_type;
#else #else
typedef enum { fp16 = 0, fp32, up8, ip32 } tensor_type; typedef enum { fp16 = 0, fp32, up8, ip32 } tensor_type;
#endif /* WASM_ENABLE_WASI_EPHEMERAL_NN != 0 */ #endif /* WASM_ENABLE_WASI_EPHEMERAL_NN != 0 */

25
core/iwasm/libraries/wasi-nn/include/wasi_nn_types.h
View File

@ -19,30 +19,19 @@ extern "C" {
*/ */
// sync up with // sync up with
// https://github.com/WebAssembly/wasi-nn/blob/main/wit/wasi-nn.wit#L136 Error // https://github.com/WebAssembly/wasi-nn/blob/71320d95b8c6d43f9af7f44e18b1839db85d89b4/wasi-nn.witx#L5-L17
// codes returned by functions in this API. // Error codes returned by functions in this API.
typedef enum { typedef enum {
// No error occurred.
success = 0, success = 0,
// Caller module passed an invalid argument.
invalid_argument, invalid_argument,
// Invalid encoding.
invalid_encoding, invalid_encoding,
// The operation timed out. missing_memory,
timeout, busy,
// Runtime Error.
runtime_error, runtime_error,
// Unsupported operation.
unsupported_operation, unsupported_operation,
// Graph is too large.
too_large, too_large,
// Graph not found.
not_found, not_found,
// The operation is insecure or has insufficient privilege to be performed.
// e.g., cannot access a hardware feature requested
security,
// The operation failed for an unspecified reason.
unknown,
// for WasmEdge-wasi-nn // for WasmEdge-wasi-nn
end_of_sequence = 100, // End of Sequence Found. end_of_sequence = 100, // End of Sequence Found.
context_full = 101, // Context Full. context_full = 101, // Context Full.
@ -66,9 +55,9 @@ typedef struct {
#if WASM_ENABLE_WASI_EPHEMERAL_NN != 0 #if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
// sync up with // sync up with
// https://github.com/WebAssembly/wasi-nn/blob/main/wit/wasi-nn.wit#L27 // https://github.com/WebAssembly/wasi-nn/blob/71320d95b8c6d43f9af7f44e18b1839db85d89b4/wasi-nn.witx#L19-L28
// The type of the elements in a tensor. // The type of the elements in a tensor.
typedef enum { fp16 = 0, fp32, fp64, bf16, u8, i32, i64 } tensor_type; typedef enum { fp16 = 0, fp32, fp64, u8, i32, i64 } tensor_type;
#else #else
typedef enum { fp16 = 0, fp32, up8, ip32 } tensor_type; typedef enum { fp16 = 0, fp32, up8, ip32 } tensor_type;
#endif /* WASM_ENABLE_WASI_EPHEMERAL_NN != 0 */ #endif /* WASM_ENABLE_WASI_EPHEMERAL_NN != 0 */

2
core/iwasm/libraries/wasi-nn/src/wasi_nn_openvino.c
View File

@ -161,8 +161,6 @@ wasi_nn_tensor_type_to_openvino_element_type(tensor_type wasi_nn_type)
#if WASM_ENABLE_WASI_EPHEMERAL_NN != 0 #if WASM_ENABLE_WASI_EPHEMERAL_NN != 0
case fp64: case fp64:
return F64; return F64;
case bf16:
return BF16;
case i64: case i64:
return I64; return I64;
case u8: case u8: