From a01658ebb16d50e9b783c08943c7af99d7387d72 Mon Sep 17 00:00:00 2001 From: uttarayan21 Date: Thu, 30 Jan 2025 13:05:57 +0530 Subject: [PATCH] feat: Remove -O0 and use 3.0.0 mnn --- mnn-sys/build.rs | 2 +- mnn-sys/vendor | 2 +- tools/bencher/Cargo.toml | 2 +- tools/bencher/src/main.rs | 1 + 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/mnn-sys/build.rs b/mnn-sys/build.rs index 636dc01..804377f 100644 --- a/mnn-sys/build.rs +++ b/mnn-sys/build.rs @@ -356,7 +356,7 @@ pub fn build_cmake(path: impl AsRef, install: impl AsRef) -> 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 index b03cd53..707b8a4 160000 --- a/mnn-sys/vendor +++ b/mnn-sys/vendor @@ -1 +1 @@ -Subproject commit b03cd53191c586cc94a94b76f85b904b654d8d78 +Subproject commit 707b8a41b25e3d0b7c4a39cd81109d7074ca3c28 diff --git a/tools/bencher/Cargo.toml b/tools/bencher/Cargo.toml index b38025f..c427421 100644 --- 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 index 0ec7af0..6ef2ba8 100644 --- 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(()) })?;