Skip to content

Commit eb55c28

Browse files
zhanheng1zhanheng1
committed
Remove some internal functions used by wasi-nn from wasm_export.h
1 parent 01641bf commit eb55c28

File tree

4 files changed

+16
-142
lines changed

4 files changed

+16
-142
lines changed

‎core/iwasm/common/wasm_runtime_common.c‎

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -8179,77 +8179,3 @@ wasm_runtime_check_and_update_last_used_shared_heap(
81798179
return false;
81808180
}
81818181
#endif
8182-
8183-
#if WASM_ENABLE_WASI_NN != 0 || WASM_ENABLE_WASI_EPHEMERAL_NN != 0
8184-
8185-
uint32_t
8186-
wasm_runtime_get_wasi_nn_registry_ngraphs(
8187-
WASINNRegistry *wasi_nn_registry)
8188-
{
8189-
if (wasi_nn_registry)
8190-
return wasi_nn_registry->n_graphs;
8191-
8192-
return -1;
8193-
}
8194-
8195-
char *
8196-
wasm_runtime_get_wasi_nn_registry_model_names_i(
8197-
WASINNRegistry *wasi_nn_registry, uint32_t idx)
8198-
{
8199-
if (wasi_nn_registry && (idx < wasi_nn_registry->n_graphs))
8200-
return wasi_nn_registry->model_names[idx];
8201-
8202-
return NULL;
8203-
}
8204-
8205-
char *
8206-
wasm_runtime_get_wasi_nn_registry_graph_paths_i(
8207-
WASINNRegistry *wasi_nn_registry, uint32_t idx)
8208-
{
8209-
if (wasi_nn_registry && (idx < wasi_nn_registry->n_graphs))
8210-
return wasi_nn_registry->graph_paths[idx];
8211-
8212-
return NULL;
8213-
}
8214-
8215-
uint32_t
8216-
wasm_runtime_get_wasi_nn_registry_loaded_i(
8217-
WASINNRegistry *wasi_nn_registry, uint32_t idx)
8218-
{
8219-
if (wasi_nn_registry && (idx < wasi_nn_registry->n_graphs))
8220-
return wasi_nn_registry->loaded[idx];
8221-
8222-
return -1;
8223-
}
8224-
8225-
uint32_t
8226-
wasm_runtime_set_wasi_nn_registry_loaded_i(
8227-
WASINNRegistry *wasi_nn_registry, uint32_t idx, uint32_t value)
8228-
{
8229-
if (wasi_nn_registry && (idx < wasi_nn_registry->n_graphs))
8230-
wasi_nn_registry->loaded[idx] = value;
8231-
8232-
return 0;
8233-
}
8234-
8235-
char *
8236-
wasm_runtime_get_wasi_nn_registry_encoding_i(
8237-
WASINNRegistry *wasi_nn_registry, uint32_t idx)
8238-
{
8239-
if (wasi_nn_registry && (idx < wasi_nn_registry->n_graphs))
8240-
return wasi_nn_registry->encoding[idx];
8241-
8242-
return NULL;
8243-
}
8244-
8245-
char *
8246-
wasm_runtime_get_wasi_nn_registry_target_i(
8247-
WASINNRegistry *wasi_nn_registry, uint32_t idx)
8248-
{
8249-
if (wasi_nn_registry && (idx < wasi_nn_registry->n_graphs))
8250-
return wasi_nn_registry->target[idx];
8251-
8252-
return NULL;
8253-
}
8254-
8255-
#endif

‎core/iwasm/common/wasm_runtime_common.h‎

