feat: Remove -O0 and use 3.0.0 mnn

aftershootco · Jan 30, 2025 · a01658e · a01658e
1 parent 6e104bb
commit a01658e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 3 deletions.
diff --git a/mnn-sys/build.rs b/mnn-sys/build.rs
@@ -356,7 +356,7 @@ pub fn build_cmake(path: impl AsRef<Path>, install: impl AsRef<Path>) -> Result<
             config.define("MNN_COREML", CxxOption::COREML.cmake_value());
             config.define("MNN_OPENCL", CxxOption::OPENCL.cmake_value());
             config.define("MNN_OPENGL", CxxOption::OPENGL.cmake_value());
-            config.define("CMAKE_CXX_FLAGS", "-O0");
+            // config.define("CMAKE_CXX_FLAGS", "-O0");
             // #[cfg(windows)]
             if *TARGET_OS == "windows" {
                 config.define("CMAKE_CXX_FLAGS", "-DWIN32=1");

diff --git a/mnn-sys/vendor b/mnn-sys/vendor
diff --git a/tools/bencher/Cargo.toml b/tools/bencher/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2021"
 license.workspace = true
 
 [target."aarch64-apple-darwin".dependencies]
-mnn = { workspace = true, features = ["opencl", "serde", "metal"] }
+mnn = { workspace = true, features = ["opencl", "serde", "metal", "coreml"] }
 
 [target."x86_64-apple-darwin".dependencies]
 mnn = { workspace = true, features = ["opencl", "serde"] }

diff --git a/tools/bencher/src/main.rs b/tools/bencher/src/main.rs
@@ -598,6 +598,7 @@ pub fn bench(
             bar.set_message(format!("Running inference {c}"));
             not_terminal.then(|| eprintln!("Running inference {c}"));
             net.run_session(&session).cc(BenchError)?;
+            net.wait(&session);
         }
         Ok(())
     })?;