Browse Source

add submodule

lyuxiang.lx 1 year ago
parent
commit
3910efd6d3

+ 38 - 0
.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,38 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**Desktop (please complete the following information):**
+ - OS: [e.g. iOS]
+ - Browser [e.g. chrome, safari]
+ - Version [e.g. 22]
+
+**Smartphone (please complete the following information):**
+ - Device: [e.g. iPhone6]
+ - OS: [e.g. iOS8.1]
+ - Browser [e.g. stock browser, safari]
+ - Version [e.g. 22]
+
+**Additional context**
+Add any other context about the problem here.

+ 20 - 0
.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: ''
+assignees: ''
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

+ 35 - 148
.gitignore

@@ -3,160 +3,47 @@ __pycache__/
 *.py[cod]
 *.py[cod]
 *$py.class
 *$py.class
 
 
-# C extensions
-*.so
+# Visual Studio Code files
+.vscode
+.vs
 
 
-# Distribution / packaging
-.Python
-build/
-develop-eggs/
-dist/
-downloads/
-eggs/
-.eggs/
-lib/
-lib64/
-parts/
-sdist/
-var/
-wheels/
-share/python-wheels/
-*.egg-info/
-.installed.cfg
-*.egg
-MANIFEST
+# PyCharm files
+.idea
 
 
-# PyInstaller
-#  Usually these files are written by a python script from a template
-#  before PyInstaller builds the exe, so as to inject date/other infos into it.
-*.manifest
-*.spec
+# Eclipse Project settings
+*.*project
+.settings
 
 
-# Installer logs
-pip-log.txt
-pip-delete-this-directory.txt
+# Sublime Text settings
+*.sublime-workspace
+*.sublime-project
 
 
-# Unit test / coverage reports
-htmlcov/
-.tox/
-.nox/
-.coverage
-.coverage.*
-.cache
-nosetests.xml
-coverage.xml
-*.cover
-*.py,cover
-.hypothesis/
-.pytest_cache/
-cover/
-
-# Translations
-*.mo
-*.pot
-
-# Django stuff:
-*.log
-local_settings.py
-db.sqlite3
-db.sqlite3-journal
-
-# Flask stuff:
-instance/
-.webassets-cache
-
-# Scrapy stuff:
-.scrapy
-
-# Sphinx documentation
-docs/_build/
+# Editor temporaries
+*.swn
+*.swo
+*.swp
+*.swm
+*~
 
 
-# PyBuilder
-.pybuilder/
-target/
-
-# Jupyter Notebook
+# IPython notebook checkpoints
 .ipynb_checkpoints
 .ipynb_checkpoints
 
 
-# IPython
-profile_default/
-ipython_config.py
-
-# pyenv
-#   For a library or package, you might want to ignore these files since the code is
-#   intended to run in multiple environments; otherwise, check them in:
-# .python-version
-
-# pipenv
-#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
-#   However, in case of collaboration, if having platform-specific dependencies or dependencies
-#   having no cross-platform support, pipenv may install dependencies that don't work, or not
-#   install all needed dependencies.
-#Pipfile.lock
-
-# poetry
-#   Similar to Pipfile.lock, it is generally recommended to include poetry.lock in version control.
-#   This is especially recommended for binary packages to ensure reproducibility, and is more
-#   commonly ignored for libraries.
-#   https://python-poetry.org/docs/basic-usage/#commit-your-poetrylock-file-to-version-control
-#poetry.lock
-
-# pdm
-#   Similar to Pipfile.lock, it is generally recommended to include pdm.lock in version control.
-#pdm.lock
-#   pdm stores project-wide configurations in .pdm.toml, but it is recommended to not include it
-#   in version control.
-#   https://pdm.fming.dev/latest/usage/project/#working-with-version-control
-.pdm.toml
-.pdm-python
-.pdm-build/
+# macOS dir files
+.DS_Store
 
 
-# PEP 582; used by e.g. github.com/David-OConnor/pyflow and github.com/pdm-project/pdm
-__pypackages__/
+exp
+data
+raw_wav
+tensorboard
+**/*build*
 
 
-# Celery stuff
-celerybeat-schedule
-celerybeat.pid
-
-# SageMath parsed files
-*.sage.py
-
-# Environments
-.env
-.venv
-env/
-venv/
-ENV/
-env.bak/
-venv.bak/
-
-# Spyder project settings
-.spyderproject
-.spyproject
-
-# Rope project settings
-.ropeproject
-
-# mkdocs documentation
-/site
-
-# mypy
-.mypy_cache/
-.dmypy.json
-dmypy.json
-
-# Pyre type checker
-.pyre/
-
-# pytype static type analyzer
-.pytype/
-
-# Cython debug symbols
-cython_debug/
-
-# PyCharm
-#  JetBrains specific template is maintained in a separate JetBrains.gitignore that can
-#  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
-#  and can be added to the global gitignore or merged into this file.  For a more nuclear
-#  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
+# Clangd files
+.cache
+compile_commands.json
+
+# train/inference files
+*.wav
+*.pt
+pretrained_models/*
+*_pb2_grpc.py
+*_pb2.py

+ 6 - 0
.gitmodules

@@ -0,0 +1,6 @@
+[submodule "third_party/AcademiCodec"]
+	path = third_party/AcademiCodec
+	url = https://github.com/yangdongchao/AcademiCodec.git
+[submodule "third_party/Matcha-TTS"]
+	path = third_party/Matcha-TTS
+	url = https://github.com/shivammehta25/Matcha-TTS.git

+ 1 - 2
cosyvoice/bin/train.py

@@ -75,8 +75,7 @@ def get_args():
     parser.add_argument('--timeout',
     parser.add_argument('--timeout',
                         default=30,
                         default=30,
                         type=int,
                         type=int,
-                        help='timeout (in seconds) of cosyvoice_join. ' +
-                        '30s for aishell & 300s for wenetspeech')
+                        help='timeout (in seconds) of cosyvoice_join.')
     parser = deepspeed.add_config_arguments(parser)
     parser = deepspeed.add_config_arguments(parser)
     args = parser.parse_args()
     args = parser.parse_args()
     return args
     return args

+ 1 - 1
cosyvoice/transformer/attention.py

@@ -152,7 +152,7 @@ class MultiHeadedAttention(nn.Module):
                 4.If the different position in decoder see different block
                 4.If the different position in decoder see different block
                 of the encoder, such as Mocha, the passed in mask could be
                 of the encoder, such as Mocha, the passed in mask could be
                 in (#batch, L, T) shape. But there is no such case in current
                 in (#batch, L, T) shape. But there is no such case in current
-                Wenet.
+                CosyVoice.
             cache (torch.Tensor): Cache tensor (1, head, cache_t, d_k * 2),
             cache (torch.Tensor): Cache tensor (1, head, cache_t, d_k * 2),
                 where `cache_t == chunk_size * num_decoding_left_chunks`
                 where `cache_t == chunk_size * num_decoding_left_chunks`
                 and `head * d_k == size`
                 and `head * d_k == size`