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.

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

feat: main feat #1

Merged
merged 51 commits into from
Mar 17, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
51 commits
Select commit Hold shift + click to select a range
53ea7c9
docs: add @34j as a contributor
34j Mar 15, 2023
ecd0ff2
chore: add original files
34j Mar 15, 2023
9d346dc
chore: move files
34j Mar 15, 2023
d0f3368
docs: fix license
34j Mar 15, 2023
8eff6fd
chore: add deps
34j Mar 15, 2023
88a8a68
Revert "chore: move files"
34j Mar 15, 2023
e927da8
chore: move files using PyCharm
34j Mar 15, 2023
3f294c9
chore: delete text files
34j Mar 15, 2023
29edd2c
chore: remove files
34j Mar 15, 2023
788a81d
fix: fix imports
34j Mar 15, 2023
fb51bf5
style: partially run pre-commit
34j Mar 16, 2023
24aa56e
fix: fix imports in spec_gen.py
34j Mar 16, 2023
76cb2fb
refactor: refactor resample.py
34j Mar 16, 2023
c9a92ce
refactor: refactoring
34j Mar 16, 2023
b183739
feat: add rich
34j Mar 16, 2023
8dd5af7
refactor: hubert sampling rate
34j Mar 16, 2023
d1aeab8
chore: gitignore
34j Mar 16, 2023
34429be
refactor: refactor preprocessing
34j Mar 16, 2023
2c88e99
fix(train): fix train
34j Mar 16, 2023
88a78a0
fix(preprocess_hubert): fix error when small number of sources
34j Mar 16, 2023
1707b89
fix: do not use print()
34j Mar 16, 2023
5531f71
fix: remove logging import
34j Mar 16, 2023
05d7757
chore(train): show pbar
34j Mar 16, 2023
6ecce4c
feat: add clean command
34j Mar 16, 2023
7275851
fix(preprocess_flist_config): raise when too few dataset
34j Mar 16, 2023
aac0af1
fix(config_template): fix paths
34j Mar 16, 2023
e99bf84
fix: inference
34j Mar 16, 2023
bf4c79d
chore(deps): remove pyaudio
34j Mar 16, 2023
f3280c2
fix: import annotations from __future__
34j Mar 16, 2023
ce7cbf0
fix: fix type annotations
34j Mar 16, 2023
edd2462
chore(pyproject.toml): fix deps
34j Mar 16, 2023
1a3e4c9
feat: automatic downloading model
34j Mar 16, 2023
deac5b4
feat: add notebook
34j Mar 16, 2023
a9f1304
fix: do not use rich when in colab
34j Mar 16, 2023
48fa964
fix(utils): fix typo in download_file
34j Mar 16, 2023
9e8b866
fix(deps): specify numpy version
34j Mar 16, 2023
1cd65f5
fix(utils): mkdir
34j Mar 16, 2023
93d0e93
fix(utils): fix model urls
34j Mar 16, 2023
6896a9f
fix: remove spk values in config_template
34j Mar 16, 2023
dabf717
fix(__main__): convert str to Path
34j Mar 16, 2023
93c38af
refactor(inference_main.py): refactor
34j Mar 17, 2023
595c2d3
fix(utils): fix typo
34j Mar 17, 2023
1f0a82a
feat: add onnx_export
34j Mar 17, 2023
18e0a4d
chore(.pre-commit-config.yaml): remove bandit
34j Mar 17, 2023
6964a37
chore(.gitignore): add .download to .gitignore
34j Mar 17, 2023
8296edf
style: run pre-commit
34j Mar 17, 2023
f117254
test: add blank test
34j Mar 17, 2023
38cdfa5
fix: do not support Python3.11 due to numba
34j Mar 17, 2023
3fcbf4b
docs(readme): update readme
34j Mar 17, 2023
05dea12
docs(__main__): add more docstrings
34j Mar 17, 2023
be011df
docs: update notebook
34j Mar 17, 2023
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
14 changes: 13 additions & 1 deletion .all-contributorsrc
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,19 @@
"imageSize": 80,
"commit": true,
"commitConvention": "angular",
"contributors": [],
"contributors": [
{
"login": "34j",
"name": "34j",
"avatar_url": "https://avatars.githubusercontent.com/u/55338215?v=4",
"profile": "https://github.com/34j",
"contributions": [
"code",
"ideas",
"doc"
]
}
],
"contributorsPerLine": 7,
"skipCi": true
}
1 change: 1 addition & 0 deletions .flake8
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
[flake8]
exclude = docs
max-line-length = 88
ignore = E203, E501, E741, E402, E712, W503, E731, E711
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
- "3.8"
- "3.9"
- "3.10"
- "3.11"
# - "3.11"
os:
- ubuntu-latest
# - windows-latest
Expand Down
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -138,3 +138,13 @@ dmypy.json

