From 9dc55ac15fa3250890bd4f2071cfe5f8c6d17b5a Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 13:48:34 +0900 Subject: [PATCH 01/20] refactor parts for flamegraph analysis --- src/mlpg_adjust/mlpg.rs | 17 +++++++---- src/mlpg_adjust/mod.rs | 67 +++++++++++++++++++++++------------------ 2 files changed, 49 insertions(+), 35 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index 5b1d2fa..39aba24 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -114,6 +114,15 @@ impl MlpgMatrix { par } + fn calculate_gv_switch(gv_switch: &[bool], durations: &[usize], mask: &[bool]) -> Vec { + gv_switch + .iter() + .copied() + .duration(durations) + .filter_by(mask) + .collect() + } + /// Solve the equasion, and if necessary, applies GV (global variance). pub fn par( &mut self, @@ -126,12 +135,8 @@ impl MlpgMatrix { if let Some((gv_param, gv_switch)) = gv { let mtx_before = self.clone(); let par = self.solve(); - let gv_switch: Vec<_> = gv_switch - .iter() - .copied() - .duration(durations) - .filter_by(msd_flag.mask()) - .collect(); + let gv_switch: Vec<_> = + Self::calculate_gv_switch(gv_switch, durations, msd_flag.mask()); let mgv = MlpgGlobalVariance::new(mtx_before, par, &gv_switch); let MeanVari(gv_mean, gv_vari) = gv_param[vector_index]; diff --git a/src/mlpg_adjust/mod.rs b/src/mlpg_adjust/mod.rs index 017fe66..e02e8f9 100644 --- a/src/mlpg_adjust/mod.rs +++ b/src/mlpg_adjust/mod.rs @@ -54,35 +54,8 @@ impl<'a> MlpgAdjust<'a> { let mut pars = vec![vec![0.0; self.vector_length]; msd_flag.mask().len()]; for vector_index in 0..self.vector_length { - let parameters: Vec> = self - .windows - .iter() - .enumerate() - .map(|(window_index, window)| { - let m = self.vector_length * window_index + vector_index; - - self.stream - .iter() - .map(|(curr_stream, _)| curr_stream[m].with_ivar()) - .duration(durations) - .zip(&msd_boundaries) - .map(|(mean_ivar, (left, right))| { - let is_left_msd_boundary = *left < window.left_width(); - let is_right_msd_boundary = *right < window.right_width(); - - // If the window includes non-msd frames, set the ivar to 0.0 - if (is_left_msd_boundary || is_right_msd_boundary) && window_index != 0 - { - mean_ivar.with_0() - } else { - mean_ivar - } - }) - .filter_by(msd_flag.mask()) - .collect() - }) - .collect(); - + let parameters = + self.create_parameters(vector_index, durations, &msd_boundaries, msd_flag.mask()); let mut mtx = MlpgMatrix::calc_wuw_and_wum(self.windows, parameters); let par = mtx.par(&self.gv, vector_index, self.gv_weight, durations, &msd_flag); @@ -93,6 +66,42 @@ impl<'a> MlpgAdjust<'a> { pars } + + #[inline(never)] + fn create_parameters( + &self, + vector_index: usize, + durations: &[usize], + msd_boundaries: &[(usize, usize)], + mask: &[bool], + ) -> Vec> { + self.windows + .iter() + .enumerate() + .map(|(window_index, window)| { + let m = self.vector_length * window_index + vector_index; + + self.stream + .iter() + .map(|(curr_stream, _)| curr_stream[m].with_ivar()) + .duration(durations) + .zip(msd_boundaries) + .map(|(mean_ivar, (left, right))| { + let is_left_msd_boundary = *left < window.left_width(); + let is_right_msd_boundary = *right < window.right_width(); + + // If the window includes non-msd frames, set the ivar to 0.0 + if (is_left_msd_boundary || is_right_msd_boundary) && window_index != 0 { + mean_ivar.with_0() + } else { + mean_ivar + } + }) + .filter_by(mask) + .collect() + }) + .collect() + } } trait IterExt: Iterator { From 41217bdbbe3ec472ac3ac1b37e7101cff1b9db32 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 14:38:55 +0900 Subject: [PATCH 02/20] flatten wuw --- src/mlpg_adjust/mlpg.rs | 78 +++++++++++++++++++++++------------------ 1 file changed, 43 insertions(+), 35 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index 39aba24..60def4b 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -15,7 +15,7 @@ pub struct MlpgMatrix { win_size: usize, length: usize, width: usize, - wuw: Vec>, + wuw: Vec, wum: Vec, } @@ -25,13 +25,10 @@ impl MlpgMatrix { pub fn calc_wuw_and_wum(windows: &Windows, parameters: Vec>) -> Self { let length = parameters[0].len(); let width = windows.max_width() * 2 + 1; - let mut wum = Vec::with_capacity(length); - let mut wuw = Vec::with_capacity(length); + let mut wum = vec![0.0; length]; + let mut wuw = vec![0.0; length * width]; for t in 0..length { - wuw.push(vec![0.0; width]); - wum.push(0.0); - for (i, window) in windows.iter().enumerate() { for (index, coef) in window.iter_rev(0) { if coef == 0.0 { @@ -54,7 +51,7 @@ impl MlpgMatrix { break; } - wuw[t][j] += wu * coef; + wuw[t * width + j] += wu * coef; } } } @@ -77,37 +74,44 @@ impl MlpgMatrix { /// Perform Cholesky decomposition. fn ldl_factorization(&mut self) { - for t in 0..self.length { - for i in 1..self.width.min(t + 1) { - self.wuw[t][0] -= self.wuw[t - i][i] * self.wuw[t - i][i] * self.wuw[t - i][0]; + let Self { width, length, .. } = *self; + let wuw = &mut self.wuw[..length * width]; + for t in 0..length { + for i in 1..width.min(t + 1) { + wuw[width * t] -= + wuw[(t - i) * width + i] * wuw[(t - i) * width + i] * wuw[(t - i) * width]; } - for i in 1..self.width { - for j in 1..(self.width - i).min(t + 1) { - self.wuw[t][i] -= - self.wuw[t - j][j] * self.wuw[t - j][i + j] * self.wuw[t - j][0]; + for i in 1..width { + for j in 1..(width - i).min(t + 1) { + wuw[width * t + i] -= wuw[(t - j) * width + j] + * wuw[(t - j) * width + i + j] + * wuw[(t - j) * width]; } - self.wuw[t][i] /= self.wuw[t][0]; + wuw[width * t + i] /= wuw[width * t]; } } } /// Forward & backward substitution. fn substitutions(&self) -> Vec { + let Self { width, length, .. } = *self; + let wum = &self.wum[..length]; + let wuw = &self.wuw[..length * width]; let mut g = vec![0.0; self.length]; // forward - for t in 0..self.length { - g[t] = self.wum[t]; - for i in 1..self.width.min(t + 1) { - g[t] -= self.wuw[t - i][i] * g[t - i]; + for t in 0..length { + g[t] = wum[t]; + for i in 1..width.min(t + 1) { + g[t] -= wuw[(t - i) * width + i] * g[t - i]; } } let mut par = vec![0.0; self.length]; // backward for t in (0..self.length).rev() { - par[t] = g[t] / self.wuw[t][0]; - for i in 1..self.width.min(self.length - t) { - par[t] -= self.wuw[t][i] * par[t + i]; + par[t] = g[t] / wuw[t * width]; + for i in 1..width.min(length - t) { + par[t] -= wuw[t * width + i] * par[t + i]; } } @@ -207,17 +211,19 @@ impl<'a> MlpgGlobalVariance<'a> { .for_each(|(p, _)| *p = ratio * (*p - mean) + mean); } fn calc_hmmobj_derivative(&self) -> (f64, Vec) { - let mut g = vec![0.0; self.mtx.length]; + let MlpgMatrix { width, length, .. } = self.mtx; + let wuw = &self.mtx.wuw[..length * width]; - #[allow(clippy::needless_range_loop)] - for t in 0..self.mtx.length { - g[t] = self.mtx.wuw[t][0] * self.par[t]; - for i in 1..self.mtx.width { - if t + i < self.mtx.length { - g[t] += self.mtx.wuw[t][i] * self.par[t + i]; + let mut g = vec![0.0; length]; + + for t in 0..length { + g[t] = wuw[t * width] * self.par[t]; + for i in 1..width { + if t + i < length { + g[t] += wuw[t * width + i] * self.par[t + i]; } if t + 1 > i { - g[t] += self.mtx.wuw[t - i][i] * self.par[t - i]; + g[t] += wuw[(t - i) * width + i] * self.par[t - i]; } } } @@ -241,21 +247,23 @@ impl<'a> MlpgGlobalVariance<'a> { gv_mean: f64, gv_vari: f64, ) { - let length = self.mtx.length; + let MlpgMatrix { width, length, .. } = self.mtx; let w = 1.0 / ((self.mtx.win_size * length) as f64); let dv = -2.0 * gv_vari * (vari - gv_mean) / self.mtx.length as f64; - #[allow(clippy::needless_range_loop)] + let wum = &self.mtx.wum[..length]; + let wuw = &self.mtx.wuw[..length * width]; + for t in 0..length { - let h = -W1 * w * self.mtx.wuw[t][0] + let h = -W1 * w * wuw[t * width] - W2 * 2.0 / (length * length) as f64 * ((length - 1) as f64 * gv_vari * (vari - gv_mean) + 2.0 * gv_vari * (self.par[t] - mean) * (self.par[t] - mean)); let next_g = if self.gv_switch[t] { - 1.0 / h * (W1 * w * (-g[t] + self.mtx.wum[t]) + W2 * dv * (self.par[t] - mean)) + 1.0 / h * (W1 * w * (-g[t] + wum[t]) + W2 * dv * (self.par[t] - mean)) } else { - 1.0 / h * (W1 * w * (-g[t] + self.mtx.wum[t])) + 1.0 / h * (W1 * w * (-g[t] + wum[t])) }; self.par[t] += step * next_g; From 1a6db34bfefa2a0432869f429903d661c75c8e34 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 15:00:33 +0900 Subject: [PATCH 03/20] pre-index slices --- src/mlpg_adjust/mlpg.rs | 26 +++++++++++++++++--------- 1 file changed, 17 insertions(+), 9 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index 60def4b..19bd9f6 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -210,30 +210,38 @@ impl<'a> MlpgGlobalVariance<'a> { .filter(|(_, sw)| **sw) .for_each(|(p, _)| *p = ratio * (*p - mean) + mean); } + #[inline(never)] fn calc_hmmobj_derivative(&self) -> (f64, Vec) { - let MlpgMatrix { width, length, .. } = self.mtx; + let MlpgMatrix { + width, + length, + win_size, + .. + } = self.mtx; let wuw = &self.mtx.wuw[..length * width]; + let wum = &self.mtx.wum[..length]; + let par = &self.par[..length]; let mut g = vec![0.0; length]; for t in 0..length { - g[t] = wuw[t * width] * self.par[t]; + g[t] = wuw[t * width] * par[t]; for i in 1..width { - if t + i < length { - g[t] += wuw[t * width + i] * self.par[t + i]; + if i < length - t { + g[t] += wuw[t * width + i] * par[t + i]; } - if t + 1 > i { - g[t] += wuw[(t - i) * width + i] * self.par[t - i]; + if i < t + 1 { + g[t] += wuw[(t - i) * width + i] * par[t - i]; } } } - let w = 1.0 / ((self.mtx.win_size * self.mtx.length) as f64); + let w = 1.0 / ((win_size * length) as f64); let mut hmmobj = 0.0; #[allow(clippy::needless_range_loop)] - for t in 0..self.mtx.length { - hmmobj += W1 * w * self.par[t] * (self.mtx.wum[t] - 0.5 * g[t]); + for t in 0..length { + hmmobj += W1 * w * par[t] * (wum[t] - 0.5 * g[t]); } (hmmobj, g) From 876d1421a11bfc058b481a7bf93c963c3233a7ed Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 15:01:13 +0900 Subject: [PATCH 04/20] separate loop --- src/mlpg_adjust/mlpg.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index 19bd9f6..d737f3e 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -230,6 +230,11 @@ impl<'a> MlpgGlobalVariance<'a> { if i < length - t { g[t] += wuw[t * width + i] * par[t + i]; } + } + } + + for t in 0..length { + for i in 1..width { if i < t + 1 { g[t] += wuw[(t - i) * width + i] * par[t - i]; } From dab1fddce6da9cf9779d1d2d56261ebf9e1a4373 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 15:43:51 +0900 Subject: [PATCH 05/20] offset loop variable --- src/mlpg_adjust/mlpg.rs | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index d737f3e..b0c71aa 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -233,10 +233,14 @@ impl<'a> MlpgGlobalVariance<'a> { } } - for t in 0..length { + // u = t - i + // i < t + 1 -> u >= 0 + // i > 0, t < length -> u < length + // t < length -> i < length - u + for u in 0..length { for i in 1..width { - if i < t + 1 { - g[t] += wuw[(t - i) * width + i] * par[t - i]; + if i < length - u { + g[u + i] += wuw[u * width + i] * par[u]; } } } From 659ffa192413fedbfec819eba8de5ac4ff305916 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 15:45:40 +0900 Subject: [PATCH 06/20] rename variable --- src/mlpg_adjust/mlpg.rs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index b0c71aa..bb37c68 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -233,14 +233,10 @@ impl<'a> MlpgGlobalVariance<'a> { } } - // u = t - i - // i < t + 1 -> u >= 0 - // i > 0, t < length -> u < length - // t < length -> i < length - u - for u in 0..length { + for t in 0..length { for i in 1..width { - if i < length - u { - g[u + i] += wuw[u * width + i] * par[u]; + if i < length - t { + g[t + i] += wuw[t * width + i] * par[t]; } } } From 666543b664be814e9946855cca0d52ba092dd936 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 15:48:22 +0900 Subject: [PATCH 07/20] merge loops --- src/mlpg_adjust/mlpg.rs | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index bb37c68..c30d547 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -225,17 +225,10 @@ impl<'a> MlpgGlobalVariance<'a> { let mut g = vec![0.0; length]; for t in 0..length { - g[t] = wuw[t * width] * par[t]; + g[t] += wuw[t * width] * par[t]; for i in 1..width { if i < length - t { g[t] += wuw[t * width + i] * par[t + i]; - } - } - } - - for t in 0..length { - for i in 1..width { - if i < length - t { g[t + i] += wuw[t * width + i] * par[t]; } } From 4becea0dfe02546c6881efc5eb897063c1086d12 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 16:11:04 +0900 Subject: [PATCH 08/20] chunks_exact --- src/mlpg_adjust/mlpg.rs | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index c30d547..b11b726 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -218,18 +218,20 @@ impl<'a> MlpgGlobalVariance<'a> { win_size, .. } = self.mtx; - let wuw = &self.mtx.wuw[..length * width]; + assert!(width >= 1); // required for `wuw[0]` access + let wuw = self.mtx.wuw.chunks_exact(width); let wum = &self.mtx.wum[..length]; let par = &self.par[..length]; let mut g = vec![0.0; length]; - for t in 0..length { - g[t] += wuw[t * width] * par[t]; + // .zip(0..length) to help optimizer recognize t < length + for (wuw, t) in wuw.zip(0..length) { + g[t] += wuw[0] * par[t]; for i in 1..width { - if i < length - t { - g[t] += wuw[t * width + i] * par[t + i]; - g[t + i] += wuw[t * width + i] * par[t]; + if t + i < length { + g[t] += wuw[i] * par[t + i]; + g[t + i] += wuw[i] * par[t]; } } } From 9a8d404134751c043b19b4f481cc2c7d7c14a78e Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 16:21:33 +0900 Subject: [PATCH 09/20] remove unnecessary allow() --- src/mlpg_adjust/mlpg.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index b11b726..46d234d 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -239,7 +239,6 @@ impl<'a> MlpgGlobalVariance<'a> { let w = 1.0 / ((win_size * length) as f64); let mut hmmobj = 0.0; - #[allow(clippy::needless_range_loop)] for t in 0..length { hmmobj += W1 * w * par[t] * (wum[t] - 0.5 * g[t]); } From 9773849cd3628226a1400bacb162854b8e0575d6 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 16:36:44 +0900 Subject: [PATCH 10/20] mean_quad - mean^2 --- src/lib.rs | 2 +- src/mlpg_adjust/mlpg.rs | 27 +++++++++++---------------- 2 files changed, 12 insertions(+), 17 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 89aec0e..0160721 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -127,7 +127,7 @@ mod tests { assert_eq!(speech.len(), 100800); approx::assert_abs_diff_eq!(speech[2000], 17.15977345625943, epsilon = 1.0e-10); - approx::assert_abs_diff_eq!(speech[30000], 2566.2058730889985, epsilon = 1.0e-10); + approx::assert_abs_diff_eq!(speech[30000], 2566.205873089253, epsilon = 1.0e-10); approx::assert_abs_diff_eq!(speech[70000], -1898.2890228814217, epsilon = 1.0e-10); approx::assert_abs_diff_eq!(speech[100799], -13.514971382534956, epsilon = 1.0e-10); } diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index 46d234d..23c6c66 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -180,23 +180,18 @@ impl<'a> MlpgGlobalVariance<'a> { } fn calc_gv(&self) -> (f64, f64) { - let mean = self - .par - .iter() - .zip(self.gv_switch.iter()) - .filter(|(_, sw)| **sw) - .map(|(p, _)| *p) - .sum::() - / self.gv_length as f64; - let vari = self - .par - .iter() - .zip(self.gv_switch.iter()) - .filter(|(_, sw)| **sw) - .map(|(p, _)| (*p - mean) * (*p - mean)) - .sum::() - / self.gv_length as f64; + let mut sum = 0.0; + let mut sum_quad = 0.0; + + for (par, sw) in std::iter::zip(&self.par, self.gv_switch) { + if *sw { + sum += *par; + sum_quad += *par * *par; + } + } + let mean = sum / self.gv_length as f64; + let vari = (sum_quad / self.gv_length as f64) - (mean * mean); (mean, vari) } From d6bd07db08edab1f503ed29afc5f4dec5f2cf705 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 16:45:39 +0900 Subject: [PATCH 11/20] for_each -> for --- src/mlpg_adjust/mlpg.rs | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index 23c6c66..5b576c5 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -199,11 +199,12 @@ impl<'a> MlpgGlobalVariance<'a> { fn conv_gv(&mut self, gv_mean: f64) { let (mean, vari) = self.calc_gv(); let ratio = (gv_mean / vari).sqrt(); - self.par - .iter_mut() - .zip(self.gv_switch.iter()) - .filter(|(_, sw)| **sw) - .for_each(|(p, _)| *p = ratio * (*p - mean) + mean); + + for (par, sw) in std::iter::zip(&mut self.par, self.gv_switch) { + if *sw { + *par = ratio * (*par - mean) + mean; + } + } } #[inline(never)] fn calc_hmmobj_derivative(&self) -> (f64, Vec) { From 28e7b1c1ba70bdda1100be499ace0a2a4f7e6b52 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 17:09:41 +0900 Subject: [PATCH 12/20] pre-index slices --- src/mlpg_adjust/mlpg.rs | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index 5b576c5..bc4df87 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -243,7 +243,7 @@ impl<'a> MlpgGlobalVariance<'a> { } fn next_step( &mut self, - g: Vec, + g: &[f64], step: f64, mean: f64, vari: f64, @@ -255,21 +255,26 @@ impl<'a> MlpgGlobalVariance<'a> { let w = 1.0 / ((self.mtx.win_size * length) as f64); let dv = -2.0 * gv_vari * (vari - gv_mean) / self.mtx.length as f64; + assert!(width >= 1); // required for `wuw[0]` access + let wuw = self.mtx.wuw.chunks_exact(width); let wum = &self.mtx.wum[..length]; - let wuw = &self.mtx.wuw[..length * width]; + let par = &mut self.par[..length]; + let gv_switch = &self.gv_switch[..length]; + let g = &g[..length]; - for t in 0..length { - let h = -W1 * w * wuw[t * width] + // .zip(0..length) to help optimizer recognize t < length + for (wuw, t) in wuw.zip(0..length) { + let h = -W1 * w * wuw[0] - W2 * 2.0 / (length * length) as f64 * ((length - 1) as f64 * gv_vari * (vari - gv_mean) - + 2.0 * gv_vari * (self.par[t] - mean) * (self.par[t] - mean)); - let next_g = if self.gv_switch[t] { - 1.0 / h * (W1 * w * (-g[t] + wum[t]) + W2 * dv * (self.par[t] - mean)) + + 2.0 * gv_vari * (par[t] - mean) * (par[t] - mean)); + let next_g = if gv_switch[t] { + 1.0 / h * (W1 * w * (-g[t] + wum[t]) + W2 * dv * (par[t] - mean)) } else { 1.0 / h * (W1 * w * (-g[t] + wum[t])) }; - self.par[t] += step * next_g; + par[t] += step * next_g; } } @@ -301,7 +306,7 @@ impl<'a> MlpgGlobalVariance<'a> { } } - self.next_step(g, step, mean, vari, gv_mean, gv_vari); + self.next_step(&g, step, mean, vari, gv_mean, gv_vari); prev = obj; } From 2387e399ab2ed7e3099702f4bd293b2eb895a327 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 22:31:52 +0900 Subject: [PATCH 13/20] remove unnecessary inline(never) --- src/mlpg_adjust/mlpg.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index bc4df87..8d1cbf2 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -206,7 +206,6 @@ impl<'a> MlpgGlobalVariance<'a> { } } } - #[inline(never)] fn calc_hmmobj_derivative(&self) -> (f64, Vec) { let MlpgMatrix { width, From 5befc9dd8c263621686ffadeb2a2bf9c8dde6799 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Mon, 17 Nov 2025 22:52:52 +0900 Subject: [PATCH 14/20] refactor --- src/mlpg_adjust/mlpg.rs | 7 ++++--- src/model/voice/window.rs | 11 ++++++++++- 2 files changed, 14 insertions(+), 4 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index 8d1cbf2..b6a95d4 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -29,7 +29,7 @@ impl MlpgMatrix { let mut wuw = vec![0.0; length * width]; for t in 0..length { - for (i, window) in windows.iter().enumerate() { + for (window, parameter) in std::iter::zip(windows, ¶meters) { for (index, coef) in window.iter_rev(0) { if coef == 0.0 { continue; @@ -39,8 +39,9 @@ impl MlpgMatrix { if idx < 0 || idx >= length as isize { continue; } - let wu = coef * parameters[i][idx as usize].1; - wum[t] += wu * parameters[i][idx as usize].0; + let MeanVari(mean, vari) = parameter[idx as usize]; + let wu = coef * vari; + wum[t] += wu * mean; for (inner_index, coef) in window.iter_rev(index.index()) { if coef == 0.0 { diff --git a/src/model/voice/window.rs b/src/model/voice/window.rs index 78af8d0..bf2050d 100644 --- a/src/model/voice/window.rs +++ b/src/model/voice/window.rs @@ -11,7 +11,7 @@ impl Windows { } pub fn iter(&self) -> impl '_ + Iterator { - self.windows.iter() + self.into_iter() } pub fn size(&self) -> usize { self.windows.len() @@ -21,6 +21,15 @@ impl Windows { } } +impl<'a> IntoIterator for &'a Windows { + type Item = &'a Window; + type IntoIter = std::slice::Iter<'a, Window>; + + fn into_iter(self) -> Self::IntoIter { + self.windows.iter() + } +} + #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] pub struct Window { coefficients: Vec, From 57a4982d19e6064b690495c783f886df87b44c3e Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Tue, 18 Nov 2025 11:51:37 +0900 Subject: [PATCH 15/20] replace WindowIndex with isize --- src/mlpg_adjust/mlpg.rs | 8 ++++---- src/mlpg_adjust/mod.rs | 5 +++-- src/model/voice/window.rs | 31 +++++++++++++------------------ 3 files changed, 20 insertions(+), 24 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index b6a95d4..a82fa5e 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -30,12 +30,12 @@ impl MlpgMatrix { for t in 0..length { for (window, parameter) in std::iter::zip(windows, ¶meters) { - for (index, coef) in window.iter_rev(0) { + for (index, coef) in window.iter_rev(window.left_width()) { if coef == 0.0 { continue; } - let idx = (t as isize) - index.position(); + let idx = (t as isize) - index; if idx < 0 || idx >= length as isize { continue; } @@ -43,11 +43,11 @@ impl MlpgMatrix { let wu = coef * vari; wum[t] += wu * mean; - for (inner_index, coef) in window.iter_rev(index.index()) { + for (inner_index, coef) in window.iter_rev(index) { if coef == 0.0 { continue; } - let j = inner_index.index() - index.index(); + let j = (inner_index - index) as usize; if t + j >= length { break; } diff --git a/src/mlpg_adjust/mod.rs b/src/mlpg_adjust/mod.rs index e02e8f9..fe9f820 100644 --- a/src/mlpg_adjust/mod.rs +++ b/src/mlpg_adjust/mod.rs @@ -87,8 +87,9 @@ impl<'a> MlpgAdjust<'a> { .duration(durations) .zip(msd_boundaries) .map(|(mean_ivar, (left, right))| { - let is_left_msd_boundary = *left < window.left_width(); - let is_right_msd_boundary = *right < window.right_width(); + // TODO: migrate msd_boundaries to isize + let is_left_msd_boundary = *left < (-window.left_width()) as usize; + let is_right_msd_boundary = *right < window.right_width() as usize; // If the window includes non-msd frames, set the ivar to 0.0 if (is_left_msd_boundary || is_right_msd_boundary) && window_index != 0 { diff --git a/src/model/voice/window.rs b/src/model/voice/window.rs index bf2050d..ea50f7a 100644 --- a/src/model/voice/window.rs +++ b/src/model/voice/window.rs @@ -40,14 +40,13 @@ impl Window { Self { coefficients } } - pub fn iter_rev(&self, start: usize) -> impl '_ + Iterator { - let width = self.width(); - self.coefficients[start..] + #[inline(always)] + pub fn iter_rev(&self, start: isize) -> impl '_ + Iterator { + self.coefficients[(start - self.left_width()) as usize..] .iter() .enumerate() .rev() - .zip(std::iter::repeat((start, width))) - .map(|((idx, coef), (start, width))| (WindowIndex::new(start + idx, width), *coef)) + .map(move |(idx, coef)| (idx as isize + start, *coef)) } #[inline] @@ -55,12 +54,12 @@ impl Window { self.coefficients.len() } #[inline] - pub fn left_width(&self) -> usize { - self.width() / 2 + pub fn left_width(&self) -> isize { + -(self.width() as isize / 2) } #[inline] - pub fn right_width(&self) -> usize { - self.width() - self.left_width() - 1 + pub fn right_width(&self) -> isize { + self.width() as isize + self.left_width() - 1 } } @@ -101,25 +100,21 @@ mod tests { fn width_3() { let window = Window::new(vec![-1.0, 0.0, 1.0]); assert_eq!(window.width(), 3); - assert_eq!(window.left_width(), 1); + assert_eq!(window.left_width(), -1); assert_eq!(window.right_width(), 1); } #[test] fn iterator() { let window = Window::new(vec![-1.0, 0.0, 1.0]); - let iterated = window.iter_rev(0).collect::>(); + let iterated = window.iter_rev(window.left_width()).collect::>(); assert_eq!(iterated[2].1, -1.0); assert_eq!(iterated[1].1, 0.0); assert_eq!(iterated[0].1, 1.0); - assert_eq!(iterated[2].0.index(), 0); - assert_eq!(iterated[1].0.index(), 1); - assert_eq!(iterated[0].0.index(), 2); - - assert_eq!(iterated[2].0.position(), -1); - assert_eq!(iterated[1].0.position(), 0); - assert_eq!(iterated[0].0.position(), 1); + assert_eq!(iterated[2].0, -1); + assert_eq!(iterated[1].0, 0); + assert_eq!(iterated[0].0, 1); } } From 1c0bea9204104395ed8d43a1a8a3653e4c6fbfb8 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Wed, 19 Nov 2025 01:50:20 +0900 Subject: [PATCH 16/20] swap loop --- src/mlpg_adjust/mlpg.rs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index a82fa5e..cc3bce5 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -28,8 +28,10 @@ impl MlpgMatrix { let mut wum = vec![0.0; length]; let mut wuw = vec![0.0; length * width]; - for t in 0..length { - for (window, parameter) in std::iter::zip(windows, ¶meters) { + for (window, parameter) in std::iter::zip(windows, ¶meters) { + let parameter = ¶meter[..length]; + + for t in 0..length { for (index, coef) in window.iter_rev(window.left_width()) { if coef == 0.0 { continue; From 2b1c086a03bcf21a300b183208fd99da7ea8de9b Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Wed, 19 Nov 2025 01:59:03 +0900 Subject: [PATCH 17/20] no rev --- src/lib.rs | 4 ++-- src/mlpg_adjust/mlpg.rs | 4 ++-- src/model/voice/window.rs | 13 ++++++------- 3 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 0160721..c83e510 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -87,7 +87,7 @@ mod tests { assert_eq!(speech.len(), 74880); approx::assert_abs_diff_eq!(speech[2000], 2.3158134981607754e-5, epsilon = 1.0e-10); - approx::assert_abs_diff_eq!(speech[30000], 6459.375032316974, epsilon = 1.0e-10); + approx::assert_abs_diff_eq!(speech[30000], 6459.375032318177, epsilon = 1.0e-10); } // これ,名詞,代名詞,一般,*,*,*,これ,コレ,コレ,0/2,C3,-1 @@ -127,7 +127,7 @@ mod tests { assert_eq!(speech.len(), 100800); approx::assert_abs_diff_eq!(speech[2000], 17.15977345625943, epsilon = 1.0e-10); - approx::assert_abs_diff_eq!(speech[30000], 2566.205873089253, epsilon = 1.0e-10); + approx::assert_abs_diff_eq!(speech[30000], 2566.205873089126, epsilon = 1.0e-10); approx::assert_abs_diff_eq!(speech[70000], -1898.2890228814217, epsilon = 1.0e-10); approx::assert_abs_diff_eq!(speech[100799], -13.514971382534956, epsilon = 1.0e-10); } diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index cc3bce5..bacdbb0 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -32,7 +32,7 @@ impl MlpgMatrix { let parameter = ¶meter[..length]; for t in 0..length { - for (index, coef) in window.iter_rev(window.left_width()) { + for (index, coef) in window.iter(window.left_width()) { if coef == 0.0 { continue; } @@ -45,7 +45,7 @@ impl MlpgMatrix { let wu = coef * vari; wum[t] += wu * mean; - for (inner_index, coef) in window.iter_rev(index) { + for (inner_index, coef) in window.iter(index) { if coef == 0.0 { continue; } diff --git a/src/model/voice/window.rs b/src/model/voice/window.rs index ea50f7a..10de0b5 100644 --- a/src/model/voice/window.rs +++ b/src/model/voice/window.rs @@ -41,11 +41,10 @@ impl Window { } #[inline(always)] - pub fn iter_rev(&self, start: isize) -> impl '_ + Iterator { + pub fn iter(&self, start: isize) -> impl '_ + Iterator { self.coefficients[(start - self.left_width()) as usize..] .iter() .enumerate() - .rev() .map(move |(idx, coef)| (idx as isize + start, *coef)) } @@ -107,14 +106,14 @@ mod tests { #[test] fn iterator() { let window = Window::new(vec![-1.0, 0.0, 1.0]); - let iterated = window.iter_rev(window.left_width()).collect::>(); + let iterated = window.iter(window.left_width()).collect::>(); - assert_eq!(iterated[2].1, -1.0); + assert_eq!(iterated[0].1, -1.0); assert_eq!(iterated[1].1, 0.0); - assert_eq!(iterated[0].1, 1.0); + assert_eq!(iterated[2].1, 1.0); - assert_eq!(iterated[2].0, -1); + assert_eq!(iterated[0].0, -1); assert_eq!(iterated[1].0, 0); - assert_eq!(iterated[0].0, 1); + assert_eq!(iterated[2].0, 1); } } From d8dcbbcdbcc70a3eca7a9eeed16c6a9d05949309 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Sun, 23 Nov 2025 14:11:16 +0900 Subject: [PATCH 18/20] rename vars --- src/mlpg_adjust/mlpg.rs | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index bacdbb0..ae67e69 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -42,11 +42,10 @@ impl MlpgMatrix { continue; } let MeanVari(mean, vari) = parameter[idx as usize]; - let wu = coef * vari; - wum[t] += wu * mean; + wum[t] += coef * vari * mean; - for (inner_index, coef) in window.iter(index) { - if coef == 0.0 { + for (inner_index, inner_coef) in window.iter(index) { + if inner_coef == 0.0 { continue; } let j = (inner_index - index) as usize; @@ -54,7 +53,7 @@ impl MlpgMatrix { break; } - wuw[t * width + j] += wu * coef; + wuw[t * width + j] += coef * inner_coef * vari; } } } From cca257c656fc21e5cd6a7688cb172741e35e3c14 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Sun, 23 Nov 2025 15:23:01 +0900 Subject: [PATCH 19/20] remove unused guard --- src/mlpg_adjust/mlpg.rs | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/mlpg_adjust/mlpg.rs b/src/mlpg_adjust/mlpg.rs index ae67e69..c5fa7de 100644 --- a/src/mlpg_adjust/mlpg.rs +++ b/src/mlpg_adjust/mlpg.rs @@ -49,10 +49,6 @@ impl MlpgMatrix { continue; } let j = (inner_index - index) as usize; - if t + j >= length { - break; - } - wuw[t * width + j] += coef * inner_coef * vari; } } From ca9223acd372ea6a4b4901938f56647cea23fd61 Mon Sep 17 00:00:00 2001 From: cm-ayf Date: Sat, 29 Nov 2025 12:50:28 +0900 Subject: [PATCH 20/20] temporarily use mlsafir.yml to test performance --- .github/workflows/mlsafir.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/mlsafir.yml b/.github/workflows/mlsafir.yml index 1d305e1..8b35e1b 100644 --- a/.github/workflows/mlsafir.yml +++ b/.github/workflows/mlsafir.yml @@ -3,6 +3,7 @@ on: pull_request: paths: - src/vocoder/mlsa.rs + - src/mlpg_adjust/** jobs: collect: