Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Merge master #232

Closed
wants to merge 118 commits into from
Closed

Merge master #232

wants to merge 118 commits into from

Conversation

OedoSoldier
Copy link
Collaborator

No description provided.

jiangyuxiaoxiao and others added 30 commits November 1, 2023 18:48
@jiangyuxiaoxiao @pre-commit-ci
Update server_fastapi.py. Add new api endpoints. (#141)
ca546c5 
* Update server_fastapi.py. Add new api endpoints.

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Lvjinhong @pre-commit-ci
修复多机训练问题 (#143)
74467f5 
* 修复多机训练问题

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@lzyplayer @pre-commit-ci
[Fix] Fix Volume inconsistent (#144)
6227012 
* [Fix] Fix Volume inconsistent

Fixed the problem of volume inconsistency between sentence segments caused by Gradio volume normalization

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Stardust-minus
Update webui.py
7737079
@jiangyuxiaoxiao @pre-commit-ci
Update server_fastapi.py. Avoid loading the model repeatedly. Add log…
25ea864 
…ger (#145)

* Update server_fastapi.py. Avoid loading the model repeatedly. Add loguru logger.

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Stardust-minus
更新 models.py
d4ecc90
@jiangyuxiaoxiao
Fix: server_fastapi.py. (#147)
4d6de24
@Isotr0py @pre-commit-ci
Auto download missing model for bert_gen.py (#146)
8609449 
* auto download missing model

* support openi

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

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

* fix wrong delete

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

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

* pass pre-commit

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

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

* fix repeat login

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Minami-su @pre-commit-ci
修复部分日文汉字无法被推理/训练 (#148)
3705de9 
* Update japanese.py

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Stardust-minus
Update mel_processing.py
1da0189
@Stardust-minus
Update server.py
b99419d
@Stardust-minus
Update server.py
7e41a1c
@Stardust-minus
更新 japanese.py，修正bug
5c74e9a
@Stardust-minus
Update server.py
a4907cd
@Stardust-minus
Update requirements.txt
6d1fa77
@Stardust-minus
Update server.py
a3f981d
@Stardust-minus
Update server.py
321b72c
@Stardust-minus
Update server.py
6d0d777
@OedoSoldier @pre-commit-ci
Fix japanese.py (#151)
0dbe362 
* Fix japanese.py

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Isotr0py
Add model download to train_ms.py (#150)
80c418e 
* download base model

* fix download

* fix download repo

* set HF default
@Stardust-minus
Update server.py
5f14fa1
@Stardust-minus
Update README.md
8557742
@jiangyuxiaoxiao
Fix: server_fastapi.py, support auto split (#152)
096d661 
* Fix: server_fastapi.py, support auto split

* Fix: translate.py
@Artrajz @pre-commit-ci
Add language identification. (#153)
c86da6e 
* Add language identification.

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (#154)
a233fb4 
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.3 → v0.1.4](astral-sh/ruff-pre-commit@v0.1.3...v0.1.4)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Artrajz @pre-commit-ci
Update zje language identification. (#155)
a752307 
* Update zje language identification.

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Stardust-minus
add emo and vo
16af947
@Stardust-minus
Update models.py
5980503
@Stardust-minus
add emo
c864828
@Stardust-minus
Update loss
8ea241b
pre-commit-ci bot and others added 29 commits November 27, 2023 16:36
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
0dd8183 
for more information, see https://pre-commit.ci
@OedoSoldier
Merge pull request #200 from OedoSoldier/master
e92f67f 
Update get_emo
@Isotr0py
Fix multiprocess (#201)
edb5d05 
* fix nultiprocess

* fix format

* fix multiprocess=0
@jiangyuxiaoxiao
fix server_fastapi.py: 解决可能的BytesIO()未被回收导致内存泄露的问题，适配310以下版本python (#202
f5444c2 
)
@Stardust-minus
更新 webui.py
46fcdf4
@AnyaCoder @pre-commit-ci
text/init.py (#203)
4edcfb3 
* Create all_process.py

* Create asr_transcript.py

* Update config.py

* Create extract_list.py

* Create clean_list.py

* Create custom.css

* Create compress_model.py

* Update all_process.py

* Update resample.py

* Update resample.py

* configs/config.json copy utils

* mirror: openi + token
bert models optimize

* text/__init__.py platform compatibility
compress_model.py output

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@AnyaCoder @pre-commit-ci
assure 'configs/config.json' is same (#205)
377454b 
* Create all_process.py

* Create asr_transcript.py

* Update config.py

* Create extract_list.py

* Create clean_list.py

* Create custom.css

* Create compress_model.py

* Update all_process.py

* Update resample.py

* Update resample.py

* configs/config.json copy utils

* mirror: openi + token
bert models optimize

* text/__init__.py platform compatibility
compress_model.py output

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

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

* default_config.yml fix 'config_path'
all_process.py fix 'config_path'

* default_config.yml fix 'config_path'
all_process.py fix 'config_path'

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@AnyaCoder @pre-commit-ci
default_config.yml : 'config.json' (#207)
9243818 
* Create all_process.py

* Create asr_transcript.py

* Update config.py

* Create extract_list.py

* Create clean_list.py

* Create custom.css

* Create compress_model.py

* Update all_process.py

* Update resample.py

* Update resample.py

* configs/config.json copy utils

* mirror: openi + token
bert models optimize

* text/__init__.py platform compatibility
compress_model.py output

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

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

* default_config.yml fix 'config_path'
all_process.py fix 'config_path'

* default_config.yml fix 'config_path'
all_process.py fix 'config_path'

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

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

* 'config_path': config.json

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@AnyaCoder @pre-commit-ci
delete 4 files not required (#208)
d4a2bc2 
* Create all_process.py

* Create asr_transcript.py

* Update config.py

* Create extract_list.py

* Create clean_list.py

* Create custom.css

* Create compress_model.py

* Update all_process.py

* Update resample.py

* Update resample.py

* configs/config.json copy utils

* mirror: openi + token
bert models optimize

* text/__init__.py platform compatibility
compress_model.py output

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

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

* default_config.yml fix 'config_path'
all_process.py fix 'config_path'

* default_config.yml fix 'config_path'
all_process.py fix 'config_path'

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

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

* 'config_path': config.json

* Delete all_process.py

* Delete asr_transcript.py

* Delete clean_list.py

* Delete extract_list.py

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@jiangyuxiaoxiao
update server_fastapi.py: 缺少web文件时添加提示信息。configyml添加更多帮助注释
95f44ed
@jiangyuxiaoxiao
Merge pull request #210 from jiangyuxiaoxiao/master
b4d7bc5 
update server_fastapi.py: 缺少web文件时添加提示信息。configyml添加更多帮助注释
@Artrajz @pre-commit-ci
Optimize the recognition of mixed Chinese and English characters in n…
2c50b78 
…umbers. (#212)

* Optimize the recognition of mixed Chinese and English characters in numbers.

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@jiangyuxiaoxiao
update server_fastapi.py: 添加2.1模型推理支持。
3623eed
@pre-commit-ci
[pre-commit.ci] auto fixes from pre-commit.com hooks
872e8cb 
for more information, see https://pre-commit.ci
@jiangyuxiaoxiao
Merge pull request #213 from jiangyuxiaoxiao/master
67de3ba 
update server_fastapi.py: 添加2.1模型推理支持。
@jiangyuxiaoxiao
fix server_fastapi.py: 修复bug。
2b178ba
@jiangyuxiaoxiao
Merge pull request #214 from jiangyuxiaoxiao/master
15603dc 
fix server_fastapi.py: 修复bug。
@Stardust-minus
Update requirements.txt
c2fcc02
@jiangyuxiaoxiao
update server_fastapi.py. 模型文件不存在时跳过加载模型
a4f3388
@jiangyuxiaoxiao
Merge pull request #215 from jiangyuxiaoxiao/master
87462fe 
update server_fastapi.py. 模型文件不存在时跳过加载模型
@NaruseMioShirakana @pre-commit-ci
修复了VQ未注册入网络的问题 (#216)
f550f86 
* Add files via upload

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@OedoSoldier
Use only one vq is enough
7ddc560
@NaruseMioShirakana @pre-commit-ci
不同版本Onnx模型导出适配 (#221)
698d2bf 
* Add files via upload

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

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

* Add files via upload

* Add files via upload

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Spycsh @pre-commit-ci
fix mismatch when there is space between alpha and non-alpha words (#222
f1a1b4c 
)

* fix mismatch when there is space between alpha and non-alpha words

* revert blank line

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@OedoSoldier
Fix multilang generation
6733e63
@EiHeiGanTanHao
Update train_ms.py (#225)
649b4fb 
在每次epoch结束后回收显存以避免显存溢出的问题
@pre-commit-ci
[pre-commit.ci] pre-commit autoupdate (#227)
9cc786d 
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.6 → v0.1.7](astral-sh/ruff-pre-commit@v0.1.6...v0.1.7)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@Stardust-minus @YYuX-1145
@pre-commit-ci @jiangyuxiaoxiao @OedoSoldier
Use clap to achieve prompt controlled generation (#223)
eaefc57 
* 快速分类音频并把yml格式结果存在训练根目录里 (#190)

* Add files via upload

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

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

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>

* Update models.py

* Update webui.py

* Update infer.py

* Create compress_model.py

* 重新提交，更新Gradio推理UI (#193)

* Update webui.py

* Update webui.py

* 更新 train_ms.py

* 更新 models.py

* 更新 models.py

* 更新 models.py

* 更新 train_ms.py

* 更新 train_ms.py

* 更新 models.py

* Update preprocess_text.py

* Update config.json

* Update train_ms.py

* Update webui.py (#206)

* Add files via upload (#209)

* Update train_ms.py

* Update train_ms.py

* Update preprocess_text.py

* Update train_ms.py

* fix (#211)

* Update emotion_clustering.py

* Add files via upload

* Update emotion_clustering.py

* add cluster center save

* Add files via upload

* Update config.py

* Update default_config.yml

* Update config.py

* Update config.py

* Update emotion_clustering.py

* Update emotion_clustering.py

* Update config.py

* Update emotion_clustering.py

* Update emotion_clustering.py

* Update webui.py

* Update emotion_clustering.py

* Update commons.py

* Update emotion_clustering.py

* Update webui.py

* Update webui.py

* Add files via upload

* Update train_ms.py

* Update train_ms.py

* Update train_ms.py

* Update train_ms.py

* Update train_ms.py

* Update webui.py

* Update emotion_clustering.py

* Update emotion_clustering.py

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

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

* fix default_config.yml.

* Update infer.py

* feat: support infer 2.1 models

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

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

* fix: support infer 2.1 models 兼容bug修复

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

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

* Update train_ms.py

* Add CLAP

* Fix data loader

* Fix infer.py

* Fix webui.py

* Add prompt template

* Update clap_gen.py

* Fix wrong environ value

* Add g for dur disc

* Update clap_gen.py

* Fix multilang generation

* Update config.json

* Prompt mode

* Improve slice segments performance

* Add preprocess webui

* Update webui_preprocess.py

* Update webui_preprocess.py

* Update config.py

* Update default_config.yml

* Update config.py

* Update clap_gen.py

* Delete emo_gen.py

* Delete get_emo.py

* Delete emotional/wav2vec2-large-robust-12-ft-emotion-msp-dim directory

* Update README.md

* Update README

* Split val per lang

* Delete emotion_clustering.py

* Update default_config.yml

* Update default_config.yml

* Update config.py

* Update preprocess_text.py

* Update webui_preprocess.py

* Update defalut_config.yml

* Update webui_preprocess.py

* Update preprocess_text.py

* Random augmentation for CLAP

* Update data_utils.py

* Update preprocess_text.py

* Add vq for CLAP features to avoid overfitting

* Random dummy inputs

* Update webui.py

* Update models.py

* Update infer.py

* Apply Code Formatter Change

* Update config.json

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

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

---------

Co-authored-by: YYuX-1145 <[email protected]>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Sora <[email protected]>
Co-authored-by: Sihan Wang <[email protected]>
Co-authored-by: Stardust-minus <[email protected]>
@NaruseMioShirakana @pre-commit-ci
删除无用的Onnx文件 (#230)
d42fee7 
* Add files via upload

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

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

* Add files via upload

* Add files via upload

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

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

* Delete attentions_onnx.py

* Delete models_onnx.py

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.