From 855d0cf975d52c447e7fa048ffd3228fc5912023 Mon Sep 17 00:00:00 2001
From: jhqxxx <jhqxxx@163.com>
Date: Thu, 11 Dec 2025 23:30:07 +0800
Subject: [PATCH] update fmt

---
 src/models/voxcpm/audio_vae.rs |  3 ++-
 src/models/voxcpm/generate.rs  | 21 ++++++++++++---------
 src/models/voxcpm/model.rs     |  2 +-
 tests/test_voxcpm.rs           |  2 +-
 tests/test_voxcpm1_5.rs        |  2 +-
 tests/weight_test.rs           |  2 +-
 6 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/models/voxcpm/audio_vae.rs b/src/models/voxcpm/audio_vae.rs
index c7b87e6..1efafb0 100644
--- a/src/models/voxcpm/audio_vae.rs
+++ b/src/models/voxcpm/audio_vae.rs
@@ -444,7 +444,8 @@ impl CausalDecoder {
         }
         let idx = rates.len() + 2;
         let model_minus_2 = Snake1d::new(vb_model.pp(idx), output_dim)?;
-        let model_minus_1 = WNCausalConv1d::new(vb_model.pp(idx+1), output_dim, d_out, 7, 1, 3, 1, 1)?;
+        let model_minus_1 =
+            WNCausalConv1d::new(vb_model.pp(idx + 1), output_dim, d_out, 7, 1, 3, 1, 1)?;
         Ok(Self {
             model0,
             model1,
diff --git a/src/models/voxcpm/generate.rs b/src/models/voxcpm/generate.rs
index 9dfee8a..4781c5b 100644
--- a/src/models/voxcpm/generate.rs
+++ b/src/models/voxcpm/generate.rs
@@ -6,7 +6,9 @@ use candle_nn::VarBuilder;
 
 use crate::{
     models::voxcpm::{
-        audio_vae::AudioVAE, config::{AudioVaeConfig, VoxCPMConfig}, model::VoxCPMModel,
+        audio_vae::AudioVAE,
+        config::{AudioVaeConfig, VoxCPMConfig},
+        model::VoxCPMModel,
         tokenizer::SingleChineseTokenizer,
     },
     utils::{find_type_files, get_device, get_dtype},
@@ -43,8 +45,8 @@ impl VoxCPMGenerate {
                 latent_dim: 64,
                 decoder_dim: 1536,
                 decoder_rates: vec![8, 8, 5, 2],
-                sample_rate: 16000
-            }
+                sample_rate: 16000,
+            },
         };
         let audio_vae = AudioVAE::new(
             vb_vae,
@@ -63,9 +65,9 @@ impl VoxCPMGenerate {
         // voxcpm0.5B模型文件是.bin类型， voxcpm1.5模型文件是.safetensors类型
         let vb_voxcpm = if model_list.is_empty() {
             let model_list = find_type_files(path, "safetensors")?;
-            unsafe { VarBuilder::from_mmaped_safetensors(&model_list, m_dtype, &device)? }
+            unsafe { VarBuilder::from_mmaped_safetensors(&model_list, m_dtype, device)? }
         } else {
-            dict_to_hashmap = HashMap::new();        
+            dict_to_hashmap = HashMap::new();
             let cfg_dtype = config.dtype.as_str();
             let m_dtype = get_dtype(dtype, cfg_dtype);
             for m in model_list {
@@ -141,13 +143,14 @@ impl VoxCPMGenerate {
             1000,
             10,
             2.0,
-            false,
+            // false,
             6.0,
         )?;
         Ok(audio)
     }
     pub fn generate_simple(&mut self, target_text: String) -> Result<Tensor> {
-        let audio = self.generate(target_text, None, None, 2, 100, 10, 2.0, false, 6.0)?;
+        // let audio = self.generate(target_text, None, None, 2, 100, 10, 2.0, false, 6.0)?;
+        let audio = self.generate(target_text, None, None, 2, 100, 10, 2.0, 6.0)?;
         Ok(audio)
     }
     pub fn generate(
@@ -159,7 +162,7 @@ impl VoxCPMGenerate {
         max_len: usize,
         inference_timesteps: usize,
         cfg_value: f64,
-        retry_badcase: bool,
+        // retry_badcase: bool,
         retry_badcase_ratio_threshold: f64,
     ) -> Result<Tensor> {
         let audio = self.voxcpm.generate(
@@ -170,7 +173,7 @@ impl VoxCPMGenerate {
             max_len,
             inference_timesteps,
             cfg_value,
-            retry_badcase,
+            // retry_badcase,
             retry_badcase_ratio_threshold,
         )?;
         Ok(audio)
diff --git a/src/models/voxcpm/model.rs b/src/models/voxcpm/model.rs
index 8f4e474..cd481c8 100644
--- a/src/models/voxcpm/model.rs
+++ b/src/models/voxcpm/model.rs
@@ -486,7 +486,7 @@ impl VoxCPMModel {
         max_len: usize,
         inference_timesteps: usize,
         cfg_value: f64,
-        retry_badcase: bool,
+        // retry_badcase: bool,
         retry_badcase_ratio_threshold: f64,
     ) -> Result<Tensor> {
         let (text_token, text_mask, audio_feat, audio_mask) = match prompt_wav_path {
diff --git a/tests/test_voxcpm.rs b/tests/test_voxcpm.rs
index ab37ae3..290e9b1 100644
--- a/tests/test_voxcpm.rs
+++ b/tests/test_voxcpm.rs
@@ -28,7 +28,7 @@ fn voxcpm_generate() -> Result<()> {
         100,
         10,
         2.0,
-        false,
+        // false,
         6.0,
     )?;
 
diff --git a/tests/test_voxcpm1_5.rs b/tests/test_voxcpm1_5.rs
index fd0a6f9..29332f9 100644
--- a/tests/test_voxcpm1_5.rs
+++ b/tests/test_voxcpm1_5.rs
@@ -28,7 +28,7 @@ fn voxcpm1_5_generate() -> Result<()> {
         4096,
         10,
         2.0,
-        false,
+        // false,
         6.0,
     )?;
 
diff --git a/tests/weight_test.rs b/tests/weight_test.rs
index 71dc0d5..dc98c68 100644
--- a/tests/weight_test.rs
+++ b/tests/weight_test.rs
@@ -62,7 +62,7 @@ fn voxcpm1_5_weight() -> Result<()> {
             dict_to_hashmap.insert(k, v);
         }
     }
-    
+
     Ok(())
 }