Skip to content
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
merge upstream main 02f8b43 into PR 3703 Nano timestamp fix
Sync the contributor branch with current upstream main and resolve the model.py import conflict by union (upstream configure_llm_forward plus PR anchor_punctuation_timestamps/forced_align). No code or test changes; tree identical to the reviewed integration.

Signed-off-by: Bruce-Yii <298228875+Bruce-Yii@users.noreply.github.com>
  • Loading branch information
Bruce-Yii committed Sep 22, 2026
commit f7f5c227999668dd325cf85923f07a9ef6786bb3
1 change: 1 addition & 0 deletions funasr/models/fun_asr_nano/model.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
from .ctc import CTC
from .checkpoint_utils import disable_incomplete_ctc, normalize_checkpoint_state
from .device_utils import resolve_autocast_device_type
from .llm_forward_opts import configure_llm_forward
from .tools.utils import anchor_punctuation_timestamps, forced_align

dtype_map = {"bf16": torch.bfloat16, "fp16": torch.float16, "fp32": torch.float32}
Expand Down
Loading
You are viewing a condensed version of this merge commit. You can view the full changes here.