Genlocale dev

.github/PULL_REQUEST_TEMPLATE.md

@@ -1,7 +1,7 @@
 # Pull request checklist
 
 - [ ] The PR has a proper title. Use [Semantic Commit Messages](https://seesparkbox.com/foundry/semantic_commit_messages). (No more branch-name title please)
-- [ ] Make sure you are requesting the right branch.
+- [ ] Make sure you are requesting the right branch: `dev`.
 - [ ] Make sure this is ready to be merged into the relevant branch. Please don't create a PR and let it hang for a few days.
 - [ ] Ensure all tests are passing.
 - [ ] Ensure linting is passing.

.github/workflows/docker.yml

@@ -1,4 +1,4 @@
-name: Build And Push Docker Image
+name: Build and Push Docker Image
 
 on:
  workflow_dispatch:

.github/workflows/genlocale.yml

@@ -1,15 +1,14 @@
-name: genlocale
+name: Generate and Sync Locale
 on:
  push:
  branches:
  - main
+ - dev
 jobs:
  genlocale:
- name: genlocale
  runs-on: ubuntu-latest
  steps:
- - name: Check out
- uses: actions/checkout@master
+ - uses: actions/checkout@master
 
  - name: Run locale generation
  run: |
@@ -19,15 +18,21 @@ jobs:
 
  - name: Commit back
  if: ${{ !github.head_ref }}
+ id: commitback
  continue-on-error: true
  run: |
  git config --local user.name 'github-actions[bot]'
  git config --local user.email 'github-actions[bot]@users.noreply.github.com'
  git add --all
- git commit -m "🎨 同步 locale"
+ git commit -m "chore(i18n): sync locale on ${{github.ref_name}}"
 
  - name: Create Pull Request
- if: ${{ !github.head_ref }}
+ if: steps.commitback.outcome == 'success'
  continue-on-error: true
- uses: peter-evans/create-pull-request@v4
-
+ uses: peter-evans/create-pull-request@v5
+ with:
+ delete-branch: true
+ body: "Automatically sync i18n translation jsons"
+ title: "chore(i18n): sync locale on ${{github.ref_name}}"
+ commit-message: "chore(i18n): sync locale on ${{github.ref_name}}"
+ branch: genlocale-${{github.ref_name}}

.github/workflows/pull_format.yml

@@ -1,24 +1,34 @@
-name: pull format
+name: Check Pull Format
 
-on: [pull_request]
-
-permissions:
- contents: write
+on:
+ pull_request_target:
+ types: [opened, reopened]
 
 jobs:
- pull_format:
- runs-on: ${{ matrix.os }}
+ # This workflow closes invalid PR
+ close_pr:
+ # The type of runner that the job will run on
+ runs-on: ubuntu-latest
+ permissions: write-all
+
+ # Steps represent a sequence of tasks that will be executed as part of the job
+ steps:
+ - name: Close PR if it is not pointed to dev branch
+ if: github.event.pull_request.base.ref != 'dev'
+ uses: superbrothers/close-pull-request@v3
+ with:
+ # Optional. Post a issue comment just before closing a pull request.
+ comment: "Invalid PR to `non-dev` branch `${{ github.event.pull_request.base.ref }}`."
 
- strategy:
- matrix:
- python-version: ["3.10"]
- os: [ubuntu-latest]
- fail-fast: false
+ pull_format:
+ runs-on: ubuntu-latest
+ permissions:
+ contents: write
 
  continue-on-error: true
 
  steps:
- - name: checkout
+ - name: Checkout
  continue-on-error: true
  uses: actions/checkout@v3
  with:

.github/workflows/push_format.yml

@@ -1,23 +1,18 @@
-name: push format
+name: Standardize Code Format
 
 on:
  push:
  branches:
  - main
-
-permissions:
- contents: write
- pull-requests: write
+ - dev
 
 jobs:
  push_format:
- runs-on: ${{ matrix.os }}
+ runs-on: ubuntu-latest
 
- strategy:
- matrix:
- python-version: ["3.10"]
- os: [ubuntu-latest]
- fail-fast: false
+ permissions:
+ contents: write
+ pull-requests: write
 
  steps:
  - uses: actions/checkout@v3
@@ -43,14 +38,15 @@ jobs:
  git config --local user.email "github-actions[bot]@users.noreply.github.com"
  git config --local user.name "github-actions[bot]"
  git add --all
- git commit -m "Format code"
+ git commit -m "chore(format): run black on ${{github.ref_name}}"
 
  - name: Create Pull Request
  if: steps.commitback.outcome == 'success'
  continue-on-error: true
  uses: peter-evans/create-pull-request@v5
  with:
  delete-branch: true
- body: Apply Code Formatter Change
- title: Apply Code Formatter Change
- commit-message: Automatic code format
+ body: "Automatically apply code formatter change"
+ title: "chore(format): run black on ${{github.ref_name}}"
+ commit-message: "chore(format): run black on ${{github.ref_name}}"
+ branch: formatter-${{github.ref_name}}

.github/workflows/sync_dev.yml

@@ -0,0 +1,23 @@
+name: Merge dev into main
+
+on:
+ workflow_dispatch:
+
+jobs:
+ sync_dev:
+ runs-on: ubuntu-latest
+
+ permissions:
+ contents: write
+ pull-requests: write
+
+ steps:
+ - uses: actions/checkout@v3
+ with:
+ ref: main
+
+ - name: Create Pull Request
+ run: |
+ gh pr create --title "chore(sync): merge dev into main" --body "Merge dev to main" --base main --head dev
+ env:
+ GH_TOKEN: ${{ github.token }}

.github/workflows/unitest.yml

@@ -1,4 +1,4 @@
-name: unitest
+name: Unit Test
 on: [ push, pull_request ]
 jobs:
  build:
@@ -7,7 +7,7 @@ jobs:
  matrix:
  python-version: ["3.8", "3.9", "3.10"]
  os: [ubuntu-latest]
- fail-fast: false
+ fail-fast: true
 
  steps:
  - uses: actions/checkout@master

README.md

@@ -68,12 +68,16 @@ poetry install
 你也可以通过 pip 来安装依赖：
 ```bash
 N卡：
-
-pip install -r requirements.txt
+ pip install -r requirements.txt
 
 A卡/I卡：
-pip install -r requirements-dml.txt
+ pip install -r requirements-dml.txt
+
+A卡Rocm（Linux）：
+ pip install -r requirements-amd.txt
 
+I卡IPEX（Linux）：
+ pip install -r requirements-ipex.txt
 ```
 
 ------
@@ -122,11 +126,34 @@ https://huggingface.co/lj1995/VoiceConversionWebUI/blob/main/rmvpe.pt
 ```bash
 python infer-web.py
 ```
-
 如果你正在使用Windows 或 macOS，你可以直接下载并解压`RVC-beta.7z`，前者可以运行`go-web.bat`以启动WebUI，后者则运行命令`sh ./run.sh`以启动WebUI。
 
+对于需要使用IPEX技术的I卡用户，请先在终端执行`source /opt/intel/oneapi/setvars.sh`（仅Linux）。
+
 仓库内还有一份`小白简易教程.doc`以供参考。
 
+## AMD显卡Rocm相关（仅Linux）
+如果你想基于AMD的Rocm技术在Linux系统上运行RVC，请先在[这里](https://rocm.docs.amd.com/en/latest/deploy/linux/os-native/install.html)安装所需的驱动。
+
+若你使用的是Arch Linux，可以使用pacman来安装所需驱动：
+````
+pacman -S rocm-hip-sdk rocm-opencl-sdk
+````
+对于某些型号的显卡，你可能需要额外配置如下的环境变量（如：RX6700XT）：
+````
+export ROCM_PATH=/opt/rocm
+export HSA_OVERRIDE_GFX_VERSION=10.3.0
+````
+同时确保你的当前用户处于`render`与`video`用户组内：
+````
+sudo usermod -aG render $USERNAME
+sudo usermod -aG video $USERNAME
+````
+之后运行WebUI：
+```bash
+python infer-web.py
+```
+
 ## 参考项目
 + [ContentVec](https://github.com/auspicious3000/contentvec/)
 + [VITS](https://github.com/jaywalnut310/vits)

assets/hubert/.gitignore

@@ -1,2 +1,3 @@
 *
 !.gitignore
+!hubert_inputs.pth

assets/rmvpe/.gitignore

@@ -1,2 +1,3 @@
 *
 !.gitignore
+!rmvpe_inputs.pth

configs/config.json

@@ -1,15 +1,15 @@
 {
- "pth_path": "assets/weights/kikiV1.pth",
- "index_path": "logs/kikiV1.index",
- "sg_input_device": "VoiceMeeter Output (VB-Audio Vo (MME)",
- "sg_output_device": "VoiceMeeter Aux Input (VB-Audio (MME)",
- "threhold": -45.0,
- "pitch": 12.0,
- "index_rate": 0.0,
- "rms_mix_rate": 0.0,
- "block_time": 0.25,
- "crossfade_length": 0.04,
- "extra_time": 2.0,
- "n_cpu": 6.0,
- "f0method": "rmvpe"
+  "pth_path": "assets/weights/kikiV1.pth",
+  "index_path": "logs/kikiV1.index",
+  "sg_input_device": "VoiceMeeter Output (VB-Audio Vo (MME)",
+  "sg_output_device": "VoiceMeeter Aux Input (VB-Audio (MME)",
+  "threhold": -45.0,
+  "pitch": 12.0,
+  "index_rate": 0.0,
+  "rms_mix_rate": 0.0,
+  "block_time": 0.25,
+  "crossfade_length": 0.04,
+  "extra_time": 2.0,
+  "n_cpu": 6.0,
+  "f0method": "rmvpe"
 }

configs/config.py

@@ -43,7 +43,8 @@ def wrapper(*args, **kwargs):
 class Config:
  def __init__(self):
  self.device = "cuda:0"
- self.is_half = True
+ self.is_half = False
+ self.use_jit = True
  self.n_cpu = 0
  self.gpu_name = None
  self.json_config = self.load_config_json()