Remove internal function declarations from wasm_export.h

Author: zhanheng1

core/iwasm/common/wasm_runtime_common.c

@@ -1697,7 +1697,7 @@ wasm_runtime_instantiation_args_destroy(struct InstantiationArgs2 *p)
 }
 
 #if WASM_ENABLE_WASI_NN != 0 || WASM_ENABLE_WASI_EPHEMERAL_NN != 0
-WASINNArguments;
+typedef struct WASINNArguments WASINNArguments;
 
 void
 wasm_runtime_wasi_nn_graph_registry_args_set_defaults(WASINNArguments *args)

core/iwasm/common/wasm_runtime_common.h

@@ -1483,6 +1483,13 @@ WASM_RUNTIME_API_EXTERN void
 wasm_runtime_set_wasi_nn_global_ctx(WASMModuleInstanceCommon *module_inst,
                                     WASINNGlobalContext *wasi_ctx);
 
+WASM_RUNTIME_API_EXTERN WASINNGlobalContext *
+wasm_runtime_get_wasi_nn_global_ctx(WASMModuleInstanceCommon *module_inst_comm);
+
+WASM_RUNTIME_API_EXTERN void
+wasm_runtime_set_wasi_nn_global_ctx(WASMModuleInstanceCommon *module_inst_comm,
+                                    WASINNGlobalContext *wasi_nn_ctx);
+
 WASM_RUNTIME_API_EXTERN uint32_t
 wasm_runtime_get_wasi_nn_global_ctx_ngraphs(
     WASINNGlobalContext *wasi_nn_global_ctx);

core/iwasm/include/wasm_export.h

@@ -291,7 +291,7 @@ typedef struct InstantiationArgs {
 
 struct InstantiationArgs2;
 struct WASINNGlobalContext;
-typedef struct WASINNGlobalContext *wasi_nn_global_context;
+typedef struct WASINNGlobalContext WASINNGlobalContext;
 
 #ifndef WASM_VALKIND_T_DEFINED
 #define WASM_VALKIND_T_DEFINED
@@ -798,46 +798,32 @@ wasm_runtime_instantiation_args_set_wasi_ns_lookup_pool(
     struct InstantiationArgs2 *p, const char *ns_lookup_pool[],
     uint32_t ns_lookup_pool_size);
 
-WASM_RUNTIME_API_EXTERN bool
-wasm_runtime_init_wasi_nn_global_ctx(wasm_module_inst_t module_inst,
-                                     const char *encoding, const char *target,
-                                     const uint32_t n_graphs,
-                                     char *graph_paths[], char *error_buf,
-                                     uint32_t error_buf_size);
-
-WASM_RUNTIME_API_EXTERN void
-wasm_runtime_destroy_wasi_nn_global_ctx(wasm_module_inst_t module_inst);
-
-WASM_RUNTIME_API_EXTERN void
-wasm_runtime_set_wasi_nn_global_ctx(wasm_module_inst_t module_inst,
-                                    wasi_nn_global_context wasi_ctx);
-
-WASM_RUNTIME_API_EXTERN wasi_nn_global_context
+WASM_RUNTIME_API_EXTERN WASINNGlobalContext *
 wasm_runtime_get_wasi_nn_global_ctx(const wasm_module_inst_t module_inst);
 
 WASM_RUNTIME_API_EXTERN uint32_t
 wasm_runtime_get_wasi_nn_global_ctx_ngraphs(
-    wasi_nn_global_context wasi_nn_global_ctx);
+    WASINNGlobalContext * wasi_nn_global_ctx);
 
 WASM_RUNTIME_API_EXTERN char *
 wasm_runtime_get_wasi_nn_global_ctx_graph_paths_i(
-    wasi_nn_global_context wasi_nn_global_ctx, uint32_t idx);
+    WASINNGlobalContext * wasi_nn_global_ctx, uint32_t idx);
 
 WASM_RUNTIME_API_EXTERN uint32_t
 wasm_runtime_get_wasi_nn_global_ctx_loaded_i(
-    wasi_nn_global_context wasi_nn_global_ctx, uint32_t idx);
+    WASINNGlobalContext * wasi_nn_global_ctx, uint32_t idx);
 
 WASM_RUNTIME_API_EXTERN uint32_t
 wasm_runtime_set_wasi_nn_global_ctx_loaded_i(
-    wasi_nn_global_context wasi_nn_global_ctx, uint32_t idx, uint32_t value);
+    WASINNGlobalContext * wasi_nn_global_ctx, uint32_t idx, uint32_t value);
 
 WASM_RUNTIME_API_EXTERN char *
 wasm_runtime_get_wasi_nn_global_ctx_encoding(
-    wasi_nn_global_context wasi_nn_global_ctx);
+    WASINNGlobalContext * wasi_nn_global_ctx);
 
 WASM_RUNTIME_API_EXTERN char *
 wasm_runtime_get_wasi_nn_global_ctx_target(
-    wasi_nn_global_context wasi_nn_global_ctx);
+    WASINNGlobalContext * wasi_nn_global_ctx);
 
 /**
  * Instantiate a WASM module, with specified instantiation arguments

core/iwasm/libraries/wasi-nn/include/wasi_nn_types.h

@@ -48,7 +48,6 @@ typedef enum {
     WASI_NN_ERROR_NAME(unsupported_operation),
     WASI_NN_ERROR_NAME(too_large),
     WASI_NN_ERROR_NAME(not_found),
-    WASI_NN_ERROR_NAME(not_loaded),
 
     // for WasmEdge-wasi-nn
     WASI_NN_ERROR_NAME(end_of_sequence) = 100,  // End of Sequence Found.

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

@@ -607,7 +607,7 @@ wasi_nn_load_by_name(wasm_exec_env_t exec_env, char *name, uint32_t name_len,
         goto fail;
     }
 
-    wasi_nn_global_context wasi_nn_global_ctx =
+    WASINNGlobalContext *wasi_nn_global_ctx =
         wasm_runtime_get_wasi_nn_global_ctx(instance);
     if (!wasi_nn_global_ctx) {
         NN_ERR_PRINTF("global context is invalid");
@@ -691,7 +691,7 @@ wasi_nn_load_by_name(wasm_exec_env_t exec_env, char *name, uint32_t name_len,
             NN_ERR_PRINTF("Model %s is not loaded, you should pass its path "
                           "through --wasi-nn-graph",
                           nul_terminated_name);
-            res = not_loaded;
+            res = not_found;
         }
         goto fail;
     }

core/iwasm/libraries/wasi-nn/test/utils.c

@@ -146,7 +146,7 @@ run_inference(float *input, uint32_t *input_size, uint32_t *output_size,
 
     WASI_NN_ERROR_TYPE res = wasm_load_by_name(model_name, &graph);
 
-    if (res == WASI_NN_ERROR_NAME(not_loaded)) {
+    if (res == WASI_NN_ERROR_NAME(not_found)) {
         NN_INFO_PRINTF("Model %s is not loaded, you should pass its path "
                        "through --wasi-nn-graph",
                        model_name);