# Cython debug symbols
cython_debug/

# additional files
tests/**/*.wav
tests/**/*.npy
tests/**/*.pt
tests/**/*.txt
tests/**/*.json
tests/**/*.pth
tests/**/*.download
*.tfevents.*
6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/Project_Default.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/inspectionProfiles/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions .idea/so-vits-svc-fork.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions .idea/watcherTasks.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

130 changes: 129 additions & 1 deletion .idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

21 changes: 11 additions & 10 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,18 @@ repos:
rev: v2.2.2
hooks:
- id: codespell
args: [-w]
- repo: https://github.com/PyCQA/flake8
rev: 6.0.0
hooks:
- id: flake8
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.931
hooks:
- id: mypy
additional_dependencies: []
- repo: https://github.com/PyCQA/bandit
rev: 1.7.4
hooks:
- id: bandit
args: [-x, tests]
#- repo: https://github.com/pre-commit/mirrors-mypy
# rev: v0.931
# hooks:
# - id: mypy
# additional_dependencies: []
# - repo: https://github.com/PyCQA/bandit
# rev: 1.7.4
# hooks:
# - id: bandit
# args: [-x, tests]
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

MIT License

Copyright (c) 2023 34j and contributors
Copyright (c) 2021 Jingyi Li

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
44 changes: 42 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,64 @@
<img src="https://img.shields.io/pypi/l/so-vits-svc-fork.svg?style=flat-square" alt="License">
</p>

A fork of so-vits-svc.
A fork of [`so-vits-svc`](https://github.com/svc-develop-team/so-vits-svc) with a **greatly improved interface**. Based on branch `4.0` (v1). No differences in functionality and the models are compatible.

## Installation

Install this via pip (or your favourite package manager):

```shell
pip install -U torch torchaudio --index-url https://download.pytorch.org/whl/cu117
pip install so-vits-svc-fork
```

## Features not available in the original repo

- Unified command-line interface (no need to run Python scripts)
- Ready to use just by installing with `pip`.
- Automatically download pretrained base model and HuBERT model
- Code completely formatted with black, isort, autoflake etc.

## Usage

### Training

Colab notebook: [![Open In Colab](https://colab.research.google.com/assets/colab-badge.svg)](https://colab.research.google.com/github/34j/so-vits-svc-fork/blob/main/notebooks/so-vits-svc-fork-4.0.ipynb)

Place your dataset like `dataset_raw/{speaker_id}/{wav_file}.wav` and run:

```shell
svc pre-resample
svc pre-config
svc pre-hubert
svc train
```

### Inference

```shell
svc --model-path <model-path> source.wav
```

## Contributors ✨

Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/docs/en/emoji-key)):

<!-- prettier-ignore-start -->
<!-- ALL-CONTRIBUTORS-LIST:START - Do not remove or modify this section -->
<!-- prettier-ignore-start -->
<!-- markdownlint-disable -->
<!-- markdownlint-enable -->
<table>
<tbody>
<tr>
<td align="center" valign="top" width="14.28%"><a href="https://github.com/34j"><img src="https://avatars.githubusercontent.com/u/55338215?v=4?s=80" width="80px;" alt="34j"/><br /><sub><b>34j</b></sub></a><br /><a href="https://github.com/34j/so-vits-svc-fork/commits?author=34j" title="Code">💻</a> <a href="#ideas-34j" title="Ideas, Planning, & Feedback">🤔</a> <a href="https://github.com/34j/so-vits-svc-fork/commits?author=34j" title="Documentation">📖</a></td>
</tr>
</tbody>
</table>

<!-- markdownlint-restore -->
<!-- prettier-ignore-end -->

<!-- ALL-CONTRIBUTORS-LIST:END -->
<!-- prettier-ignore-end -->

Expand Down
Loading