Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

change: liberate VOICEVOX CORE #8

Merged
merged 3 commits into from
Sep 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/environment.rs
Original file line number Diff line number Diff line change
Expand Up @@ -293,8 +293,8 @@ extern_system_fn! {
);

match severity {
// TODO: https://github.com/VOICEVOX/voicevox_project/issues/24 をやる際に、libonnxruntime側で`WARNING`未満のログを遮断する
ort_sys::OrtLoggingLevel::ORT_LOGGING_LEVEL_VERBOSE | ort_sys::OrtLoggingLevel::ORT_LOGGING_LEVEL_INFO => {}
ort_sys::OrtLoggingLevel::ORT_LOGGING_LEVEL_VERBOSE => tracing::event!(parent: &span, Level::DEBUG, "{message}"),
ort_sys::OrtLoggingLevel::ORT_LOGGING_LEVEL_INFO => tracing::event!(parent: &span, Level::INFO, "{message}"),
ort_sys::OrtLoggingLevel::ORT_LOGGING_LEVEL_WARNING => tracing::event!(parent: &span, Level::WARN, "{message}"),
ort_sys::OrtLoggingLevel::ORT_LOGGING_LEVEL_ERROR | ort_sys::OrtLoggingLevel::ORT_LOGGING_LEVEL_FATAL => {
tracing::event!(parent: &span, Level::ERROR, "{message}");
Expand Down
4 changes: 3 additions & 1 deletion src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,9 @@ pub enum Error {
#[error("Could't get device ID from memory info: {0}")]
GetDeviceId(ErrorInternal),
#[error("Training API is not enabled in this build of ONNX Runtime.")]
TrainingNotEnabled
TrainingNotEnabled,
#[error("This ONNX Runtime does not support \"vv-bin\" format (note: load/link `voicevox_onnxruntime` instead of `onnxruntime`)")]
VvBinNotSupported
}

impl Error {
Expand Down
25 changes: 23 additions & 2 deletions src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,7 @@ thread_local! {
#[cfg_attr(docsrs, doc(cfg(feature = "__init-for-voicevox")))]
#[derive(Debug)]
pub struct EnvHandle {
is_voicevox_onnxruntime: bool,
_env: std::sync::Arc<Environment>,
api: AssertSendSync<NonNull<ort_sys::OrtApi>>,
#[cfg(feature = "load-dynamic")]
Expand Down Expand Up @@ -265,7 +266,14 @@ pub fn try_init_from(filename: &std::ffi::OsStr, tp_options: Option<EnvironmentG

let _env = create_env(api.0, tp_options)?;

Ok(EnvHandle { _env, api, dylib })
let is_voicevox_onnxruntime = is_voicevox_onnxruntime(api.0);

Ok(EnvHandle {
is_voicevox_onnxruntime,
_env,
api,
dylib
})
})
}

Expand All @@ -291,7 +299,9 @@ pub fn try_init(tp_options: Option<EnvironmentGlobalThreadPoolOptions>) -> anyho

let _env = create_env(api.0, tp_options)?;

Ok(EnvHandle { _env, api })
let is_voicevox_onnxruntime = is_voicevox_onnxruntime(api.0);

Ok(EnvHandle { is_voicevox_onnxruntime, _env, api })
})
}

Expand All @@ -317,6 +327,17 @@ fn create_env(api: NonNull<ort_sys::OrtApi>, tp_options: Option<EnvironmentGloba
}
}

#[cfg(feature = "__init-for-voicevox")]
fn is_voicevox_onnxruntime(api: NonNull<ort_sys::OrtApi>) -> bool {
unsafe {
let build_info = api.as_ref().GetBuildInfoString.expect("`GetBuildInfoString` must be present")();
CStr::from_ptr(build_info)
.to_str()
.expect("should be UTF-8")
.starts_with("VOICEVOX ORT Build Info: ")
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ここの文字列、大元の方を変えた時にこっちも変えるの忘れがちになるかもですね!
可能なら定数を定義して流用するのもありかも。
まあそんなに気にしなくてもいいと思うので、とりあえずこのプルリクエストではこのままで!

}
}

pub(crate) static G_ORT_API: OnceLock<AtomicPtr<ort_sys::OrtApi>> = OnceLock::new();

/// Returns a pointer to the global [`ort_sys::OrtApi`] object.
Expand Down
9 changes: 9 additions & 0 deletions src/session/builder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,15 @@ impl SessionBuilder {
};
Ok(session)
}

#[cfg(feature = "__init-for-voicevox")]
pub fn commit_from_vv_bin(self, bin: &[u8]) -> Result<Session> {
if !crate::EnvHandle::get().expect("should be present").is_voicevox_onnxruntime {
return Err(Error::VvBinNotSupported);
}
ortsys![unsafe AddSessionConfigEntry(self.session_options_ptr.as_ptr(), c"session.use_vv_bin".as_ptr(), c"1".as_ptr())];
self.commit_from_memory(bin)
}
}

/// ONNX Runtime provides various graph optimizations to improve performance. Graph optimizations are essentially
Expand Down
Loading