Codestin Search App

Masao-Someki · 2025-09-12T16:11:36Z

What did you change?

Merge master into espnet3 branch
It contains a required patch for pyopenjtalk to fix CI.

Removed dependency of underthesea from task-tts group.

Why did you make this change?

To fix CI issue in espnet3 branch

The underthesea is not yet supporting installation via pyproject.toml

Is your PR small enough?

No, but no other changes from merging master

Additional Context

…R tasks.

for more information, see https://pre-commit.ci

gemini-code-assist

Code Review

This pull request merges the master branch into espnet3, bringing in a number of updates and new features. Key changes include CI fixes for pyopenjtalk, the addition of a new prompt-based speech-to-text (ps2st) task for Qwen2-Audio models, a new recipe for language identification on VoxLingua107, and several new utilities like a parallel speaker embedding extractor, an automatic code style fixer, and an LLM-based release note generator. My review focuses on the new utility scripts, where I've identified a couple of critical bugs that could cause runtime crashes. The rest of the changes, including new recipes and numerous style fixes, look good.

egs2/TEMPLATE/asr1/pyscripts/utils/extract_spk_embed_parallel.py

utils/apply_code_fixes.py

- Previously versa.done was included

sw005320 · 2025-09-13T00:47:04Z

@Masao-Someki, can you review your fix for the conflict?
I think this includes some mistakes

- It seems setuptools>80 has issue with warprnnt_pytorch

Masao-Someki · 2025-09-13T05:29:38Z

I re-checked the merges, and the only changes I made while resolving conflicts were the following.
I’m not sure why the CI errors are happening now, but it seems they’re related to a pip dependency issue...

diff --cc .github/workflows/ci_on_ubuntu.yml
index 45e72a7404,a8d536bb39..3588c315e7
--- a/.github/workflows/ci_on_ubuntu.yml
+++ b/.github/workflows/ci_on_ubuntu.yml
@@@ -176,9 -175,9 +176,9 @@@ jobs
        max-parallel: 20
        matrix:
          os: [ubuntu-latest]
-         python-version: ["3.10", "3.11"]
 -        python-version: ["3.10"]
 -        pytorch-version: ["2.6.0"]
 -        chainer-version: ["6.0.0"]
++        python-version: ["3.10", "3.12"]
 +        pytorch-version: [2.5.1, 2.6.0, 2.7.1, 2.8.0]
 +        chainer-version: [6.0.0]
          use-conda: [false]
      steps:
        - uses: actions/checkout@master
@@@ -194,10 -193,7 +194,10 @@@
          run: |
            sudo apt-get update -qq
            # NOTE(kamo): g++-7 doesn't exist in ubuntu-latest
--          sudo apt-get install -qq -y cmake libsndfile1-dev bc sox ffmpeg
++          sudo apt-get install -qq -y cmake libsndfile1-dev bc sox ffmpeg libjpeg-dev
 +      - name: Get PR labels
 +        id: pr-labels
 +        uses: joerick/[email protected]
        - name: install espnet
          env:
            ESPNET_PYTHON_VERSION: ${{ matrix.python-version }}

Masao-Someki · 2025-09-13T06:11:50Z

Okay now I understand the error. Previously we used actions/cache@v3 which contains the wheel for underthesea, but since we changed to the newer version (v4) we cannot use that cache.
We can still install the package with setup.py, but it seems the underthesea does not support installation with pyproject.toml as we encounter dependency error with pip. (building this package with pyproject.toml installation requires maturin but it is not in the build requirement.)

Masao-Someki · 2025-09-13T06:23:18Z

In ESPnet-2, this package was only used in a special case (Vietnamese text cleaning) and was therefore not included as a dependency. In ESPnet-3, we introduced task-specific dependencies and added this package to the task-tts group. Since it now causes CI issues and is only needed for Vietnamese TTS, I will remove it from task-tts. I will update the warnings and tutorials for users who require Vietnamese support.

- We removed it because it cause installation error with pyproject.toml

- tests for espnetez was replaced with espnet3

codecov · 2025-09-13T07:05:06Z

Codecov Report

❌ Patch coverage is 59.19732% with 122 lines in your changes missing coverage. Please review.
✅ Project coverage is 55.18%. Comparing base (e681064) to head (87a0df2).
⚠️ Report is 564 commits behind head on espnet3.

Files with missing lines	Patch %	Lines
espnet2/bin/ps2st_inference.py	0.00%	47 Missing ⚠️
espnet2/tasks/ps2st.py	0.00%	36 Missing ⚠️
espnet2/ps2st/espnet_model.py	76.05%	17 Missing ⚠️
espnet2/ps2st/qwen2_scorer.py	75.51%	12 Missing ⚠️
espnet2/text/qwen2audio_tokenizer.py	90.47%	4 Missing ⚠️
espnet2/asr/state_spaces/s4.py	0.00%	2 Missing ⚠️
espnet2/train/lid_trainer.py	0.00%	2 Missing ⚠️
espnet2/tasks/gan_svs.py	0.00%	1 Missing ⚠️
espnet2/text/cleaner.py	80.00%	1 Missing ⚠️

Additional details and impacted files

@@             Coverage Diff             @@
##           espnet3    #6239      +/-   ##
===========================================
+ Coverage    51.97%   55.18%   +3.20%     
===========================================
  Files          875      876       +1     
  Lines        83537    83885     +348     
===========================================
+ Hits         43420    46288    +2868     
+ Misses       40117    37597    -2520

Flag	Coverage Δ
test_integration_espnet2	`46.18% <53.40%> (?)`
test_python_espnet2	`50.75% <57.19%> (+0.14%)`	⬆️
test_python_espnet3	`0.77% <8.69%> (?)`
test_utils	`18.77% <ø> (-1.87%)`	⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

