feat(mnn): Use generated bindings for SessionInfoCode instead of hard…

…-coding

mnn-sys/build.rs

@@ -122,6 +122,7 @@ fn main() -> Result<()> {
     mnn_c_build(PathBuf::from(MANIFEST_DIR).join("mnn_c"), &vendor)
         .with_context(|| "Failed to build mnn_c")?;
     mnn_c_bindgen(&vendor, &out_dir).with_context(|| "Failed to generate mnn_c bindings")?;
+    mnn_cpp_bindgen(&vendor, &out_dir).with_context(|| "Failed to generate mnn_cpp bindings")?;
     println!("cargo:include={vendor}/include", vendor = vendor.display());
     if *TARGET_OS == "macos" {
         #[cfg(feature = "metal")]
@@ -225,6 +226,36 @@ pub fn mnn_c_bindgen(vendor: impl AsRef<Path>, out: impl AsRef<Path>) -> Result<
     Ok(())
 }
 
+pub fn mnn_cpp_bindgen(vendor: impl AsRef<Path>, out: impl AsRef<Path>) -> Result<()> {
+    let vendor = vendor.as_ref();
+    let bindings = bindgen::Builder::default()
+        .clang_args(["-x", "c++"])
+        .clang_args(["-std=c++11"])
+        .clang_arg(CxxOption::VULKAN.cxx())
+        .clang_arg(CxxOption::METAL.cxx())
+        .clang_arg(CxxOption::COREML.cxx())
+        .clang_arg(CxxOption::OPENCL.cxx())
+        .clang_arg(format!("-I{}", vendor.join("include").to_string_lossy()))
+        .generate_cstr(true)
+        .generate_inline_functions(true)
+        .size_t_is_usize(true)
+        .emit_diagnostics()
+        .ctypes_prefix("core::ffi")
+        .header(
+            vendor
+                .join("include")
+                .join("MNN")
+                .join("Interpreter.hpp")
+                .to_string_lossy(),
+        )
+        .allowlist_item(".*SessionInfoCode.*");
+    // let cmd = bindings.command_line_flags().join(" ");
+    // println!("cargo:warn=bindgen: {}", cmd);
+    let bindings = bindings.generate()?;
+    bindings.write_to_file(out.as_ref().join("mnn_cpp.rs"))?;
+    Ok(())
+}
+
 pub fn mnn_c_build(path: impl AsRef<Path>, vendor: impl AsRef<Path>) -> Result<()> {
     let mnn_c = path.as_ref();
     let files = mnn_c.read_dir()?.flatten().map(|e| e.path()).filter(|e| {

mnn-sys/src/lib.rs

@@ -1,5 +1,11 @@
 use std::ffi::CStr;
 
+pub mod cpp {
+    #![allow(non_upper_case_globals)]
+    #![allow(non_camel_case_types)]
+    #![allow(non_snake_case)]
+    include!(concat!(env!("OUT_DIR"), "/mnn_cpp.rs"));
+}
 mod sys {
     #![allow(non_upper_case_globals)]
     #![allow(non_camel_case_types)]

src/interpreter.rs

@@ -526,7 +526,12 @@ impl Interpreter {
         let mut memory = 0f32;
         let memory_ptr = &mut memory as *mut f32;
         let ret = unsafe {
-            mnn_sys::Interpreter_getSessionInfo(self.inner, session.inner, 0, memory_ptr.cast())
+            mnn_sys::Interpreter_getSessionInfo(
+                self.inner,
+                session.inner,
+                mnn_sys::cpp::MNN_Interpreter_SessionInfoCode_MEMORY as _,
+                memory_ptr.cast(),
+            )
         };
         ensure!(
             ret == 1,
@@ -544,7 +549,7 @@ impl Interpreter {
             mnn_sys::Interpreter_getSessionInfo(
                 self.inner,
                 session.inner,
-                1,
+                mnn_sys::cpp::MNN_Interpreter_SessionInfoCode_FLOPS as _,
                 flop_ptr.cast::<libc::c_void>(),
             )
         };
@@ -560,7 +565,12 @@ impl Interpreter {
         let mut resize_status = 0i32;
         let ptr = &mut resize_status as *mut i32;
         let ret = unsafe {
-            mnn_sys::Interpreter_getSessionInfo(self.inner, session.inner, 3, ptr.cast())
+            mnn_sys::Interpreter_getSessionInfo(
+                self.inner,
+                session.inner,
+                mnn_sys::cpp::MNN_Interpreter_SessionInfoCode_RESIZE_STATUS as _,
+                ptr.cast(),
+            )
         };
         ensure!(
         ret == 1,