Lines changed: 0 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1473,34 +1473,6 @@ wasm_runtime_get_wasi_nn_registry(WASMModuleInstanceCommon *module_inst_comm);
14731473
WASM_RUNTIME_API_EXTERN void
14741474
wasm_runtime_set_wasi_nn_registry(WASMModuleInstanceCommon *module_inst_comm,
14751475
WASINNRegistry *wasi_nn_ctx);
1476-
1477-
WASM_RUNTIME_API_EXTERN uint32_t
1478-
wasm_runtime_get_wasi_nn_registry_ngraphs(
1479-
WASINNRegistry *wasi_nn_registry);
1480-
1481-
WASM_RUNTIME_API_EXTERN char *
1482-
wasm_runtime_get_wasi_nn_registry_model_names_i(
1483-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
1484-
1485-
WASM_RUNTIME_API_EXTERN char *
1486-
wasm_runtime_get_wasi_nn_registry_graph_paths_i(
1487-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
1488-
1489-
WASM_RUNTIME_API_EXTERN uint32_t
1490-
wasm_runtime_get_wasi_nn_registry_loaded_i(
1491-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
1492-
1493-
WASM_RUNTIME_API_EXTERN uint32_t
1494-
wasm_runtime_set_wasi_nn_registry_loaded_i(
1495-
WASINNRegistry *wasi_nn_registry, uint32_t idx, uint32_t value);
1496-
1497-
WASM_RUNTIME_API_EXTERN char *
1498-
wasm_runtime_get_wasi_nn_registry_encoding_i(
1499-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
1500-
1501-
WASM_RUNTIME_API_EXTERN char *
1502-
wasm_runtime_get_wasi_nn_registry_target_i(
1503-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
15041476
#endif
15051477

15061478
#ifdef __cplusplus

‎core/iwasm/include/wasm_export.h‎

Lines changed: 8 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -797,36 +797,18 @@ wasm_runtime_instantiation_args_set_wasi_ns_lookup_pool(
797797
struct InstantiationArgs2 *p, const char *ns_lookup_pool[],
798798
uint32_t ns_lookup_pool_size);
799799

800-
WASM_RUNTIME_API_EXTERN WASINNRegistry *
800+
WASM_RUNTIME_API_EXTERN struct WASINNRegistry *
801801
wasm_runtime_get_wasi_nn_registry(const wasm_module_inst_t module_inst);
802802

803-
WASM_RUNTIME_API_EXTERN uint32_t
804-
wasm_runtime_get_wasi_nn_registry_ngraphs(
805-
WASINNRegistry *wasi_nn_registry);
806-
807-
WASM_RUNTIME_API_EXTERN char *
808-
wasm_runtime_get_wasi_nn_registry_model_names_i(
809-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
810-
811-
WASM_RUNTIME_API_EXTERN char *
812-
wasm_runtime_get_wasi_nn_registry_graph_paths_i(
813-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
814-
815-
WASM_RUNTIME_API_EXTERN uint32_t
816-
wasm_runtime_get_wasi_nn_registry_loaded_i(
817-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
818-
819-
WASM_RUNTIME_API_EXTERN uint32_t
820-
wasm_runtime_set_wasi_nn_registry_loaded_i(
821-
WASINNRegistry *wasi_nn_registry, uint32_t idx, uint32_t value);
803+
WASM_RUNTIME_API_EXTERN void
804+
wasm_runtime_set_wasi_nn_registry(wasm_module_inst_t module_inst,
805+
struct WASINNRegistry *wasi_ctx);
822806

823-
WASM_RUNTIME_API_EXTERN char *
824-
wasm_runtime_get_wasi_nn_registry_encoding_i(
825-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
807+
WASM_RUNTIME_API_EXTERN int
808+
wasm_runtime_wasi_nn_registry_create(struct WASINNRegistry **registryp);
826809

827-
WASM_RUNTIME_API_EXTERN char *
828-
wasm_runtime_get_wasi_nn_registry_target_i(
829-
WASINNRegistry *wasi_nn_registry, uint32_t idx);
810+
WASM_RUNTIME_API_EXTERN void
811+
wasm_runtime_wasi_nn_registry_destroy(struct WASINNRegistry *registry);
830812

831813
/**
832814
* Instantiate a WASM module, with specified instantiation arguments

‎core/iwasm/libraries/wasi-nn/src/wasi_nn.c‎

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
#include "bh_platform.h"
2020
#include "wasi_nn_types.h"
2121
#include "wasm_export.h"
22+
#include "wasm_runtime_common.h"
2223

2324
#if WASM_ENABLE_WASI_EPHEMERAL_NN == 0
2425
#warning You are using "wasi_nn", which is a legacy WAMR-specific ABI. It is deperecated and will likely be removed in future versions of WAMR. Please use "wasi_ephemeral_nn" instead. (For a WASM module, use the wasi_ephemeral_nn.h header instead. For the runtime configurations, enable WASM_ENABLE_WASI_EPHEMERAL_NN/WAMR_BUILD_WASI_EPHEMERAL_NN.)
@@ -618,27 +619,21 @@ wasi_nn_load_by_name(wasm_exec_env_t exec_env, char *name, uint32_t name_len,
618619
bool is_loaded = false;
619620
uint32 model_idx = 0;
620621
uint32_t global_n_graphs =
621-
wasm_runtime_get_wasi_nn_registry_ngraphs(wasi_nn_registry);
622+
wasi_nn_registry->n_graphs;
622623
for (model_idx = 0; model_idx < global_n_graphs; model_idx++) {
623-
char *model_name = wasm_runtime_get_wasi_nn_registry_model_names_i(
624-
wasi_nn_registry, model_idx);
624+
char *model_name = wasi_nn_registry->model_names[model_idx];
625625

626626
if (model_name && strcmp(nul_terminated_name, model_name) != 0) {
627627
continue;
628628
}
629629

630-
is_loaded = wasm_runtime_get_wasi_nn_registry_loaded_i(
631-
wasi_nn_registry, model_idx);
632-
char *global_model_path_i =
633-
wasm_runtime_get_wasi_nn_registry_graph_paths_i(
634-
wasi_nn_registry, model_idx);
630+
is_loaded = wasi_nn_registry->loaded[model_idx];
631+
char *global_model_path_i = wasi_nn_registry->graph_paths[model_idx];
635632

636633
graph_encoding encoding =
637-
str2encoding(wasm_runtime_get_wasi_nn_registry_encoding_i(
638-
wasi_nn_registry, model_idx));
634+
str2encoding(wasi_nn_registry->encoding[model_idx]);
639635
execution_target target =
640-
str2target(wasm_runtime_get_wasi_nn_registry_target_i(
641-
wasi_nn_registry, model_idx));
636+
str2target(wasi_nn_registry->target[model_idx]);
642637

643638
// res = ensure_backend(instance, autodetect, wasi_nn_ctx);
644639
res = ensure_backend(instance, encoding, wasi_nn_ctx);
@@ -655,8 +650,7 @@ wasi_nn_load_by_name(wasm_exec_env_t exec_env, char *name, uint32_t name_len,
655650
if (res != success)
656651
goto fail;
657652

658-
wasm_runtime_set_wasi_nn_registry_loaded_i(wasi_nn_registry,
659-
model_idx, 1);
653+
wasi_nn_registry->loaded[model_idx] = 1;
660654
res = success;
661655
break;
662656
}

0 commit comments

Comments
 (0)