From 795caf626c38f7b7de8c6ce153996bfc1f23cc12 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 5 Nov 2024 18:02:17 +0000 Subject: [PATCH 01/56] fix(deps): update rust crate tokenizers to v0.20.3 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index ed1d2b6..9f71e8a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2170,9 +2170,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenizers" -version = "0.20.1" +version = "0.20.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b172ffa9a2e5c31bbddc940cd5725d933ced983a9333bbebc4c7eda3bbce1557" +checksum = "67b67c92f6d705e2a1d106fb0b28c696f9074901a9c656ee5d9f5de204c39bf7" dependencies = [ "aho-corasick", "derive_builder", From 7bd39b71829ec75571b34ba32c69b098929206c0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 6 Nov 2024 13:01:27 +0000 Subject: [PATCH 02/56] chore(deps): update rust crate anyhow to v1.0.93 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e9a5e3e..6dc5eb8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.92" +version = "1.0.93" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "74f37166d7d48a0284b99dd824694c26119c700b53bf0d1540cdb147dbdaaf13" +checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" [[package]] name = "async-trait" From bca4b2053f88221333c8d1863a05e51cbb16edbd Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 7 Nov 2024 13:40:20 +0000 Subject: [PATCH 03/56] fix(deps): update rust crate tokio to v1.41.1 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7ba8e3d..02d974a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2203,9 +2203,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.41.0" +version = "1.41.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "145f3413504347a2be84393cc8a7d2fb4d863b375909ea59f2158261aa258bbb" +checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" dependencies = [ "backtrace", "bytes", From 35d16d88a81209d6ed9f154f859a14c345f0df38 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 10 Nov 2024 07:11:07 +0000 Subject: [PATCH 04/56] fix(deps): update rust crate thiserror to v1.0.69 --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 02d974a..2a2b8cb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2135,18 +2135,18 @@ checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1" [[package]] name = "thiserror" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "02dd99dc800bbb97186339685293e1cc5d9df1f8fae2d0aecd9ff1c77efea892" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.68" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7c61ec9a6f64d2793d8a45faba21efbe3ced62a886d44c36a009b2b519b4c7e" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", From 248363ae4a564ff54549c4d8fb9db578778aa189 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Nov 2024 00:53:00 +0000 Subject: [PATCH 05/56] fix(deps): update rust crate serde to v1.0.215 --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2a2b8cb..a72330d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1930,18 +1930,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f55c3193aca71c12ad7890f1785d2b73e1b9f63a0bbc353c08ef26fe03fc56b5" +checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.214" +version = "1.0.215" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de523f781f095e28fa605cdce0f8307e451cc0fd14e2eb4cd2e98a355b147766" +checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" dependencies = [ "proc-macro2", "quote", From 9b9962ed29fb5cbbea7258c6250d83d3f00b12b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA=E8=A1=9B?= =?UTF-8?q?=E9=9A=8A?= Date: Wed, 13 Nov 2024 11:16:24 +0900 Subject: [PATCH 06/56] =?UTF-8?q?Style=20ID=E6=8C=87=E5=AE=9A=E3=81=A7?= =?UTF-8?q?=E3=81=8D=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB=E3=81=97=E3=81=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sbv2_api/src/main.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sbv2_api/src/main.rs b/sbv2_api/src/main.rs index 10e936a..fdcf331 100644 --- a/sbv2_api/src/main.rs +++ b/sbv2_api/src/main.rs @@ -40,6 +40,10 @@ fn length_default() -> f32 { 1.0 } +fn style_id_default() -> f32 { + 0 +} + #[derive(Deserialize, ToSchema)] struct SynthesizeRequest { text: String, @@ -48,6 +52,8 @@ struct SynthesizeRequest { sdp_ratio: f32, #[serde(default = "length_default")] length_scale: f32, + #[serde(default = "style_id_default")] + style_id: i32, } #[utoipa::path( @@ -65,6 +71,7 @@ async fn synthesize( ident, sdp_ratio, length_scale, + style_id }): Json, ) -> AppResult { log::debug!("processing request: text={text}, ident={ident}, sdp_ratio={sdp_ratio}, length_scale={length_scale}"); @@ -73,7 +80,7 @@ async fn synthesize( tts_model.easy_synthesize( &ident, &text, - 0, + style_id, SynthesizeOptions { sdp_ratio, length_scale, From 001f61bb6a2041de7575973ccc3b15a8da95133c Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 13 Nov 2024 02:24:09 +0000 Subject: [PATCH 07/56] fix types --- sbv2_api/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbv2_api/src/main.rs b/sbv2_api/src/main.rs index fdcf331..6a636d2 100644 --- a/sbv2_api/src/main.rs +++ b/sbv2_api/src/main.rs @@ -40,7 +40,7 @@ fn length_default() -> f32 { 1.0 } -fn style_id_default() -> f32 { +fn style_id_default() -> i32 { 0 } From b76738f467308b77fa4ca80db8442fdcadf3e34a Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 13 Nov 2024 11:39:05 +0000 Subject: [PATCH 08/56] add speaker id code --- sbv2_api/src/main.rs | 10 +++++++++- sbv2_bindings/src/sbv2.rs | 2 ++ sbv2_core/src/main.rs | 2 +- sbv2_core/src/model.rs | 3 ++- sbv2_core/src/tts.rs | 38 +++----------------------------------- 5 files changed, 17 insertions(+), 38 deletions(-) diff --git a/sbv2_api/src/main.rs b/sbv2_api/src/main.rs index 6a636d2..6844c21 100644 --- a/sbv2_api/src/main.rs +++ b/sbv2_api/src/main.rs @@ -44,6 +44,10 @@ fn style_id_default() -> i32 { 0 } +fn speaker_id_default() -> i64 { + 0 +} + #[derive(Deserialize, ToSchema)] struct SynthesizeRequest { text: String, @@ -54,6 +58,8 @@ struct SynthesizeRequest { length_scale: f32, #[serde(default = "style_id_default")] style_id: i32, + #[serde(default = "speaker_id_default")] + speaker_id: i64, } #[utoipa::path( @@ -71,7 +77,8 @@ async fn synthesize( ident, sdp_ratio, length_scale, - style_id + style_id, + speaker_id, }): Json, ) -> AppResult { log::debug!("processing request: text={text}, ident={ident}, sdp_ratio={sdp_ratio}, length_scale={length_scale}"); @@ -81,6 +88,7 @@ async fn synthesize( &ident, &text, style_id, + speaker_id, SynthesizeOptions { sdp_ratio, length_scale, diff --git a/sbv2_bindings/src/sbv2.rs b/sbv2_bindings/src/sbv2.rs index 0ecc414..c109869 100644 --- a/sbv2_bindings/src/sbv2.rs +++ b/sbv2_bindings/src/sbv2.rs @@ -142,6 +142,7 @@ impl TTSModel { text: String, ident: String, style_id: i32, + speaker_id: i64, sdp_ratio: f32, length_scale: f32, ) -> anyhow::Result> { @@ -149,6 +150,7 @@ impl TTSModel { ident.as_str(), &text, style_id, + speaker_id, SynthesizeOptions { sdp_ratio, length_scale, diff --git a/sbv2_core/src/main.rs b/sbv2_core/src/main.rs index 3a4cbdd..8665b3d 100644 --- a/sbv2_core/src/main.rs +++ b/sbv2_core/src/main.rs @@ -17,7 +17,7 @@ fn main_inner() -> anyhow::Result<()> { )?; tts_holder.load_sbv2file(ident, fs::read(env::var("MODEL_PATH")?)?)?; - let audio = tts_holder.easy_synthesize(ident, &text, 0, tts::SynthesizeOptions::default())?; + let audio = tts_holder.easy_synthesize(ident, &text, 0, 0, tts::SynthesizeOptions::default())?; fs::write("output.wav", audio)?; Ok(()) diff --git a/sbv2_core/src/model.rs b/sbv2_core/src/model.rs index 9f2a221..a851909 100644 --- a/sbv2_core/src/model.rs +++ b/sbv2_core/src/model.rs @@ -52,6 +52,7 @@ pub fn synthesize( session: &Session, bert_ori: Array2, x_tst: Array1, + sid: Array1, tones: Array1, lang_ids: Array1, style_vector: Array1, @@ -67,7 +68,7 @@ pub fn synthesize( let outputs = session.run(ort::inputs! { "x_tst" => x_tst, "x_tst_lengths" => x_tst_lengths, - "sid" => array![0_i64], + "sid" => sid, "tones" => tones, "language" => lang_ids, "bert" => bert, diff --git a/sbv2_core/src/tts.rs b/sbv2_core/src/tts.rs index d248e31..dedb124 100644 --- a/sbv2_core/src/tts.rs +++ b/sbv2_core/src/tts.rs @@ -229,6 +229,7 @@ impl TTSModelHolder { ident: I, text: &str, style_id: i32, + speaker_id: i64, options: SynthesizeOptions, ) -> Result> { self.find_and_load_model(ident)?; @@ -250,6 +251,7 @@ impl TTSModelHolder { &vits2, bert_ori.to_owned(), phones, + Array1::from_vec(vec![speaker_id]), tones, lang_ids, style_vector.clone(), @@ -271,6 +273,7 @@ impl TTSModelHolder { &vits2, bert_ori.to_owned(), phones, + Array1::from_vec(vec![speaker_id]), tones, lang_ids, style_vector, @@ -280,41 +283,6 @@ impl TTSModelHolder { }; tts_util::array_to_vec(audio_array) } - - /// Synthesize text to audio - /// - /// # Note - /// This function is for low-level usage, use `easy_synthesize` for high-level usage. - #[allow(clippy::too_many_arguments)] - pub fn synthesize + Copy>( - &mut self, - ident: I, - bert_ori: Array2, - phones: Array1, - tones: Array1, - lang_ids: Array1, - style_vector: Array1, - sdp_ratio: f32, - length_scale: f32, - ) -> Result> { - self.find_and_load_model(ident)?; - let vits2 = &self - .find_model(ident)? - .vits2 - .as_ref() - .ok_or(Error::ModelNotFoundError(ident.into().to_string()))?; - let audio_array = model::synthesize( - &vits2, - bert_ori.to_owned(), - phones, - tones, - lang_ids, - style_vector, - sdp_ratio, - length_scale, - )?; - tts_util::array_to_vec(audio_array) - } } /// Synthesize options From 060af0c18703697aef01f09af974df653cea3fc2 Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 13 Nov 2024 11:43:52 +0000 Subject: [PATCH 09/56] format --- sbv2_core/src/main.rs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/sbv2_core/src/main.rs b/sbv2_core/src/main.rs index 8665b3d..d60311b 100644 --- a/sbv2_core/src/main.rs +++ b/sbv2_core/src/main.rs @@ -17,7 +17,8 @@ fn main_inner() -> anyhow::Result<()> { )?; tts_holder.load_sbv2file(ident, fs::read(env::var("MODEL_PATH")?)?)?; - let audio = tts_holder.easy_synthesize(ident, &text, 0, 0, tts::SynthesizeOptions::default())?; + let audio = + tts_holder.easy_synthesize(ident, &text, 0, 0, tts::SynthesizeOptions::default())?; fs::write("output.wav", audio)?; Ok(()) From fbd62315d01ea01c9cbf7661401d223c014a3e7f Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 13 Nov 2024 11:46:47 +0000 Subject: [PATCH 10/56] clippy --- sbv2_core/src/tts.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sbv2_core/src/tts.rs b/sbv2_core/src/tts.rs index dedb124..4e30819 100644 --- a/sbv2_core/src/tts.rs +++ b/sbv2_core/src/tts.rs @@ -248,7 +248,7 @@ impl TTSModelHolder { } let (bert_ori, phones, tones, lang_ids) = self.parse_text(t)?; let audio = model::synthesize( - &vits2, + vits2, bert_ori.to_owned(), phones, Array1::from_vec(vec![speaker_id]), @@ -270,7 +270,7 @@ impl TTSModelHolder { } else { let (bert_ori, phones, tones, lang_ids) = self.parse_text(text)?; model::synthesize( - &vits2, + vits2, bert_ori.to_owned(), phones, Array1::from_vec(vec![speaker_id]), From 4e0c8591cdc43735788bf79843224cd2f5e7945a Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 13 Nov 2024 12:00:59 +0000 Subject: [PATCH 11/56] fix --- .github/workflows/CI.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 3b3f5d1..fb6304b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -140,9 +140,6 @@ jobs: strategy: matrix: tag: [cpu, cuda] - platform: - - linux/amd64 - - linux/arm64 steps: - uses: actions/checkout@v4 - name: Set up QEMU @@ -163,4 +160,4 @@ jobs: tags: | ghcr.io/${{ github.repository }}:${{ matrix.tag }} file: docker/${{ matrix.tag }}.Dockerfile - platforms: ${{ matrix.platform }} + platforms: linux/amd64, linux/arm64 From f90904a337fc74fddd11cd166001018099778fd6 Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 13 Nov 2024 12:02:36 +0000 Subject: [PATCH 12/56] fix version --- Cargo.lock | 6 +++--- sbv2_api/Cargo.toml | 2 +- sbv2_bindings/Cargo.toml | 2 +- sbv2_core/Cargo.toml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a72330d..30d95ac 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1864,7 +1864,7 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f" [[package]] name = "sbv2_api" -version = "0.2.0-alpha" +version = "0.2.0-alpha4" dependencies = [ "anyhow", "axum", @@ -1880,7 +1880,7 @@ dependencies = [ [[package]] name = "sbv2_bindings" -version = "0.2.0-alpha2" +version = "0.2.0-alpha4" dependencies = [ "anyhow", "ndarray", @@ -1890,7 +1890,7 @@ dependencies = [ [[package]] name = "sbv2_core" -version = "0.2.0-alpha2" +version = "0.2.0-alpha4" dependencies = [ "anyhow", "dotenvy", diff --git a/sbv2_api/Cargo.toml b/sbv2_api/Cargo.toml index b13e631..4238fa5 100644 --- a/sbv2_api/Cargo.toml +++ b/sbv2_api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sbv2_api" -version = "0.2.0-alpha" +version = "0.2.0-alpha4" edition = "2021" [dependencies] diff --git a/sbv2_bindings/Cargo.toml b/sbv2_bindings/Cargo.toml index 91c6e20..979a4c0 100644 --- a/sbv2_bindings/Cargo.toml +++ b/sbv2_bindings/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "sbv2_bindings" -version = "0.2.0-alpha2" +version = "0.2.0-alpha4" edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html diff --git a/sbv2_core/Cargo.toml b/sbv2_core/Cargo.toml index 2f67aac..4f84986 100644 --- a/sbv2_core/Cargo.toml +++ b/sbv2_core/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "sbv2_core" description = "Style-Bert-VITSの推論ライブラリ" -version = "0.2.0-alpha2" +version = "0.2.0-alpha4" edition = "2021" license = "MIT" readme = "../README.md" From 83076227e7ccdc22b655baa40c0c2a67a75ecc54 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 18:22:03 +0000 Subject: [PATCH 13/56] fix(deps): update rust crate axum to v0.7.8 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 30d95ac..a47623a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,9 +100,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.7" +version = "0.7.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "504e3947307ac8326a5437504c517c4b56716c9d98fac0028c2acc7ca47d70ae" +checksum = "49c41b948da08fb481a94546cd874843adc1142278b0af4badf9b1b78599d68d" dependencies = [ "async-trait", "axum-core", From 62653ec1c359d0ce4801546b0db3e8733adb1888 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 15 Nov 2024 23:06:13 +0000 Subject: [PATCH 14/56] fix(deps): update rust crate pyo3 to 0.23.0 --- Cargo.lock | 20 ++++++++++---------- sbv2_bindings/Cargo.toml | 2 +- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 30d95ac..79819e6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1608,9 +1608,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f402062616ab18202ae8319da13fa4279883a2b8a9d9f83f20dbade813ce1884" +checksum = "d51da03e17ef97ae4185cd606a4b316e04bb6f047d66913d6b57d4e6acfb41ec" dependencies = [ "anyhow", "cfg-if", @@ -1627,9 +1627,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b14b5775b5ff446dd1056212d778012cbe8a0fbffd368029fd9e25b514479c38" +checksum = "455f646b3d007fb6d85cffccff9c7dfb752f24ec9fb0a04cb49537e7e9bdc2dd" dependencies = [ "once_cell", "target-lexicon", @@ -1637,9 +1637,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ab5bcf04a2cdcbb50c7d6105de943f543f9ed92af55818fd17b660390fc8636" +checksum = "432fc20d4dd419f8d1dd402a659bb42e75430706b50d367cc978978778638084" dependencies = [ "libc", "pyo3-build-config", @@ -1647,9 +1647,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0fd24d897903a9e6d80b968368a34e1525aeb719d568dba8b3d4bfa5dc67d453" +checksum = "ae1cd532e9356f90d1be1317d8bf51873e4a9468b9305b950c20e8aef786cc16" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1659,9 +1659,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.22.6" +version = "0.23.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "36c011a03ba1e50152b4b394b479826cad97e7a21eb52df179cd91ac411cbfbe" +checksum = "975b289b3d3901442a6def73eedf8251dc1aed2cdc0a80d1c4f3998d868a97aa" dependencies = [ "heck", "proc-macro2", diff --git a/sbv2_bindings/Cargo.toml b/sbv2_bindings/Cargo.toml index 979a4c0..154382e 100644 --- a/sbv2_bindings/Cargo.toml +++ b/sbv2_bindings/Cargo.toml @@ -11,5 +11,5 @@ crate-type = ["cdylib"] [dependencies] anyhow.workspace = true ndarray.workspace = true -pyo3 = { version = "0.22.0", features = ["anyhow"] } +pyo3 = { version = "0.23.0", features = ["anyhow"] } sbv2_core = { version = "0.2.0-alpha2", path = "../sbv2_core" } From 789cef74cecd786bd22cef558bf885028de55807 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 16 Nov 2024 22:43:20 +0000 Subject: [PATCH 15/56] fix(deps): update rust crate axum to v0.7.9 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a47623a..d6ba1b9 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -100,9 +100,9 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.8" +version = "0.7.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49c41b948da08fb481a94546cd874843adc1142278b0af4badf9b1b78599d68d" +checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", "axum-core", From ed7bf53b89566f0820fcd255fa49f966a4849d38 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 17 Nov 2024 03:44:30 +0000 Subject: [PATCH 16/56] fix(deps): update rust crate serde_json to v1.0.133 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d6ba1b9..587fb27 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1950,9 +1950,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.132" +version = "1.0.133" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d726bfaff4b320266d395898905d0eba0345aae23b54aee3a737e260fd46db03" +checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" dependencies = [ "itoa", "memchr", From 9c9119a1072da945896c00a8916fc83ec733b0f0 Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 20 Nov 2024 01:42:04 +0000 Subject: [PATCH 17/56] support aivmx --- Cargo.lock | 87 ++++++++++++++++++++++++++++++++++++++++++ sbv2_core/Cargo.toml | 6 ++- sbv2_core/src/error.rs | 3 ++ sbv2_core/src/tts.rs | 55 ++++++++++++++++++++++++++ 4 files changed, 150 insertions(+), 1 deletion(-) diff --git a/Cargo.lock b/Cargo.lock index 30d95ac..466f787 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1374,6 +1374,27 @@ dependencies = [ "minimal-lexical", ] +[[package]] +name = "npyz" +version = "0.8.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "13f27ea175875c472b3df61ece89a6d6ef4e0627f43704e400c782f174681ebd" +dependencies = [ + "byteorder", + "num-bigint", + "py_literal", +] + +[[package]] +name = "num-bigint" +version = "0.4.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9" +dependencies = [ + "num-integer", + "num-traits", +] + [[package]] name = "num-complex" version = "0.4.6" @@ -1513,6 +1534,51 @@ version = "2.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e" +[[package]] +name = "pest" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "879952a81a83930934cbf1786752d6dedc3b1f29e8f8fb2ad1d0a36f377cf442" +dependencies = [ + "memchr", + "thiserror", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d214365f632b123a47fd913301e14c946c61d1c183ee245fa76eb752e59a02dd" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eb55586734301717aea2ac313f50b2eb8f60d2fc3dc01d190eefa2e625f60c4e" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.7.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75da2a70cf4d9cb76833c990ac9cd3923c9a8905a8929789ce347c84564d03d" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + [[package]] name = "phf" version = "0.11.2" @@ -1606,6 +1672,19 @@ dependencies = [ "unicode-ident", ] +[[package]] +name = "py_literal" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "102df7a3d46db9d3891f178dcc826dc270a6746277a9ae6436f8d29fd490a8e1" +dependencies = [ + "num-bigint", + "num-complex", + "num-traits", + "pest", + "pest_derive", +] + [[package]] name = "pyo3" version = "0.22.6" @@ -1893,11 +1972,13 @@ name = "sbv2_core" version = "0.2.0-alpha4" dependencies = [ "anyhow", + "base64 0.22.1", "dotenvy", "env_logger", "hound", "jpreprocess", "ndarray", + "npyz", "num_cpus", "once_cell", "ort", @@ -2284,6 +2365,12 @@ version = "1.17.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" +[[package]] +name = "ucd-trie" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" + [[package]] name = "unicode-bidi" version = "0.3.17" diff --git a/sbv2_core/Cargo.toml b/sbv2_core/Cargo.toml index 4f84986..9d830fb 100644 --- a/sbv2_core/Cargo.toml +++ b/sbv2_core/Cargo.toml @@ -10,11 +10,13 @@ documentation = "https://docs.rs/sbv2_core" [dependencies] anyhow.workspace = true +base64 = { version = "0.22.1", optional = true } dotenvy.workspace = true env_logger.workspace = true hound = "3.5.1" jpreprocess = { version = "0.10.0", features = ["naist-jdic"] } ndarray.workspace = true +npyz = { version = "0.8.3", optional = true } num_cpus = "1.16.0" once_cell.workspace = true ort = { git = "https://github.com/pykeio/ort.git", version = "2.0.0-rc.8", optional = true } @@ -35,4 +37,6 @@ directml = ["ort/directml", "std"] tensorrt = ["ort/tensorrt", "std"] coreml = ["ort/coreml", "std"] default = ["std"] -no_std = ["tokenizers/unstable_wasm"] \ No newline at end of file +no_std = ["tokenizers/unstable_wasm"] +aivmx = ["npyz", "base64"] +base64 = ["dep:base64"] diff --git a/sbv2_core/src/error.rs b/sbv2_core/src/error.rs index 6bb449e..57c2c48 100644 --- a/sbv2_core/src/error.rs +++ b/sbv2_core/src/error.rs @@ -21,6 +21,9 @@ pub enum Error { HoundError(#[from] hound::Error), #[error("model not found error")] ModelNotFoundError(String), + #[cfg(feature = "base64")] + #[error("base64 error")] + Base64Error(#[from] base64::DecodeError), #[error("other")] OtherError(String), } diff --git a/sbv2_core/src/tts.rs b/sbv2_core/src/tts.rs index 4e30819..49a94b6 100644 --- a/sbv2_core/src/tts.rs +++ b/sbv2_core/src/tts.rs @@ -3,6 +3,12 @@ use crate::{jtalk, model, style, tokenizer, tts_util}; use ndarray::{concatenate, Array1, Array2, Array3, Axis}; use ort::Session; use tokenizers::Tokenizer; +#[cfg(feature = "aivmx")] +use base64::prelude::{Engine as _, BASE64_STANDARD}; +#[cfg(feature = "aivmx")] +use std::io::Cursor; +#[cfg(feature = "aivmx")] +use ndarray::ShapeBuilder; #[derive(PartialEq, Eq, Clone)] pub struct TTSIdent(String); @@ -69,6 +75,55 @@ impl TTSModelHolder { self.models.iter().map(|m| m.ident.to_string()).collect() } + #[cfg(feature = "aivmx")] + pub fn load_aivmx, P: AsRef<[u8]>>( + &mut self, + ident: I, + aivmx_bytes: P + ) -> Result<()> { + let ident = ident.into(); + if self.find_model(ident.clone()).is_err() { + let mut load = true; + if let Some(max) = self.max_loaded_models { + if self.models.iter().filter(|x| x.vits2.is_some()).count() >= max { + load = false; + } + } + let model = model::load_model(aivmx_bytes, false)?; + let metadata = model.metadata()?; + if let Some(aivm_style_vectors) = metadata.custom("aivm_style_vectors")? { + let style_vectors = Cursor::new(&BASE64_STANDARD.decode(aivm_style_vectors)?); + let reader = npyz::NpyFile::new(style_vectors)?; + let style_vectors = { + let shape = reader.shape().to_vec(); + let order = reader.order(); + let data = reader.into_vec::()?; + let shape = match shape[..] { + [i1, i2] => [i1 as usize, i2 as usize], + _ => panic!("expected 2D array"), + }; + let true_shape = shape.set_f(order == npyz::Order::Fortran); + ndarray::Array2::from_shape_vec(true_shape, data)? + }; + self.models.push(TTSModel { + vits2: if load { + Some(model) + } else { + None + }, + bytes: if self.max_loaded_models.is_some() { + Some(aivmx_bytes.as_ref().to_vec()) + } else { + None + }, + ident, + style_vectors, + }) + } + } + Ok(()) + } + /// Load a .sbv2 file binary /// /// # Examples From 2eda2fe9ca45d5b7118ba44c3b0436ea58262bd7 Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 20 Nov 2024 02:14:59 +0000 Subject: [PATCH 18/56] fix --- sbv2_core/src/tts.rs | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/sbv2_core/src/tts.rs b/sbv2_core/src/tts.rs index 49a94b6..4b12961 100644 --- a/sbv2_core/src/tts.rs +++ b/sbv2_core/src/tts.rs @@ -1,14 +1,14 @@ use crate::error::{Error, Result}; use crate::{jtalk, model, style, tokenizer, tts_util}; -use ndarray::{concatenate, Array1, Array2, Array3, Axis}; -use ort::Session; -use tokenizers::Tokenizer; #[cfg(feature = "aivmx")] use base64::prelude::{Engine as _, BASE64_STANDARD}; #[cfg(feature = "aivmx")] -use std::io::Cursor; -#[cfg(feature = "aivmx")] use ndarray::ShapeBuilder; +use ndarray::{concatenate, Array1, Array2, Array3, Axis}; +use ort::Session; +#[cfg(feature = "aivmx")] +use std::io::Cursor; +use tokenizers::Tokenizer; #[derive(PartialEq, Eq, Clone)] pub struct TTSIdent(String); @@ -79,7 +79,7 @@ impl TTSModelHolder { pub fn load_aivmx, P: AsRef<[u8]>>( &mut self, ident: I, - aivmx_bytes: P + aivmx_bytes: P, ) -> Result<()> { let ident = ident.into(); if self.find_model(ident.clone()).is_err() { @@ -89,10 +89,11 @@ impl TTSModelHolder { load = false; } } - let model = model::load_model(aivmx_bytes, false)?; + let model = model::load_model(&aivmx_bytes, false)?; let metadata = model.metadata()?; if let Some(aivm_style_vectors) = metadata.custom("aivm_style_vectors")? { - let style_vectors = Cursor::new(&BASE64_STANDARD.decode(aivm_style_vectors)?); + let aivm_style_vectors = BASE64_STANDARD.decode(aivm_style_vectors)?; + let style_vectors = Cursor::new(&aivm_style_vectors); let reader = npyz::NpyFile::new(style_vectors)?; let style_vectors = { let shape = reader.shape().to_vec(); @@ -100,17 +101,14 @@ impl TTSModelHolder { let data = reader.into_vec::()?; let shape = match shape[..] { [i1, i2] => [i1 as usize, i2 as usize], - _ => panic!("expected 2D array"), + _ => panic!("expected 2D array"), }; let true_shape = shape.set_f(order == npyz::Order::Fortran); ndarray::Array2::from_shape_vec(true_shape, data)? }; + drop(metadata); self.models.push(TTSModel { - vits2: if load { - Some(model) - } else { - None - }, + vits2: if load { Some(model) } else { None }, bytes: if self.max_loaded_models.is_some() { Some(aivmx_bytes.as_ref().to_vec()) } else { From 5e9df656564a869115b4012db87cd495a5041ff3 Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 20 Nov 2024 02:36:42 +0000 Subject: [PATCH 19/56] add aivmx test --- sbv2_core/src/main.rs | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/sbv2_core/src/main.rs b/sbv2_core/src/main.rs index d60311b..7651d16 100644 --- a/sbv2_core/src/main.rs +++ b/sbv2_core/src/main.rs @@ -15,7 +15,14 @@ fn main_inner() -> anyhow::Result<()> { .ok() .and_then(|x| x.parse().ok()), )?; - tts_holder.load_sbv2file(ident, fs::read(env::var("MODEL_PATH")?)?)?; + #[cfg(not(feature = "aivmx"))] + { + tts_holder.load_sbv2file(ident, fs::read(env::var("MODEL_PATH")?)?)?; + } + #[cfg(feature = "aivmx")] + { + tts_holder.load_aivmxfile(ident, fs::read(env::path("AIVMX_PATH")?)?)?; + } let audio = tts_holder.easy_synthesize(ident, &text, 0, 0, tts::SynthesizeOptions::default())?; From 9ceec03bd07a195fb957c0e12dd580a37cdd339e Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 20 Nov 2024 02:39:38 +0000 Subject: [PATCH 20/56] fix bug --- sbv2_core/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbv2_core/src/main.rs b/sbv2_core/src/main.rs index 7651d16..60ced0c 100644 --- a/sbv2_core/src/main.rs +++ b/sbv2_core/src/main.rs @@ -21,7 +21,7 @@ fn main_inner() -> anyhow::Result<()> { } #[cfg(feature = "aivmx")] { - tts_holder.load_aivmxfile(ident, fs::read(env::path("AIVMX_PATH")?)?)?; + tts_holder.load_aivmx(ident, fs::read(env::var("AIVMX_PATH")?)?)?; } let audio = From 90b3ba2e409e639534b29b6d543c602f67d5fa2f Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 20 Nov 2024 02:42:19 +0000 Subject: [PATCH 21/56] fix bug --- sbv2_core/src/main.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbv2_core/src/main.rs b/sbv2_core/src/main.rs index 60ced0c..61e83b9 100644 --- a/sbv2_core/src/main.rs +++ b/sbv2_core/src/main.rs @@ -21,7 +21,7 @@ fn main_inner() -> anyhow::Result<()> { } #[cfg(feature = "aivmx")] { - tts_holder.load_aivmx(ident, fs::read(env::var("AIVMX_PATH")?)?)?; + tts_holder.load_aivmx(ident, fs::read(env::var("MODEL_PATH")?)?)?; } let audio = From 9bcbd496e5e8e393f4e431363b0d68467e21b040 Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 20 Nov 2024 02:42:33 +0000 Subject: [PATCH 22/56] fix --- sbv2_core/src/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/sbv2_core/src/main.rs b/sbv2_core/src/main.rs index 61e83b9..381703f 100644 --- a/sbv2_core/src/main.rs +++ b/sbv2_core/src/main.rs @@ -30,6 +30,7 @@ fn main_inner() -> anyhow::Result<()> { Ok(()) } + #[cfg(not(feature = "std"))] fn main_inner() -> anyhow::Result<()> { Ok(()) From edee0710aa057efe05033964423d4cb168711bd9 Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 20 Nov 2024 02:53:14 +0000 Subject: [PATCH 23/56] support noise_scale --- convert/convert_model.py | 8 +++++++- sbv2_core/src/model.rs | 4 ++++ sbv2_core/src/tts.rs | 4 ++++ 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/convert/convert_model.py b/convert/convert_model.py index 70b7765..e5badcc 100644 --- a/convert/convert_model.py +++ b/convert/convert_model.py @@ -94,7 +94,7 @@ model = get_net_g( ) -def forward(x, x_len, sid, tone, lang, bert, style, length_scale, sdp_ratio): +def forward(x, x_len, sid, tone, lang, bert, style, length_scale, sdp_ratio, noise_scale, noise_scale_w): return model.infer( x, x_len, @@ -105,6 +105,8 @@ def forward(x, x_len, sid, tone, lang, bert, style, length_scale, sdp_ratio): style, sdp_ratio=sdp_ratio, length_scale=length_scale, + noise_scale=noise_scale, + noise_scale_w=noise_scale_w, ) @@ -122,6 +124,8 @@ torch.onnx.export( style_vec_tensor, torch.tensor(1.0), torch.tensor(0.0), + torch.tensor(0.6777), + torch.tensor(0.8), ), f"../models/model_{out_name}.onnx", verbose=True, @@ -144,6 +148,8 @@ torch.onnx.export( "style_vec", "length_scale", "sdp_ratio", + "noise_scale", + "noise_scale_w" ], output_names=["output"], ) diff --git a/sbv2_core/src/model.rs b/sbv2_core/src/model.rs index a851909..603ea83 100644 --- a/sbv2_core/src/model.rs +++ b/sbv2_core/src/model.rs @@ -58,6 +58,8 @@ pub fn synthesize( style_vector: Array1, sdp_ratio: f32, length_scale: f32, + noise_scale: f32, + noise_scale_w: f32, ) -> Result> { let bert = bert_ori.insert_axis(Axis(0)); let x_tst_lengths: Array1 = array![x_tst.shape()[0] as i64]; @@ -75,6 +77,8 @@ pub fn synthesize( "style_vec" => style_vector, "sdp_ratio" => array![sdp_ratio], "length_scale" => array![length_scale], + "noise_scale" => array![noise_scale], + "noise_scale_w" => array![noise_scale_w] }?)?; let audio_array = outputs["output"] diff --git a/sbv2_core/src/tts.rs b/sbv2_core/src/tts.rs index 4b12961..0057260 100644 --- a/sbv2_core/src/tts.rs +++ b/sbv2_core/src/tts.rs @@ -310,6 +310,8 @@ impl TTSModelHolder { style_vector.clone(), options.sdp_ratio, options.length_scale, + 0.677, + 0.8, )?; audios.push(audio.clone()); if i != texts.len() - 1 { @@ -332,6 +334,8 @@ impl TTSModelHolder { style_vector, options.sdp_ratio, options.length_scale, + 0.677, + 0.8, )? }; tts_util::array_to_vec(audio_array) From 4db7f49fa574022184897e90d313e5db88a8dddb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA=E8=A1=9B?= =?UTF-8?q?=E9=9A=8A?= Date: Wed, 20 Nov 2024 13:11:58 +0900 Subject: [PATCH 24/56] Update and rename LICENSE to convert/LICENSE --- LICENSE | 21 --------------------- convert/LICENSE | 28 ++++++++++++++++++++++++++++ 2 files changed, 28 insertions(+), 21 deletions(-) delete mode 100644 LICENSE create mode 100644 convert/LICENSE diff --git a/LICENSE b/LICENSE deleted file mode 100644 index 3cb80f6..0000000 --- a/LICENSE +++ /dev/null @@ -1,21 +0,0 @@ -MIT License - -Copyright (c) 2024 tuna2134 - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. diff --git a/convert/LICENSE b/convert/LICENSE new file mode 100644 index 0000000..776e0ef --- /dev/null +++ b/convert/LICENSE @@ -0,0 +1,28 @@ +BSD 3-Clause License + +Copyright (c) 2024, tuna2134 + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. + +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +3. Neither the name of the copyright holder nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From fc4a79c111ad2f74d1f554a7f2b067e432c0d0ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA=E8=A1=9B?= =?UTF-8?q?=E9=9A=8A?= Date: Wed, 20 Nov 2024 13:12:40 +0900 Subject: [PATCH 25/56] Create LICENSE --- LICENSE | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) create mode 100644 LICENSE diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..3cb80f6 --- /dev/null +++ b/LICENSE @@ -0,0 +1,21 @@ +MIT License + +Copyright (c) 2024 tuna2134 + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. From aa7fc2e3b08d146cac8266aaace526cff70ba109 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA=E8=A1=9B?= =?UTF-8?q?=E9=9A=8A?= Date: Wed, 20 Nov 2024 13:13:17 +0900 Subject: [PATCH 26/56] Delete convert/LICENSE --- convert/LICENSE | 28 ---------------------------- 1 file changed, 28 deletions(-) delete mode 100644 convert/LICENSE diff --git a/convert/LICENSE b/convert/LICENSE deleted file mode 100644 index 776e0ef..0000000 --- a/convert/LICENSE +++ /dev/null @@ -1,28 +0,0 @@ -BSD 3-Clause License - -Copyright (c) 2024, tuna2134 - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - -1. Redistributions of source code must retain the above copyright notice, this - list of conditions and the following disclaimer. - -2. Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - -3. Neither the name of the copyright holder nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. From db09b73b323296c59f057f9ffe878a2a9be7732e Mon Sep 17 00:00:00 2001 From: tuna2134 Date: Wed, 20 Nov 2024 07:01:43 +0000 Subject: [PATCH 27/56] support aivmx --- sbv2_api/Cargo.toml | 2 +- sbv2_api/src/main.rs | 14 ++++++++++++++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/sbv2_api/Cargo.toml b/sbv2_api/Cargo.toml index 4238fa5..3c759ed 100644 --- a/sbv2_api/Cargo.toml +++ b/sbv2_api/Cargo.toml @@ -9,7 +9,7 @@ axum = "0.7.5" dotenvy.workspace = true env_logger.workspace = true log = "0.4.22" -sbv2_core = { version = "0.2.0-alpha2", path = "../sbv2_core" } +sbv2_core = { version = "0.2.0-alpha2", path = "../sbv2_core", features = ["aivmx"] } serde = { version = "1.0.210", features = ["derive"] } tokio = { version = "1.40.0", features = ["full"] } utoipa = { version = "5.0.0", features = ["axum_extras"] } diff --git a/sbv2_api/src/main.rs b/sbv2_api/src/main.rs index 6844c21..254bf2c 100644 --- a/sbv2_api/src/main.rs +++ b/sbv2_api/src/main.rs @@ -140,6 +140,20 @@ impl AppState { log::warn!("Error loading {entry}: {e}"); }; log::info!("Loaded: {entry}"); + } else if name.ends_with(".aivmx") { + let entry = &name[..name.len() - 6]; + log::info!("Try loading: {entry}"); + let aivmx_bytes = match fs::read(format!("{models}/{entry}.aivmx")).await { + Ok(b) => b, + Err(e) => { + log::warn!("Error loading aivmx bytes from file {entry}: {e}"); + continue; + } + }; + if let Err(e) = tts_model.load_aivmx(entry, aivmx_bytes) { + log::error!("Error loading {entry}: {e}"); + } + log::info!("Loaded: {entry}"); } } for entry in entries { From 1b2054c4b8b79450e09ba9eb615096728e34baa8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 27 Nov 2024 14:26:20 +0000 Subject: [PATCH 28/56] fix(deps): update rust crate tokenizers to 0.21.0 --- Cargo.lock | 4 ++-- sbv2_core/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 969f20b..b5080c1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2251,9 +2251,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" [[package]] name = "tokenizers" -version = "0.20.3" +version = "0.21.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67b67c92f6d705e2a1d106fb0b28c696f9074901a9c656ee5d9f5de204c39bf7" +checksum = "9ecededfed68a69bc657e486510089e255e53c3d38cc7d4d59c8742668ca2cae" dependencies = [ "aho-corasick", "derive_builder", diff --git a/sbv2_core/Cargo.toml b/sbv2_core/Cargo.toml index 9d830fb..866dbbb 100644 --- a/sbv2_core/Cargo.toml +++ b/sbv2_core/Cargo.toml @@ -25,7 +25,7 @@ serde = { version = "1.0.210", features = ["derive"] } serde_json = "1.0.128" tar = "0.4.41" thiserror = "1.0.63" -tokenizers = { version = "0.20.0", default-features = false } +tokenizers = { version = "0.21.0", default-features = false } zstd = "0.13.2" [features] From 05c3846b7baf6b0ad052ba8351ca8a5f4e8f6215 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 18:00:26 +0000 Subject: [PATCH 29/56] fix(deps): update rust crate tokio to v1.42.0 --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 969f20b..ef1f038 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -2284,9 +2284,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.41.1" +version = "1.42.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33" +checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" dependencies = [ "backtrace", "bytes", From caf541ef65260117447b605d193c1502de544706 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 23:23:13 +0000 Subject: [PATCH 30/56] chore(deps): update rust crate anyhow to v1.0.94 --- Cargo.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 969f20b..7e2bc26 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1,6 +1,6 @@ # This file is automatically @generated by Cargo. # It is not intended for manual editing. -version = 3 +version = 4 [[package]] name = "addr2line" @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.93" +version = "1.0.94" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4c95c10ba0b00a02636238b814946408b1322d5ac4760326e6fb8ec956d85775" +checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" [[package]] name = "async-trait" From 68edb3187fe2efef7b2a88db510810bca7157f39 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 11 Dec 2024 03:08:44 +0000 Subject: [PATCH 31/56] fix(deps): update rust crate serde to v1.0.216 --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 7e2bc26..11c5d2f 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2011,18 +2011,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f" +checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.215" +version = "1.0.216" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0" +checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" dependencies = [ "proc-macro2", "quote", From de188462808705e06b667cc686c75dcee5d4f5da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA=E8=A1=9B?= =?UTF-8?q?=E9=9A=8A?= Date: Thu, 19 Dec 2024 07:50:13 +0900 Subject: [PATCH 32/56] Update sbv2.rs --- sbv2_bindings/src/sbv2.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sbv2_bindings/src/sbv2.rs b/sbv2_bindings/src/sbv2.rs index c109869..0b45e3c 100644 --- a/sbv2_bindings/src/sbv2.rs +++ b/sbv2_bindings/src/sbv2.rs @@ -157,7 +157,7 @@ impl TTSModel { ..Default::default() }, )?; - Ok(PyBytes::new_bound(py, &data)) + Ok(PyBytes::new(py, &data)) } fn unload(&mut self, ident: String) -> bool { From e26715c8090dca56f3fa34b999a7a8b7e4a778d1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 18 Dec 2024 23:20:53 +0000 Subject: [PATCH 33/56] fix(deps): update rust crate pyo3 to v0.23.3 --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 432a25f..3382d6c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1687,9 +1687,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.23.0" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d51da03e17ef97ae4185cd606a4b316e04bb6f047d66913d6b57d4e6acfb41ec" +checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15" dependencies = [ "anyhow", "cfg-if", @@ -1706,9 +1706,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.23.0" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "455f646b3d007fb6d85cffccff9c7dfb752f24ec9fb0a04cb49537e7e9bdc2dd" +checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b" dependencies = [ "once_cell", "target-lexicon", @@ -1716,9 +1716,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.23.0" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "432fc20d4dd419f8d1dd402a659bb42e75430706b50d367cc978978778638084" +checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d" dependencies = [ "libc", "pyo3-build-config", @@ -1726,9 +1726,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.23.0" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae1cd532e9356f90d1be1317d8bf51873e4a9468b9305b950c20e8aef786cc16" +checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1738,9 +1738,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.23.0" +version = "0.23.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "975b289b3d3901442a6def73eedf8251dc1aed2cdc0a80d1c4f3998d868a97aa" +checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d" dependencies = [ "heck", "proc-macro2", From fddb35e59287c534fe07ed4eb7abe23d64082895 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA=E8=A1=9B?= =?UTF-8?q?=E9=9A=8A?= Date: Thu, 19 Dec 2024 08:28:53 +0900 Subject: [PATCH 34/56] Update CI.yml --- .github/workflows/CI.yml | 2 -- 1 file changed, 2 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index fb6304b..887fc37 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -79,8 +79,6 @@ jobs: strategy: matrix: platform: - - runner: macos-12 - target: x86_64 - runner: macos-14 target: aarch64 steps: From 0aa1bc8733173a4524cfd888836d0d28e3747bed Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 19 Dec 2024 18:06:44 +0000 Subject: [PATCH 35/56] fix(deps): update rust crate utoipa to v5.3.0 --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3382d6c..36e43a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2466,9 +2466,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utoipa" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "514a48569e4e21c86d0b84b5612b5e73c0b2cf09db63260134ba426d4e8ea714" +checksum = "68e76d357bc95c7d0939c92c04c9269871a8470eea39cb1f0231eeadb0c47d0f" dependencies = [ "indexmap", "serde", @@ -2478,9 +2478,9 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "5.2.0" +version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5629efe65599d0ccd5d493688cbf6e03aa7c1da07fe59ff97cf5977ed0637f66" +checksum = "564b03f8044ad6806bdc0d635e88be24967e785eef096df6b2636d2cc1e05d4b" dependencies = [ "proc-macro2", "quote", From 3f6f4ccb6f84eb2e65b983091bcb5b06e1c55fc3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 20 Dec 2024 20:48:36 +0000 Subject: [PATCH 36/56] chore(deps): update rust crate env_logger to v0.11.6 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36e43a0..7bf8c7e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -547,9 +547,9 @@ dependencies = [ [[package]] name = "env_logger" -version = "0.11.5" +version = "0.11.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e13fa619b91fb2381732789fc5de83b45675e882f66623b7d8cb4f643017018d" +checksum = "dcaee3d8e3cfc3fd92428d477bc97fc29ec8716d180c0d74c643bb26166660e0" dependencies = [ "anstream", "anstyle", From f2395096cad745129b1bdd5c42c7ec329157e5f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 21 Dec 2024 21:03:32 +0000 Subject: [PATCH 37/56] fix(deps): update rust crate serde_json to v1.0.134 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 36e43a0..9d70191 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2031,9 +2031,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.133" +version = "1.0.134" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7fceb2473b9166b2294ef05efcb65a3db80803f0b03ef86a5fc88a2b85ee377" +checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" dependencies = [ "itoa", "memchr", From ac2a09d6af4041b010a77bd21004fef67b57b6d0 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 22 Dec 2024 12:39:36 +0000 Subject: [PATCH 38/56] chore(deps): update rust crate anyhow to v1.0.95 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9d70191..449f11a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -77,9 +77,9 @@ dependencies = [ [[package]] name = "anyhow" -version = "1.0.94" +version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7" +checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" [[package]] name = "async-trait" From 35fabdf681e762c98e638778abb505cced1d881a Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 27 Dec 2024 22:05:25 +0000 Subject: [PATCH 39/56] fix(deps): update rust crate serde to v1.0.217 --- Cargo.lock | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 953f673..2281ebc 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2011,18 +2011,18 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" [[package]] name = "serde" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e" +checksum = "02fc4265df13d6fa1d00ecff087228cc0a2b5f3c0e87e258d8b94a156e984c70" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.216" +version = "1.0.217" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e" +checksum = "5a9bf7cf98d04a2b28aead066b7496853d4779c9cc183c440dbac457641e19a0" dependencies = [ "proc-macro2", "quote", From 4b932d568d225452dac573cdd2638fe55148e5a1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 6 Jan 2025 00:39:56 +0000 Subject: [PATCH 40/56] fix(deps): update utoipa monorepo --- Cargo.lock | 87 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 66 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 2281ebc..bf306a2 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -105,7 +105,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" dependencies = [ "async-trait", - "axum-core", + "axum-core 0.4.5", "bytes", "futures-util", "http", @@ -114,7 +114,7 @@ dependencies = [ "hyper", "hyper-util", "itoa", - "matchit", + "matchit 0.7.3", "memchr", "mime", "percent-encoding", @@ -124,7 +124,7 @@ dependencies = [ "serde_json", "serde_path_to_error", "serde_urlencoded", - "sync_wrapper 1.0.1", + "sync_wrapper", "tokio", "tower", "tower-layer", @@ -132,6 +132,32 @@ dependencies = [ "tracing", ] +[[package]] +name = "axum" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" +dependencies = [ + "axum-core 0.5.0", + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "itoa", + "matchit 0.8.4", + "memchr", + "mime", + "percent-encoding", + "pin-project-lite", + "rustversion", + "serde", + "sync_wrapper", + "tower", + "tower-layer", + "tower-service", +] + [[package]] name = "axum-core" version = "0.4.5" @@ -147,12 +173,31 @@ dependencies = [ "mime", "pin-project-lite", "rustversion", - "sync_wrapper 1.0.1", + "sync_wrapper", "tower-layer", "tower-service", "tracing", ] +[[package]] +name = "axum-core" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1362f362fd16024ae199c1970ce98f9661bf5ef94b9808fee734bc3698b733" +dependencies = [ + "bytes", + "futures-util", + "http", + "http-body", + "http-body-util", + "mime", + "pin-project-lite", + "rustversion", + "sync_wrapper", + "tower-layer", + "tower-service", +] + [[package]] name = "backtrace" version = "0.3.74" @@ -1270,6 +1315,12 @@ version = "0.7.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" +[[package]] +name = "matchit" +version = "0.8.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47e1ffaa40ddd1f3ed91f717a33c8c0ee23fff369e3aa8772b9605cc1d22f4c3" + [[package]] name = "matrixmultiply" version = "0.3.9" @@ -1946,7 +1997,7 @@ name = "sbv2_api" version = "0.2.0-alpha4" dependencies = [ "anyhow", - "axum", + "axum 0.7.9", "dotenvy", "env_logger", "log", @@ -2185,12 +2236,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "sync_wrapper" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160" - [[package]] name = "sync_wrapper" version = "1.0.1" @@ -2313,14 +2358,14 @@ dependencies = [ [[package]] name = "tower" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f" +checksum = "d039ad9159c98b70ecfd540b2573b97f7f52c3e8d9f8ad57a24b916a536975f9" dependencies = [ "futures-core", "futures-util", "pin-project-lite", - "sync_wrapper 0.1.2", + "sync_wrapper", "tokio", "tower-layer", "tower-service", @@ -2466,9 +2511,9 @@ checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" [[package]] name = "utoipa" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68e76d357bc95c7d0939c92c04c9269871a8470eea39cb1f0231eeadb0c47d0f" +checksum = "435c6f69ef38c9017b4b4eea965dfb91e71e53d869e896db40d1cf2441dd75c0" dependencies = [ "indexmap", "serde", @@ -2478,9 +2523,9 @@ dependencies = [ [[package]] name = "utoipa-gen" -version = "5.3.0" +version = "5.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "564b03f8044ad6806bdc0d635e88be24967e785eef096df6b2636d2cc1e05d4b" +checksum = "a77d306bc75294fd52f3e99b13ece67c02c1a2789190a6f31d32f736624326f7" dependencies = [ "proc-macro2", "quote", @@ -2490,11 +2535,11 @@ dependencies = [ [[package]] name = "utoipa-scalar" -version = "0.2.0" +version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c1291aa7a2223c2f8399d1c6627ca0ba57ca0d7ecac762a2094a9dfd6376445a" +checksum = "088e93bf19f6bd06e0aacb02ca432b3c5a449c4aec2e4aa9fc333a667f2b2c55" dependencies = [ - "axum", + "axum 0.8.1", "serde", "serde_json", "utoipa", From 4ff9a38a8096472bf03be8637918561138e3e72d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:24:08 +0000 Subject: [PATCH 41/56] fix(deps): update rust crate serde_json to v1.0.135 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf306a2..89a4741 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2082,9 +2082,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.134" +version = "1.0.135" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d00f4175c42ee48b15416f6193a959ba3a0d67fc699a0db9ad12df9f83991c7d" +checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" dependencies = [ "itoa", "memchr", From c6e5b731280aca17565908251f014ef53df19451 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 15:24:14 +0000 Subject: [PATCH 42/56] fix(deps): update rust crate axum to 0.8.0 --- Cargo.lock | 79 +++++---------------------------------------- sbv2_api/Cargo.toml | 2 +- 2 files changed, 9 insertions(+), 72 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf306a2..0abe28b 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -81,17 +81,6 @@ version = "1.0.95" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34ac096ce696dc2fcabef30516bb13c0a68a11d30131d3df6f04711467681b04" -[[package]] -name = "async-trait" -version = "0.1.83" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "autocfg" version = "1.4.0" @@ -100,13 +89,13 @@ checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26" [[package]] name = "axum" -version = "0.7.9" +version = "0.8.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f" +checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" dependencies = [ - "async-trait", - "axum-core 0.4.5", + "axum-core", "bytes", + "form_urlencoded", "futures-util", "http", "http-body", @@ -114,7 +103,7 @@ dependencies = [ "hyper", "hyper-util", "itoa", - "matchit 0.7.3", + "matchit", "memchr", "mime", "percent-encoding", @@ -132,53 +121,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "axum" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d6fd624c75e18b3b4c6b9caf42b1afe24437daaee904069137d8bab077be8b8" -dependencies = [ - "axum-core 0.5.0", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "itoa", - "matchit 0.8.4", - "memchr", - "mime", - "percent-encoding", - "pin-project-lite", - "rustversion", - "serde", - "sync_wrapper", - "tower", - "tower-layer", - "tower-service", -] - -[[package]] -name = "axum-core" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199" -dependencies = [ - "async-trait", - "bytes", - "futures-util", - "http", - "http-body", - "http-body-util", - "mime", - "pin-project-lite", - "rustversion", - "sync_wrapper", - "tower-layer", - "tower-service", - "tracing", -] - [[package]] name = "axum-core" version = "0.5.0" @@ -196,6 +138,7 @@ dependencies = [ "sync_wrapper", "tower-layer", "tower-service", + "tracing", ] [[package]] @@ -1309,12 +1252,6 @@ version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b8dd856d451cc0da70e2ef2ce95a18e39a93b7558bedf10201ad28503f918568" -[[package]] -name = "matchit" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94" - [[package]] name = "matchit" version = "0.8.4" @@ -1997,7 +1934,7 @@ name = "sbv2_api" version = "0.2.0-alpha4" dependencies = [ "anyhow", - "axum 0.7.9", + "axum", "dotenvy", "env_logger", "log", @@ -2539,7 +2476,7 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "088e93bf19f6bd06e0aacb02ca432b3c5a449c4aec2e4aa9fc333a667f2b2c55" dependencies = [ - "axum 0.8.1", + "axum", "serde", "serde_json", "utoipa", diff --git a/sbv2_api/Cargo.toml b/sbv2_api/Cargo.toml index 3c759ed..6cddb90 100644 --- a/sbv2_api/Cargo.toml +++ b/sbv2_api/Cargo.toml @@ -5,7 +5,7 @@ edition = "2021" [dependencies] anyhow.workspace = true -axum = "0.7.5" +axum = "0.8.0" dotenvy.workspace = true env_logger.workspace = true log = "0.4.22" From 69015bdf812b5ffb8f9501e6bcf1870fb8643df4 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 8 Jan 2025 18:20:47 +0000 Subject: [PATCH 43/56] fix(deps): update rust crate tokio to v1.43.0 --- Cargo.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index bf306a2..e808c62 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1103,9 +1103,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" [[package]] name = "libc" -version = "0.2.161" +version = "0.2.169" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e9489c2807c139ffd9c1794f4af0ebe86a828db53ecdc7fea2111d0fed085d1" +checksum = "b5aba8db14291edd000dfcc4d620c7ebfb122c613afb886ca8803fa4e128a20a" [[package]] name = "libloading" @@ -2329,9 +2329,9 @@ dependencies = [ [[package]] name = "tokio" -version = "1.42.0" +version = "1.43.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551" +checksum = "3d61fa4ffa3de412bfea335c6ecff681de2b609ba3c77ef3e00e521813a9ed9e" dependencies = [ "backtrace", "bytes", @@ -2347,9 +2347,9 @@ dependencies = [ [[package]] name = "tokio-macros" -version = "2.4.0" +version = "2.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752" +checksum = "6e06d43f1345a3bcd39f6a56dbb7dcab2ba47e68e8ac134855e7e2bdbaf8cab8" dependencies = [ "proc-macro2", "quote", From 8a28a4e7a51a3ee61fe85d7910cb58441840d227 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2025 02:50:24 +0000 Subject: [PATCH 44/56] fix(deps): update rust crate log to v0.4.24 --- Cargo.lock | 146 ++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 144 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 89a4741..a3597d4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -609,6 +609,16 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" +[[package]] +name = "erased-serde" +version = "0.4.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" +dependencies = [ + "serde", + "typeid", +] + [[package]] name = "errno" version = "0.3.9" @@ -1289,9 +1299,12 @@ dependencies = [ [[package]] name = "log" -version = "0.4.22" +version = "0.4.24" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24" +checksum = "3d6ea2a48c204030ee31a7d7fc72c93294c92fe87ecb1789881c9543516e1a0d" +dependencies = [ + "value-bag", +] [[package]] name = "macro_rules_attribute" @@ -2080,6 +2093,15 @@ dependencies = [ "syn", ] +[[package]] +name = "serde_fmt" +version = "1.0.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" +dependencies = [ + "serde", +] + [[package]] name = "serde_json" version = "1.0.135" @@ -2225,6 +2247,84 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" +[[package]] +name = "sval" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f6dc0f9830c49db20e73273ffae9b5240f63c42e515af1da1fceefb69fceafd8" + +[[package]] +name = "sval_buffer" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "429922f7ad43c0ef8fd7309e14d750e38899e32eb7e8da656ea169dd28ee212f" +dependencies = [ + "sval", + "sval_ref", +] + +[[package]] +name = "sval_dynamic" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "68f16ff5d839396c11a30019b659b0976348f3803db0626f736764c473b50ff4" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_fmt" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c01c27a80b6151b0557f9ccbe89c11db571dc5f68113690c1e028d7e974bae94" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_json" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0deef63c70da622b2a8069d8600cf4b05396459e665862e7bdb290fd6cf3f155" +dependencies = [ + "itoa", + "ryu", + "sval", +] + +[[package]] +name = "sval_nested" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a39ce5976ae1feb814c35d290cf7cf8cd4f045782fe1548d6bc32e21f6156e9f" +dependencies = [ + "sval", + "sval_buffer", + "sval_ref", +] + +[[package]] +name = "sval_ref" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bb7c6ee3751795a728bc9316a092023529ffea1783499afbc5c66f5fabebb1fa" +dependencies = [ + "sval", +] + +[[package]] +name = "sval_serde" +version = "2.13.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a5572d0321b68109a343634e3a5d576bf131b82180c6c442dee06349dfc652a" +dependencies = [ + "serde", + "sval", + "sval_nested", +] + [[package]] name = "syn" version = "2.0.87" @@ -2404,6 +2504,12 @@ dependencies = [ "once_cell", ] +[[package]] +name = "typeid" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" + [[package]] name = "typenum" version = "1.17.0" @@ -2545,6 +2651,42 @@ dependencies = [ "utoipa", ] +[[package]] +name = "value-bag" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" +dependencies = [ + "value-bag-serde1", + "value-bag-sval2", +] + +[[package]] +name = "value-bag-serde1" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4bb773bd36fd59c7ca6e336c94454d9c66386416734817927ac93d81cb3c5b0b" +dependencies = [ + "erased-serde", + "serde", + "serde_fmt", +] + +[[package]] +name = "value-bag-sval2" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "53a916a702cac43a88694c97657d449775667bcd14b70419441d05b7fea4a83a" +dependencies = [ + "sval", + "sval_buffer", + "sval_dynamic", + "sval_fmt", + "sval_json", + "sval_ref", + "sval_serde", +] + [[package]] name = "version_check" version = "0.9.5" From a9ea47dc518bc34304bb82259bd677d7fa208d2f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 11 Jan 2025 22:40:29 +0000 Subject: [PATCH 45/56] fix(deps): update rust crate pyo3 to v0.23.4 --- Cargo.lock | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a3597d4..75fb2a7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1751,9 +1751,9 @@ dependencies = [ [[package]] name = "pyo3" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e484fd2c8b4cb67ab05a318f1fd6fa8f199fcc30819f08f07d200809dba26c15" +checksum = "57fe09249128b3173d092de9523eaa75136bf7ba85e0d69eca241c7939c933cc" dependencies = [ "anyhow", "cfg-if", @@ -1770,9 +1770,9 @@ dependencies = [ [[package]] name = "pyo3-build-config" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc0e0469a84f208e20044b98965e1561028180219e35352a2afaf2b942beff3b" +checksum = "1cd3927b5a78757a0d71aa9dff669f903b1eb64b54142a9bd9f757f8fde65fd7" dependencies = [ "once_cell", "target-lexicon", @@ -1780,9 +1780,9 @@ dependencies = [ [[package]] name = "pyo3-ffi" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eb1547a7f9966f6f1a0f0227564a9945fe36b90da5a93b3933fc3dc03fae372d" +checksum = "dab6bb2102bd8f991e7749f130a70d05dd557613e39ed2deeee8e9ca0c4d548d" dependencies = [ "libc", "pyo3-build-config", @@ -1790,9 +1790,9 @@ dependencies = [ [[package]] name = "pyo3-macros" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb6da8ec6fa5cedd1626c886fc8749bdcbb09424a86461eb8cdf096b7c33257" +checksum = "91871864b353fd5ffcb3f91f2f703a22a9797c91b9ab497b1acac7b07ae509c7" dependencies = [ "proc-macro2", "pyo3-macros-backend", @@ -1802,9 +1802,9 @@ dependencies = [ [[package]] name = "pyo3-macros-backend" -version = "0.23.3" +version = "0.23.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38a385202ff5a92791168b1136afae5059d3ac118457bb7bc304c197c2d33e7d" +checksum = "43abc3b80bc20f3facd86cd3c60beed58c3e2aa26213f3cda368de39c60a27e4" dependencies = [ "heck", "proc-macro2", From 5ea2dcff0f9ccbafa749ce0e754c84a3569f8b5d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 14 Jan 2025 12:51:47 +0000 Subject: [PATCH 46/56] fix(deps): update rust crate log to v0.4.25 --- Cargo.lock | 146 +---------------------------------------------------- 1 file changed, 2 insertions(+), 144 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index a3597d4..945541d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -609,16 +609,6 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" -[[package]] -name = "erased-serde" -version = "0.4.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24e2389d65ab4fab27dc2a5de7b191e1f6617d1f1c8855c0dc569c94a4cbb18d" -dependencies = [ - "serde", - "typeid", -] - [[package]] name = "errno" version = "0.3.9" @@ -1299,12 +1289,9 @@ dependencies = [ [[package]] name = "log" -version = "0.4.24" +version = "0.4.25" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6ea2a48c204030ee31a7d7fc72c93294c92fe87ecb1789881c9543516e1a0d" -dependencies = [ - "value-bag", -] +checksum = "04cbf5b083de1c7e0222a7a51dbfdba1cbe1c6ab0b15e29fff3f6c077fd9cd9f" [[package]] name = "macro_rules_attribute" @@ -2093,15 +2080,6 @@ dependencies = [ "syn", ] -[[package]] -name = "serde_fmt" -version = "1.0.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e1d4ddca14104cd60529e8c7f7ba71a2c8acd8f7f5cfcdc2faf97eeb7c3010a4" -dependencies = [ - "serde", -] - [[package]] name = "serde_json" version = "1.0.135" @@ -2247,84 +2225,6 @@ version = "2.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" -[[package]] -name = "sval" -version = "2.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6dc0f9830c49db20e73273ffae9b5240f63c42e515af1da1fceefb69fceafd8" - -[[package]] -name = "sval_buffer" -version = "2.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "429922f7ad43c0ef8fd7309e14d750e38899e32eb7e8da656ea169dd28ee212f" -dependencies = [ - "sval", - "sval_ref", -] - -[[package]] -name = "sval_dynamic" -version = "2.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68f16ff5d839396c11a30019b659b0976348f3803db0626f736764c473b50ff4" -dependencies = [ - "sval", -] - -[[package]] -name = "sval_fmt" -version = "2.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c01c27a80b6151b0557f9ccbe89c11db571dc5f68113690c1e028d7e974bae94" -dependencies = [ - "itoa", - "ryu", - "sval", -] - -[[package]] -name = "sval_json" -version = "2.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0deef63c70da622b2a8069d8600cf4b05396459e665862e7bdb290fd6cf3f155" -dependencies = [ - "itoa", - "ryu", - "sval", -] - -[[package]] -name = "sval_nested" -version = "2.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a39ce5976ae1feb814c35d290cf7cf8cd4f045782fe1548d6bc32e21f6156e9f" -dependencies = [ - "sval", - "sval_buffer", - "sval_ref", -] - -[[package]] -name = "sval_ref" -version = "2.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb7c6ee3751795a728bc9316a092023529ffea1783499afbc5c66f5fabebb1fa" -dependencies = [ - "sval", -] - -[[package]] -name = "sval_serde" -version = "2.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a5572d0321b68109a343634e3a5d576bf131b82180c6c442dee06349dfc652a" -dependencies = [ - "serde", - "sval", - "sval_nested", -] - [[package]] name = "syn" version = "2.0.87" @@ -2504,12 +2404,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "typeid" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0e13db2e0ccd5e14a544e8a246ba2312cd25223f616442d7f2cb0e3db614236e" - [[package]] name = "typenum" version = "1.17.0" @@ -2651,42 +2545,6 @@ dependencies = [ "utoipa", ] -[[package]] -name = "value-bag" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ef4c4aa54d5d05a279399bfa921ec387b7aba77caf7a682ae8d86785b8fdad2" -dependencies = [ - "value-bag-serde1", - "value-bag-sval2", -] - -[[package]] -name = "value-bag-serde1" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4bb773bd36fd59c7ca6e336c94454d9c66386416734817927ac93d81cb3c5b0b" -dependencies = [ - "erased-serde", - "serde", - "serde_fmt", -] - -[[package]] -name = "value-bag-sval2" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53a916a702cac43a88694c97657d449775667bcd14b70419441d05b7fea4a83a" -dependencies = [ - "sval", - "sval_buffer", - "sval_dynamic", - "sval_fmt", - "sval_json", - "sval_ref", - "sval_serde", -] - [[package]] name = "version_check" version = "0.9.5" From 71ec65877260972445f126f6968b0580e7ac5b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tuna2134=40=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA?= =?UTF-8?q?=E8=A1=9B=E9=9A=8A?= Date: Mon, 20 Jan 2025 07:55:03 +0900 Subject: [PATCH 47/56] =?UTF-8?q?CI.yml=20=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 887fc37..049b86b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,7 +27,7 @@ jobs: platform: - runner: ubuntu-latest target: x86_64 - - runner: ubuntu-latest + - runner: ubuntu-24.04-arm target: aarch64 steps: - uses: actions/checkout@v4 From cc664fae2dc87df4f7b3a6180ce2f52dbe4bc787 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tuna2134=40=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA?= =?UTF-8?q?=E8=A1=9B=E9=9A=8A?= Date: Mon, 20 Jan 2025 08:43:05 +0900 Subject: [PATCH 48/56] Update CI.yml --- .github/workflows/CI.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 049b86b..117e96d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -27,7 +27,7 @@ jobs: platform: - runner: ubuntu-latest target: x86_64 - - runner: ubuntu-24.04-arm + - runner: ubuntu-latest target: aarch64 steps: - uses: actions/checkout@v4 @@ -130,7 +130,7 @@ jobs: args: --non-interactive --skip-existing wheels-*/* push-docker: - runs-on: ubuntu-latest + runs-on: ${{ matrix.platform }} if: "startsWith(github.ref, 'refs/tags/')" permissions: contents: read @@ -138,6 +138,7 @@ jobs: strategy: matrix: tag: [cpu, cuda] + platform: [ubuntu-latest, ubuntu-24.04-arm] steps: - uses: actions/checkout@v4 - name: Set up QEMU @@ -158,4 +159,3 @@ jobs: tags: | ghcr.io/${{ github.repository }}:${{ matrix.tag }} file: docker/${{ matrix.tag }}.Dockerfile - platforms: linux/amd64, linux/arm64 From 7095e0ea89bfcb10aebe2e939eb3bf9d1915ee7b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 23:51:54 +0000 Subject: [PATCH 49/56] fix(deps): update rust crate serde_json to v1.0.137 --- Cargo.lock | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 945541d..43cfbfb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2082,9 +2082,9 @@ dependencies = [ [[package]] name = "serde_json" -version = "1.0.135" +version = "1.0.137" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b0d7ba2887406110130a978386c4e1befb98c674b4fba677954e4db976630d9" +checksum = "930cfb6e6abf99298aaad7d29abbef7a9999a9a8806a40088f55f0dcec03146b" dependencies = [ "itoa", "memchr", From d83fcb9f2c251820c9edb97bbfa040f83ab76264 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 19 Jan 2025 23:52:40 +0000 Subject: [PATCH 50/56] fix(deps): update rust crate utoipa-scalar to 0.3.0 --- Cargo.lock | 4 ++-- sbv2_api/Cargo.toml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 477ad4e..bac75b7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2472,9 +2472,9 @@ dependencies = [ [[package]] name = "utoipa-scalar" -version = "0.2.1" +version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "088e93bf19f6bd06e0aacb02ca432b3c5a449c4aec2e4aa9fc333a667f2b2c55" +checksum = "59559e1509172f6b26c1cdbc7247c4ddd1ac6560fe94b584f81ee489b141f719" dependencies = [ "axum", "serde", diff --git a/sbv2_api/Cargo.toml b/sbv2_api/Cargo.toml index 6cddb90..491759b 100644 --- a/sbv2_api/Cargo.toml +++ b/sbv2_api/Cargo.toml @@ -13,7 +13,7 @@ sbv2_core = { version = "0.2.0-alpha2", path = "../sbv2_core", features = ["aivm serde = { version = "1.0.210", features = ["derive"] } tokio = { version = "1.40.0", features = ["full"] } utoipa = { version = "5.0.0", features = ["axum_extras"] } -utoipa-scalar = { version = "0.2.0", features = ["axum"] } +utoipa-scalar = { version = "0.3.0", features = ["axum"] } [features] coreml = ["sbv2_core/coreml"] From 15aef30867766f3344f4b8b9b8ad2642a0bcc260 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tuna2134=40=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA?= =?UTF-8?q?=E8=A1=9B=E9=9A=8A?= Date: Mon, 20 Jan 2025 09:10:07 +0900 Subject: [PATCH 51/56] Update CI.yml --- .github/workflows/CI.yml | 65 +++++++++++++++++++++++++++++++++++++--- 1 file changed, 61 insertions(+), 4 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 117e96d..162cce0 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -129,7 +129,7 @@ jobs: command: upload args: --non-interactive --skip-existing wheels-*/* - push-docker: + build-docker: runs-on: ${{ matrix.platform }} if: "startsWith(github.ref, 'refs/tags/')" permissions: @@ -155,7 +155,64 @@ jobs: uses: docker/build-push-action@v6 with: context: . - push: true - tags: | - ghcr.io/${{ github.repository }}:${{ matrix.tag }} file: docker/${{ matrix.tag }}.Dockerfile + labels: ${{ steps.meta.outputs.labels }} + outputs: type=image,"name=ghcr.io/tuna2134/sbv2-api",push-by-digest=true,name-canonical=true,push=true + + - name: Export digest + run: | + mkdir -p ${{ runner.temp }}/digests + digest="${{ steps.build.outputs.digest }}" + touch "${{ runner.temp }}/digests/${digest#sha256:}" + + - name: Upload digest + uses: actions/upload-artifact@v4 + with: + name: digests-${{ env.PLATFORM_PAIR }} + path: ${{ runner.temp }}/digests/* + if-no-files-found: error + retention-days: 1 + + merge: + runs-on: ubuntu-latest + needs: + - build-docker + steps: + - name: Download digests + uses: actions/download-artifact@v4 + with: + path: ${{ runner.temp }}/digests + pattern: digests-* + merge-multiple: true + + - name: Login to GHCR + uses: docker/login-action@v3 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.GITHUB_TOKEN }} + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: | + ghcr.io/tuna2134/sbv2-api + tags: | + type=ref,event=branch + type=ref,event=pr + type=semver,pattern={{version}} + type=semver,pattern={{major}}.{{minor}} + + - name: Create manifest list and push + working-directory: ${{ runner.temp }}/digests + run: | + docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ + $(printf 'ghcr.io/tuna2134/sbv2-api@sha256:%s ' *) + + - name: Inspect image + run: | + docker buildx imagetools inspect ghcr.io/tuna2134/sbv2-api:${{ steps.meta.outputs.version }} From 033dd99fb66b0f9256c0a761120fac4b4d095225 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tuna2134=40=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA?= =?UTF-8?q?=E8=A1=9B=E9=9A=8A?= Date: Mon, 20 Jan 2025 09:21:38 +0900 Subject: [PATCH 52/56] Update CI.yml --- .github/workflows/CI.yml | 65 +++++++++++++++++++++++++--------------- 1 file changed, 41 insertions(+), 24 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 162cce0..de30f6d 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,6 +18,9 @@ on: permissions: contents: read id-token: write + +env: + GHCR_REPO: ghcr.io/tuna2134/sbv2-api jobs: linux: @@ -129,36 +132,50 @@ jobs: command: upload args: --non-interactive --skip-existing wheels-*/* - build-docker: - runs-on: ${{ matrix.platform }} - if: "startsWith(github.ref, 'refs/tags/')" - permissions: - contents: read - packages: write + build: + runs-on: ${{ matrix.machine.runner }} strategy: + fail-fast: false matrix: - tag: [cpu, cuda] - platform: [ubuntu-latest, ubuntu-24.04-arm] + machine: + - platform: linux/amd64 + runner: ubuntu-latest + - platform: linux/arm64 + runner: ubuntu-24.04-arm64 steps: - - uses: actions/checkout@v4 - - name: Set up QEMU - uses: docker/setup-qemu-action@v3 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v3 - - name: Login to GitHub Container Registry + - name: Prepare + run: | + platform=${{ matrix.machine.platform }} + echo "PLATFORM_PAIR=${platform//\//-}" >> $GITHUB_ENV + + - name: Docker meta + id: meta + uses: docker/metadata-action@v5 + with: + images: | + ${{ env.GHCR_REPO }} + + - name: Login to GHCR uses: docker/login-action@v3 with: registry: ghcr.io - username: ${{ github.actor }} + username: ${{ github.repository_owner }} password: ${{ secrets.GITHUB_TOKEN }} - - name: Build and push image + + - name: Set up QEMU + uses: docker/setup-qemu-action@v3 + + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v3 + + - name: Build and push by digest + id: build uses: docker/build-push-action@v6 with: - context: . - file: docker/${{ matrix.tag }}.Dockerfile + platforms: ${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,"name=ghcr.io/tuna2134/sbv2-api",push-by-digest=true,name-canonical=true,push=true - + outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true + - name: Export digest run: | mkdir -p ${{ runner.temp }}/digests @@ -176,7 +193,7 @@ jobs: merge: runs-on: ubuntu-latest needs: - - build-docker + - build steps: - name: Download digests uses: actions/download-artifact@v4 @@ -200,7 +217,7 @@ jobs: uses: docker/metadata-action@v5 with: images: | - ghcr.io/tuna2134/sbv2-api + ${{ env.GHCR_REPO }} tags: | type=ref,event=branch type=ref,event=pr @@ -211,8 +228,8 @@ jobs: working-directory: ${{ runner.temp }}/digests run: | docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf 'ghcr.io/tuna2134/sbv2-api@sha256:%s ' *) + $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *) - name: Inspect image run: | - docker buildx imagetools inspect ghcr.io/tuna2134/sbv2-api:${{ steps.meta.outputs.version }} + docker buildx imagetools inspect ${{ env.GHCR_REPO }}:${{ steps.meta.outputs.version }} From 95b84ca55be954c6fb189efb54116d305d5cf87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tuna2134=40=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA?= =?UTF-8?q?=E8=A1=9B=E9=9A=8A?= Date: Mon, 20 Jan 2025 09:26:59 +0900 Subject: [PATCH 53/56] Update CI.yml --- .github/workflows/CI.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index de30f6d..30eec2b 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -142,6 +142,7 @@ jobs: runner: ubuntu-latest - platform: linux/arm64 runner: ubuntu-24.04-arm64 + tag: [cpu, cuda] steps: - name: Prepare run: | @@ -175,6 +176,7 @@ jobs: platforms: ${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true + file: docker/${{ matrix.tag }}.Dockerfile - name: Export digest run: | From 2bfca72f41e433a083c341f7a7c68f96d4fdc8c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tuna2134=40=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA?= =?UTF-8?q?=E8=A1=9B=E9=9A=8A?= Date: Mon, 20 Jan 2025 09:40:32 +0900 Subject: [PATCH 54/56] Update CI.yml --- .github/workflows/CI.yml | 50 ++++++++++------------------------------ 1 file changed, 12 insertions(+), 38 deletions(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 30eec2b..34c8741 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -138,9 +138,9 @@ jobs: fail-fast: false matrix: machine: - - platform: linux/amd64 + - platform: amd64 runner: ubuntu-latest - - platform: linux/arm64 + - platform: arm64 runner: ubuntu-24.04-arm64 tag: [cpu, cuda] steps: @@ -173,24 +173,11 @@ jobs: id: build uses: docker/build-push-action@v6 with: - platforms: ${{ matrix.platform }} labels: ${{ steps.meta.outputs.labels }} - outputs: type=image,"name=${{ env.GHCR_REPO }}",push-by-digest=true,name-canonical=true,push=true file: docker/${{ matrix.tag }}.Dockerfile - - - name: Export digest - run: | - mkdir -p ${{ runner.temp }}/digests - digest="${{ steps.build.outputs.digest }}" - touch "${{ runner.temp }}/digests/${digest#sha256:}" - - - name: Upload digest - uses: actions/upload-artifact@v4 - with: - name: digests-${{ env.PLATFORM_PAIR }} - path: ${{ runner.temp }}/digests/* - if-no-files-found: error - retention-days: 1 + push: true + tags: | + ${{ env.GHCR_REPO }}:latest-${{ matrix.tag }}-${{ matrix.machine.platform }} merge: runs-on: ubuntu-latest @@ -214,24 +201,11 @@ jobs: - name: Set up Docker Buildx uses: docker/setup-buildx-action@v3 - - name: Docker meta - id: meta - uses: docker/metadata-action@v5 - with: - images: | - ${{ env.GHCR_REPO }} - tags: | - type=ref,event=branch - type=ref,event=pr - type=semver,pattern={{version}} - type=semver,pattern={{major}}.{{minor}} - - - name: Create manifest list and push - working-directory: ${{ runner.temp }}/digests + - name: Merge run: | - docker buildx imagetools create $(jq -cr '.tags | map("-t " + .) | join(" ")' <<< "$DOCKER_METADATA_OUTPUT_JSON") \ - $(printf '${{ env.GHCR_REPO }}@sha256:%s ' *) - - - name: Inspect image - run: | - docker buildx imagetools inspect ${{ env.GHCR_REPO }}:${{ steps.meta.outputs.version }} + docker buildx imagetools create -t ${{ env.GHCR_REPO }}:cuda \ + ${{ env.GHCR_REPO }}:latest-cuda-amd64 \ + ${{ env.GHCR_REPO }}:latest-cuda-arm64 + docker buildx imagetools create -t ${{ env.GHCR_REPO }}:cpu \ + ${{ env.GHCR_REPO }}:latest-cpu-amd64 \ + ${{ env.GHCR_REPO }}:latest-cpu-arm64 From c2430fc794bf199a9f6bc135464d938075d66b8e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tuna2134=40=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA?= =?UTF-8?q?=E8=A1=9B=E9=9A=8A?= Date: Mon, 20 Jan 2025 09:49:47 +0900 Subject: [PATCH 55/56] Update CI.yml --- .github/workflows/CI.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index 34c8741..da4d05a 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -18,6 +18,7 @@ on: permissions: contents: read id-token: write + packages: write env: GHCR_REPO: ghcr.io/tuna2134/sbv2-api From a1198d6380edccd56acdd8bf22599b3088bdd0a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?tuna2134=40=E3=82=B3=E3=83=9E=E3=83=AA=E3=83=B3=E8=A6=AA?= =?UTF-8?q?=E8=A1=9B=E9=9A=8A?= Date: Wed, 22 Jan 2025 23:18:34 +0900 Subject: [PATCH 56/56] =?UTF-8?q?CI.yml=20=E3=82=92=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/CI.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml index da4d05a..768bba9 100644 --- a/.github/workflows/CI.yml +++ b/.github/workflows/CI.yml @@ -142,7 +142,7 @@ jobs: - platform: amd64 runner: ubuntu-latest - platform: arm64 - runner: ubuntu-24.04-arm64 + runner: ubuntu-24.04-arm tag: [cpu, cuda] steps: - name: Prepare