Merge v2.0.0-rc.4, keeping ONNX Runtime v1.17 #7

qryxip · 2024-08-15T11:25:11Z

内容

スクリーンショット・動画など

その他

still need constant inputs and functions for getting I/O lengths & names from indexes

This reverts commit fd41c8f.

Co-authored-by: Florian Kasischke <florian.kasischke@helsing.ai>

aka The Cleanening, part 2 - Add clearer documentation and examples for more things. - Rework string tensors by introducing `PrimitiveTensorElementType` for primitive (i.e. f32) types, and again re-implementing `IntoTensorElementType` for `String`. This allows string tensors to be used via `Tensor<String>` instead of exclusively via `DynTensor`. Additionally, string tensors no longer require an `Allocator` to be created (which didn't make sense, since string data in Rust can only ever be stored on the CPU anyway). This also now applies to `Map`s, since their data also needed to be on the CPU anyway. (`Sequence`s are currently unaffected because I think a custom allocator could be useful for them?) - Rework the `IoBinding` interface, and add an example clarifying the intended usage of it (ref pykeio#209). Thanks to AAce from the pyke Discord for pointing out the mutability issue in the old interface, which should be addressed now. - Refactor `OperatorDomain::add` from the slightly-nicer-looking-but-more-confusing `fn<T>(t: T)` to just `fn<T>()` to further enforce the fact that `Operator`s are zero-sized. - Maps can now have `String` keys. - Remove some unused errors.

Fixes pykeio#214.

This whole thing where usize != size_t specifically on aarch64 is so bad.

when auto-importing, rust-analyzer seems to only do absolute imports on odd-numbered days and Tuesdays, falling back to crate:: imports otherwise. this commit adds some consistency.

pykeio#227

…sorRT EP. ref pykeio#236

qryxip

ONNX Runtime v1.17（というよりONNX v1.15）を使い続けなければならない事情が出てきたため、17のAPIを使い続けるようにしました。

このPRで行った変更に対する補足をレビューコメントとして残します。あとPRのdiffとしては出ませんが、次のONNX Runtime C APIの利用を削りました。

OrtROCMProviderOptions::enable_hip_graph
(ユーザーから指定できるパラメータの一つとして)
OrtCustomOp::{GetMayInplace,ReleaseMayInplace,GetAliasMap,ReleaseAliasMap}
(NULLを入れてるだけ)

qryxip · 2024-08-16T15:09:07Z

.github/workflows/code-quality.yml

-        run: cargo clippy -p voicevox-ort --all-targets --workspace --features fetch-models
+        run: cargo clippy -p voicevox-ort --all-targets --features fetch-models


ort-sys/src/lib.rsをv2.0.0-rc.2時点に留めていることで pykeio#202 で追加されたtraining機能のコンパイルが通らなくなっているため、examples/trainingをClippyの対象から外す。

APIの辻褄合わせはできるだろうが、我々が使わないであろうtraining機能を維持するよりは捨てる方向にした方がよいと思った。

賛成です！

乖離しすぎるとそれはそれで追従が大変になってくるので、もしそうだったら再考してもいいかも。

qryxip · 2024-08-16T15:12:29Z

ort-sys/build.rs

-				"cu12" // ビルド環境に何がインストールされていようが、常にCUDA 12を使う
+				"cu12+cudnn8" // ビルド環境に何がインストールされていようが、常にCUDA 12とcuDNN 8を使う


cuDNN 9の方を使うことはないので、もしかしたら識別子はcu12のままでもよいかも？

ちゃんとわかってないけど、元のから差分が少ない形に保っておくと追従しやすいかも？
元のにcudnnに関しての記載がないなら、記載ない方が揃いそう。
でも把握しきれるならどちらでも･･･！！

正直pykeio側とのdiff的には変わらないので、v2.0.0-rc.4の方の記述に合わせるといった見方もできると思います。なので+cudnn8でも…?

qryxip · 2024-08-16T15:21:03Z

src/execution_providers/mod.rs

-pub trait ExecutionProvider {
+pub trait ExecutionProvider: Sync + Send {


v2.0.0-rc.4ではExecutionProviderDispatchがenumからArc<dyn ExecutionProvider>のラッパー構造体に変わったため、Environmentも!Syndで!Sinkになってしまっている。pykeio/ortとしては特に困ることはないだろうが、我々としては困る。

最小の変更でなんとかするにはExecutionProvider自体を: Sync + Sendにするのがベストと判断。

qryxip · 2024-08-16T15:24:18Z

ort-sys/build.rs

-				"rocm"
-			} else {
-				"none"
-			};
-			let _ = designator; // 上記のものを無視する
-			let designator = if cfg!(feature = "directml") {
+				feature_set.push("rocm");
+			}
+			let feature_set = if !feature_set.is_empty() { feature_set.join(",") } else { "none".to_owned() };
+			let _ = feature_set; // 上記のものを無視する
+			let feature_set = if cfg!(feature = "directml") {


変数名が変更されている (designator → feature_set)

qryxip · 2024-08-16T15:31:23Z

src/lib.rs

-	let mut env = EnvironmentBuilder::default().with_name(env!("CARGO_PKG_NAME"));
+	let mut env = EnvironmentBuilder::new().with_name(env!("CARGO_PKG_NAME"));


pykeio@c64b8eaで行われた変更に追従。

Hiroshiba

LGTM！！

1箇所変更が生じるかもしれないコメントをしたので、そちらだけお待ちします！

📝 squashをff mergeにしてからマージ

Hiroshiba · 2024-08-17T12:45:29Z

マージします！

decahedron1 and others added 30 commits April 27, 2024 17:46

examples(webassembly): use MNIST as test model

05bc4fb

fix: stub c++ exception handling for wasm

8ae23f2

chore(sys): update WASM build

80be206

docs: update readme

9b8bdf9

feat: direct downcasts of ValueRef & ValueRefMut

1c0a5e4

feat: implement more kernel attribute types

1d8b815

still need constant inputs and functions for getting I/O lengths & names from indexes

fix: kernel array attribute size type

076ddf4

fix: exclude null byte in string kernel attribute extraction

ba0867d

fix: bad cfg values

9c80410

chore: remove old widestring error

58ba991

feat: add telemetry option to environment builder, closes pykeio#203

ce5aaba

chore: update ONNX Runtime to v1.18.0

17b4170

fix(sys): update API to 1.18

943a797

ci(test): run wasm test with --debug

fd41c8f

Revert "ci(test): run wasm test with --debug"

9a7f046

This reverts commit fd41c8f.

fix(wasm): disable image::load_from_memory

9453d04

fix(wasm): update artifact

eb0f402

ci(test): run if examples or dist.txt changed

721bf00

fix(sys): update windows artifacts to include DirectML again

5dce2c2

feat(sys): support pkg-config

1d89f82

Co-authored-by: Florian Kasischke <florian.kasischke@helsing.ai>

docs: nuke mintlify

b00c934

config: add python venv to gitignore

812fdb0

feat: option to error out session builder if EP registration fails

23fce78

fix(sys): enable SOCKS proxy support, closes pykeio#210

a92dd30

feat: MIGraphX execution provider, ref pykeio#212

19d66de

fix: bundle libonnxruntime in rlib/staticlib builds (pykeio#215)

882f657

Fixes pykeio#214.

fix: ARM build

668260c

This whole thing where usize != size_t specifically on aarch64 is so bad.

fix: i686-pc-windows-msvc build (pykeio#218)

860e449

refactor: take RunOptions by reference, add run_async_with_options

d59ac43

decahedron1 and others added 18 commits June 30, 2024 13:11

chore: update to ONNX Runtime v1.18.1

8f8bbfb

refactor: simplify run_async

e1d77b4

refactor: simplify logging function

920cee9

chore: remove unused imports

3b93e73

refactor: typestate for RunOptions that have selected outputs

a127d0f

chore: more readable imports

dc79ade

when auto-importing, rust-analyzer seems to only do absolute imports on odd-numbered days and Tuesdays, falling back to crate:: imports otherwise. this commit adds some consistency.

feat: most missing custom operator methods

b69f41d

fix arm build

e59d0c7

fix(sys): only link nsync if required, closes pykeio#223

66b0cb2

docs: Add Magika to projects using ort (pykeio#224)

bf10c18

fix: TVM EP register function definition for non-load-dynamic, closes

1bff72d

pykeio#227

fix: link missing absl libraries, closes pykeio#228

0407adb

feat: training (pykeio#202)

0a43482

2.0.0-rc.3

3dec017

fix(sys): more robust CUDA version check. fixes pykeio#234

bb57252

fix: create an environment if one does not exist when registering Ten…

b2f4e1f

…sorRT EP. ref pykeio#236

feat(sys): CUDA 12 + cuDNN 8 builds, ref pykeio#235

bc764d3

2.0.0-rc.4

04da381

qryxip force-pushed the merge-v2.0.0-rc.4 branch 2 times, most recently from f532a7a to b5350a7 Compare August 16, 2024 14:55

qryxip changed the title ~~Merge v2.0.0-rc.4~~ Merge v2.0.0-rc.4, keeping ONNX Runtime v1.17 Aug 16, 2024

qryxip marked this pull request as ready for review August 16, 2024 14:56

Merge tag 'v2.0.0-rc.4' into HEAD

45785b9

qryxip force-pushed the merge-v2.0.0-rc.4 branch from b5350a7 to 45785b9 Compare August 16, 2024 15:00

qryxip commented Aug 16, 2024

View reviewed changes

qryxip requested a review from Hiroshiba August 16, 2024 15:40

Hiroshiba approved these changes Aug 16, 2024

View reviewed changes

Hiroshiba merged commit 8627833 into VOICEVOX:main Aug 17, 2024
7 checks passed

qryxip mentioned this pull request Aug 17, 2024

update: ortを更新 VOICEVOX/voicevox_core#822

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Merge v2.0.0-rc.4, keeping ONNX Runtime v1.17 #7

Merge v2.0.0-rc.4, keeping ONNX Runtime v1.17 #7

qryxip commented Aug 15, 2024

qryxip left a comment •

edited

Loading

qryxip Aug 16, 2024

Hiroshiba Aug 16, 2024

qryxip Aug 16, 2024

Hiroshiba Aug 16, 2024

qryxip Aug 16, 2024

qryxip Aug 16, 2024

qryxip Aug 16, 2024

qryxip Aug 16, 2024

Hiroshiba left a comment

Hiroshiba commented Aug 17, 2024

		run: cargo clippy -p voicevox-ort --all-targets --workspace --features fetch-models
		run: cargo clippy -p voicevox-ort --all-targets --features fetch-models

		"cu12" // ビルド環境に何がインストールされていようが、常にCUDA 12を使う
		"cu12+cudnn8" // ビルド環境に何がインストールされていようが、常にCUDA 12とcuDNN 8を使う

		pub trait ExecutionProvider {
		pub trait ExecutionProvider: Sync + Send {

		let mut env = EnvironmentBuilder::default().with_name(env!("CARGO_PKG_NAME"));
		let mut env = EnvironmentBuilder::new().with_name(env!("CARGO_PKG_NAME"));

Merge v2.0.0-rc.4, keeping ONNX Runtime v1.17 #7

Merge v2.0.0-rc.4, keeping ONNX Runtime v1.17 #7

Conversation

qryxip commented Aug 15, 2024

内容

関連 Issue

スクリーンショット・動画など

その他

qryxip left a comment • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Hiroshiba left a comment

Choose a reason for hiding this comment

Hiroshiba commented Aug 17, 2024

qryxip left a comment •

edited

Loading