Commit Graph

524 Commits

Author SHA1 Message Date
Sora
7a2053ea9f Merge pull request #236 from jiangyuxiaoxiao/master
fix: update fastapi.py. 2.2 reference适配
2023-12-14 14:49:07 +08:00
Sora
9e4cc4c7de fix: update fastapi.py. 2.2 reference适配 2023-12-14 14:48:19 +08:00
Sihan Wang
dbc2e9a3aa Switch pyopenjtalk to pyopenjtalk-prebuilt 2023-12-14 11:29:52 +08:00
Sora
2f1cee09a5 Merge pull request #235 from jiangyuxiaoxiao/master
feat: update fastapi.py. 添加更多错误日志信息
2023-12-14 10:09:23 +08:00
Sora
252ddd5b64 feat: update fastapi.py. 添加更多错误日志信息 2023-12-14 10:08:34 +08:00
Stardust·减
e220e63327 fix:(oldVersion210) Load on demand Emotion model 2023-12-13 16:25:44 +08:00
Stardust·减
710d5d6306 Update default_config.yml to 2.2 2023-12-13 13:51:24 +08:00
Sora
d248cfc14f Merge pull request #234 from jiangyuxiaoxiao/master
feat: update fastapi.py. support infer 2.2 models
2023-12-13 11:09:11 +08:00
Sora
ee84580ad3 feat: update fastapi.py. support infer 2.2 models 2023-12-13 11:08:01 +08:00
Sora
2a37dbd0fa Merge pull request #233 from jiangyuxiaoxiao/master
fix: support infer 2.1 models 兼容bug修复
2023-12-13 10:21:03 +08:00
Sora
79efeecdf6 fix: support infer 2.1 models 兼容bug修复 2023-12-13 10:19:24 +08:00
Ναρουσέ·μ·γιουμεμί·Χινακάννα
ce26468857 Onnx导出更新 (#231)
* 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

* 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>
2023-12-13 08:16:24 +08:00
Ναρουσέ·μ·γιουμεμί·Χινακάννα
d42fee7905 删除无用的Onnx文件 (#230)
* 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>
2023-12-12 19:54:00 +08:00
Stardust·减
eaefc57d71 Use clap to achieve prompt controlled generation (#223)
* 快速分类音频并把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 <138500330+YYuX-1145@users.noreply.github.com>
Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Co-authored-by: Sora <654163754@qq.com>
Co-authored-by: Sihan Wang <wangsihan1995@gmail.com>
Co-authored-by: Stardust-minus <Stardust-minus@users.noreply.github.com>
2023-12-12 19:19:50 +08:00
pre-commit-ci[bot]
9cc786d781 [pre-commit.ci] pre-commit autoupdate (#227)
updates:
- [github.com/astral-sh/ruff-pre-commit: v0.1.6 → v0.1.7](https://github.com/astral-sh/ruff-pre-commit/compare/v0.1.6...v0.1.7)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
2023-12-12 07:15:00 +08:00
欸嘿!
649b4fb9c9 Update train_ms.py (#225)
在每次epoch结束后回收显存以避免显存溢出的问题
2023-12-10 21:56:13 +08:00
Sihan Wang
6733e63b31 Fix multilang generation 2023-12-09 23:25:59 +08:00
Sihan Chen
f1a1b4c73d fix mismatch when there is space between alpha and non-alpha words (#222)
* 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>
2023-12-08 11:34:51 +08:00
Ναρουσέ·μ·γιουμεμί·Χινακάννα
698d2bfa5b 不同版本Onnx模型导出适配 (#221)
* 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>
2023-12-07 23:20:17 +08:00
Sihan Wang
7ddc560617 Use only one vq is enough 2023-12-07 22:07:51 +08:00
Ναρουσέ·μ·γιουμεμί·Χινακάννα
f550f86caa 修复了VQ未注册入网络的问题 (#216)
* 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>
2023-12-07 20:48:25 +08:00
Sora
87462fe50f Merge pull request #215 from jiangyuxiaoxiao/master
update server_fastapi.py. 模型文件不存在时跳过加载模型
2023-12-06 21:49:39 +08:00
Sora
a4f3388029 update server_fastapi.py. 模型文件不存在时跳过加载模型 2023-12-06 21:48:52 +08:00
Stardust·减
c2fcc02984 Update requirements.txt 2023-12-04 17:35:10 +08:00
Sora
15603dcf3f Merge pull request #214 from jiangyuxiaoxiao/master
fix server_fastapi.py: 修复bug。
2023-12-04 12:11:12 +08:00
Sora
2b178ba183 fix server_fastapi.py: 修复bug。 2023-12-04 12:09:56 +08:00
Sora
67de3baba2 Merge pull request #213 from jiangyuxiaoxiao/master
update server_fastapi.py: 添加2.1模型推理支持。
2023-12-03 22:44:35 +08:00
pre-commit-ci[bot]
872e8cb0e5 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-12-03 14:44:09 +00:00
Sora
3623eed896 update server_fastapi.py: 添加2.1模型推理支持。 2023-12-03 22:41:36 +08:00
Artrajz
2c50b7816b Optimize the recognition of mixed Chinese and English characters in numbers. (#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>
2023-12-01 19:20:31 +08:00
Sora
b4d7bc582e Merge pull request #210 from jiangyuxiaoxiao/master
update server_fastapi.py: 缺少web文件时添加提示信息。configyml添加更多帮助注释
2023-12-01 10:14:24 +08:00
Sora
95f44ed4fe update server_fastapi.py: 缺少web文件时添加提示信息。configyml添加更多帮助注释 2023-12-01 10:13:42 +08:00
spicysama
d4a2bc225e delete 4 files not required (#208)
* 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>
2023-11-30 20:08:51 +08:00
spicysama
92438187e4 default_config.yml : 'config.json' (#207)
* 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>
2023-11-30 19:58:27 +08:00
spicysama
377454be50 assure 'configs/config.json' is same (#205)
* 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>
2023-11-30 19:14:22 +08:00
spicysama
4edcfb3fef text/init.py (#203)
* 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>
2023-11-30 12:10:44 +08:00
Stardust·减
46fcdf41eb 更新 webui.py 2023-11-29 10:56:02 +08:00
Sora
f5444c208d fix server_fastapi.py: 解决可能的BytesIO()未被回收导致内存泄露的问题,适配310以下版本python (#202) 2023-11-28 18:15:28 +08:00
Isotr0py
edb5d05e34 Fix multiprocess (#201)
* fix nultiprocess

* fix format

* fix multiprocess=0
2023-11-28 12:29:08 +08:00
OedoSoldier
e92f67fe43 Merge pull request #200 from OedoSoldier/master
Update get_emo
2023-11-28 00:36:46 +08:00
pre-commit-ci[bot]
0dd8183d99 [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
2023-11-27 16:36:32 +00:00
Sihan Wang
982ea7d440 Update 2023-11-28 00:35:39 +08:00
Thymustw
badb12585a Change the utils.download_emo_models (#199)
* Change the utils.download_emo_models

Change utils.download_emo_models(config.mirror, model_name, REPO_ID) to utils.download_emo_models(config.mirror, REPO_ID, model_name)

* [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>
2023-11-27 16:49:00 +08:00
OedoSoldier
2c528ce130 Merge pull request #198 from OedoSoldier/master
Update infer.py
2023-11-27 13:14:32 +08:00
Sihan Wang
8ef5db527b Update infer.py 2023-11-27 13:13:29 +08:00
OedoSoldier
818b3b11c3 Update infer.py (#197) 2023-11-27 13:11:36 +08:00
OedoSoldier
122afe0251 Update infer.py (#196)
* Update

* Update
2023-11-27 13:08:43 +08:00
Stardust·减
5ec036af22 Update infer.py 2023-11-27 13:02:06 +08:00
Stardust·减
1952bcd40e Update infer.py 2023-11-27 12:49:16 +08:00
Isotr0py
dec3fc0737 Auto download update, optimize dataloader num_workers (#195)
* update bert

* auto download emo

* fix typo

* fix typo

* fix bert download

* optimize code format

* remove unsued import

* fix a bug

* [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>
2023-11-26 20:16:25 +08:00