Masao-Someki · 2025-09-13T07:15:59Z

@sw005320
Could you review this change? The additional change I made is in the following commit; the other commits are only to correct mistakes from merging the master branch.

Removed underthesea from dependency

sw005320 · 2025-09-13T13:40:20Z

@sw005320 Could you review this change? The additional change I made is in the following commit; the other commits are only to correct mistakes from merging the master branch.

Removed underthesea from dependency

OK for me.
Good catch!

sw005320 · 2025-09-13T13:42:12Z

Can you check https://github.com/espnet/espnet/actions/runs/17693138577/job/50289334938?pr=6239?

Masao-Someki · 2025-09-14T02:27:01Z

@sw005320 @Fhrozen
The CI error originated from a Gemini refactoring suggestion in #6231 (this commit). The change removed the repeat function, which altered the shape of mean and std to (B, C, 1) instead of the expected (B, C, T). After reverting this change, I could successfully passed this test in my local PC.

I will revert this commit for now

This reverts commit b59162d.

Masao-Someki · 2025-09-14T14:54:20Z

@sw005320
Hi, if the above commit is okay to you, I will merge this and back to the main espnet-3 development!

sw005320 · 2025-09-14T14:56:21Z

Thanks!
Now, we fix the CI error and can also use the latest numpy/python setup.
Please import the update in the main repo frequently

cyhuang-tw and others added 30 commits June 16, 2025 23:50

Add Dynamic-SUPERB inference with Qwen2-Audio.

071eb95

Merge branch 'espnet:master' into dynamic-superb

1f1c364

Complete the evaluation pipeline for Qwen2-Audio on Dynamic-SUPERB AS…

0833dd5

…R tasks.

Add text normalization for ASR evaluation.

0bcf2ca

Add decoding config.

b0f2960

Adjust decoding hyperparameters.

9b2f7ec

Fix argument typo.

11dac51

Fix argument passing error.

5409dd6

Fix indent error.

866bcca

Fix attribute error.

9543e81

Add minlenratio.

f21d51c

Add voxlingua107 recipe.

a4cc40c

Add readme.

4aa7e6e

Add run script.

4585fa9

Add config.

331b48c

Add data process scripts.

fabff2c

Remove redundant code.

1bd82ac

Remove spk_map.

fbe5c41

Remove unnecessary cat.

97ca01b

Import Hugging Face's Qwen2Audio code.

fdee0d9

Try to replace attention module.

311d588

Fix attn forward arguments.

e92553d

Fix attention mask shape.

4abb2a3

Try to remove more transformers dependency.

229c001

Comment out PretrainedConfig.

e8b8ecb

Use ESPnet beam search.

4e63430

[pre-commit.ci] auto fixes from pre-commit.com hooks

ffe56a5

for more information, see https://pre-commit.ci

Fix CI errors.

b49507d

[pre-commit.ci] auto fixes from pre-commit.com hooks

5391830

for more information, see https://pre-commit.ci

Fix CI errors (line length, import error).

ff0c29e

mergify bot added ESPnet2 README Documentation CI Travis, Circle CI, etc Installation labels Sep 12, 2025

dosubot bot added the ESPnet3 label Sep 12, 2025

gemini-code-assist bot reviewed Sep 12, 2025

View reviewed changes

egs2/TEMPLATE/asr1/pyscripts/utils/extract_spk_embed_parallel.py Show resolved Hide resolved

utils/apply_code_fixes.py Show resolved Hide resolved

Masao-Someki added 2 commits September 12, 2025 14:49

Fix mistake in merging master into espnet-3

7786cca

Fix merge mistake

9621268

- Previously versa.done was included

Revert setuptools version update

4a4b94a

- It seems setuptools>80 has issue with warprnnt_pytorch

Masao-Someki changed the title ~~[espnet-3] Merge master into espnet3 (250912)~~ [espnet-3] Merge master into espnet3 and fixed CI Sep 13, 2025

Masao-Someki added 2 commits September 13, 2025 01:28

Removed underthesea from dependency

5dbb256

- We removed it because it cause installation error with pyproject.toml

Fix merge mistake in CI_ubuntu

e7fe494

- tests for espnetez was replaced with espnet3

Revert "reflect gemini comments"

87a0df2

This reverts commit b59162d.

sw005320 merged commit 558a891 into espnet:espnet3 Sep 14, 2025
28 checks passed

Fhrozen added this to the v.202512 milestone Sep 23, 2025

Fhrozen modified the milestones: v.202512, v.202511 Nov 14, 2025

Masao-Someki mentioned this pull request Nov 17, 2025

[espnet3-10] Merge espnet3 branch into master #6304

Merged

Conversation

Masao-Someki commented Sep 12, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

What did you change?

Why did you make this change?

Is your PR small enough?

Additional Context

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

sw005320 commented Sep 13, 2025

Uh oh!

Masao-Someki commented Sep 13, 2025

Uh oh!

Masao-Someki commented Sep 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Masao-Someki commented Sep 13, 2025

Uh oh!

codecov bot commented Sep 13, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Masao-Someki commented Sep 13, 2025

Uh oh!

sw005320 commented Sep 13, 2025

Uh oh!

sw005320 commented Sep 13, 2025

Uh oh!

Masao-Someki commented Sep 14, 2025

Uh oh!

Masao-Someki commented Sep 14, 2025

Uh oh!

Uh oh!

sw005320 commented Sep 14, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

Masao-Someki commented Sep 12, 2025 •

edited

Loading

Masao-Someki commented Sep 13, 2025 •

edited

Loading

codecov bot commented Sep 13, 2025 •

edited

Loading