Merge pull request #1942 from coqui-ai/dev

v0.9.0

.dockerignore

@@ -1,2 +1,9 @@
 .git/
 Dockerfile
+build/
+dist/
+TTS.egg-info/
+tests/outputs/*
+tests/train_outputs/*
+__pycache__/
+*.pyc

.github/workflows/aux_tests.yml

@@ -21,9 +21,9 @@ jobs:
  python-version: [3.7, 3.8, 3.9, "3.10"]
  experimental: [false]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}
- uses: coqui-ai/setup-python@pip-cache-key-py-ver
+ uses: actions/setup-python@v4
  with:
  python-version: ${{ matrix.python-version }}
  architecture: x64

.github/workflows/data_tests.yml

@@ -21,9 +21,9 @@ jobs:
  python-version: [3.7, 3.8, 3.9, "3.10"]
  experimental: [false]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}
- uses: coqui-ai/setup-python@pip-cache-key-py-ver
+ uses: actions/setup-python@v4
  with:
  python-version: ${{ matrix.python-version }}
  architecture: x64

.github/workflows/docker.yaml

@@ -15,8 +15,8 @@ jobs:
  matrix:
  arch: ["amd64"]
  base:
- - "nvcr.io/nvidia/pytorch:22.03-py3" # GPU enabled
- - "ubuntu:20.04" # CPU only
+ - "nvidia/cuda:11.8.0-base-ubuntu22.04" # GPU enabled
+ - "python:3.10.8-slim" # CPU only
  steps:
  - uses: actions/checkout@v2
  - name: Log in to the Container registry
@@ -32,7 +32,7 @@ jobs:
  base="ghcr.io/coqui-ai/tts"
  tags="" # PR build
 
- if [[ ${{ matrix.base }} = "ubuntu:20.04" ]]; then
+ if [[ ${{ matrix.base }} = "python:3.10.8-slim" ]]; then
  base="ghcr.io/coqui-ai/tts-cpu"
  fi
 

.github/workflows/inference_tests.yml

@@ -21,9 +21,9 @@ jobs:
  python-version: [3.7, 3.8, 3.9, "3.10"]
  experimental: [false]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}
- uses: coqui-ai/setup-python@pip-cache-key-py-ver
+ uses: actions/setup-python@v4
  with:
  python-version: ${{ matrix.python-version }}
  architecture: x64

.github/workflows/style_check.yml

@@ -21,9 +21,9 @@ jobs:
  python-version: [3.9]
  experimental: [false]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}
- uses: coqui-ai/setup-python@pip-cache-key-py-ver
+ uses: actions/setup-python@v4
  with:
  python-version: ${{ matrix.python-version }}
  architecture: x64

.github/workflows/text_tests.yml

@@ -21,9 +21,9 @@ jobs:
  python-version: [3.7, 3.8, 3.9, "3.10"]
  experimental: [false]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}
- uses: coqui-ai/setup-python@pip-cache-key-py-ver
+ uses: actions/setup-python@v4
  with:
  python-version: ${{ matrix.python-version }}
  architecture: x64

.github/workflows/tts_tests.yml

@@ -21,9 +21,9 @@ jobs:
  python-version: [3.7, 3.8, 3.9, "3.10"]
  experimental: [false]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}
- uses: coqui-ai/setup-python@pip-cache-key-py-ver
+ uses: actions/setup-python@v4
  with:
  python-version: ${{ matrix.python-version }}
  architecture: x64

.github/workflows/vocoder_tests.yml

@@ -21,9 +21,9 @@ jobs:
  python-version: [3.7, 3.8, 3.9, "3.10"]
  experimental: [false]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}
- uses: coqui-ai/setup-python@pip-cache-key-py-ver
+ uses: actions/setup-python@v4
  with:
  python-version: ${{ matrix.python-version }}
  architecture: x64

.github/workflows/zoo_tests0.yml

@@ -0,0 +1,52 @@
+name: zoo-tests-0
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ types: [opened, synchronize, reopened]
+jobs:
+ check_skip:
+ runs-on: ubuntu-latest
+ if: "! contains(github.event.head_commit.message, '[ci skip]')"
+ steps:
+ - run: echo "${{ github.event.head_commit.message }}"
+
+ test:
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ python-version: [3.7, 3.8, 3.9, "3.10"]
+ experimental: [false]
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
+ architecture: x64
+ cache: 'pip'
+ cache-dependency-path: 'requirements*'
+ - name: check OS
+ run: cat /etc/os-release
+ - name: Install dependencies
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y git make gcc
+ sudo apt-get install espeak espeak-ng
+ make system-deps
+ - name: Install/upgrade Python setup deps
+ run: python3 -m pip install --upgrade pip setuptools wheel
+ - name: Replace scarf urls
+ run: |
+ sed -i 's/https:\/\/coqui.gateway.scarf.sh\//https:\/\/github.com\/coqui-ai\/TTS\/releases\/download\//g' TTS/.models.json
+ - name: Install TTS
+ run: |
+ python3 -m pip install .[all]
+ python3 setup.py egg_info
+ - name: Unit tests
+ run: |
+ nose2 -F -v -B TTS tests.zoo_tests.test_models.test_models_offset_0_step_3
+ nose2 -F -v -B TTS tests.zoo_tests.test_models.test_voice_conversion

.github/workflows/zoo_tests.yml → .github/workflows/zoo_tests1.yml

@@ -1,4 +1,4 @@
-name: zoo-tests
+name: zoo-tests-1
 
 on:
  push:
@@ -21,9 +21,9 @@ jobs:
  python-version: [3.7, 3.8, 3.9, "3.10"]
  experimental: [false]
  steps:
- - uses: actions/checkout@v2
+ - uses: actions/checkout@v3
  - name: Set up Python ${{ matrix.python-version }}
- uses: coqui-ai/setup-python@pip-cache-key-py-ver
+ uses: actions/setup-python@v4
  with:
  python-version: ${{ matrix.python-version }}
  architecture: x64
@@ -47,4 +47,4 @@ jobs:
  python3 -m pip install .[all]
  python3 setup.py egg_info
  - name: Unit tests
- run: make test_zoo
+ run: nose2 -F -v -B --with-coverage --coverage TTS tests.zoo_tests.test_models.test_models_offset_1_step_3

.github/workflows/zoo_tests2.yml

@@ -0,0 +1,50 @@
+name: zoo-tests-2
+
+on:
+ push:
+ branches:
+ - main
+ pull_request:
+ types: [opened, synchronize, reopened]
+jobs:
+ check_skip:
+ runs-on: ubuntu-latest
+ if: "! contains(github.event.head_commit.message, '[ci skip]')"
+ steps:
+ - run: echo "${{ github.event.head_commit.message }}"
+
+ test:
+ runs-on: ubuntu-latest
+ strategy:
+ fail-fast: false
+ matrix:
+ python-version: [3.7, 3.8, 3.9, "3.10"]
+ experimental: [false]
+ steps:
+ - uses: actions/checkout@v3
+ - name: Set up Python ${{ matrix.python-version }}
+ uses: actions/setup-python@v4
+ with:
+ python-version: ${{ matrix.python-version }}
+ architecture: x64
+ cache: 'pip'
+ cache-dependency-path: 'requirements*'
+ - name: check OS
+ run: cat /etc/os-release
+ - name: Install dependencies
+ run: |
+ sudo apt-get update
+ sudo apt-get install -y git make gcc
+ sudo apt-get install espeak espeak-ng
+ make system-deps
+ - name: Install/upgrade Python setup deps
+ run: python3 -m pip install --upgrade pip setuptools wheel
+ - name: Replace scarf urls
+ run: |
+ sed -i 's/https:\/\/coqui.gateway.scarf.sh\//https:\/\/github.com\/coqui-ai\/TTS\/releases\/download\//g' TTS/.models.json
+ - name: Install TTS
+ run: |
+ python3 -m pip install .[all]
+ python3 setup.py egg_info
+ - name: Unit tests
+ run: nose2 -F -v -B --with-coverage --coverage TTS tests.zoo_tests.test_models.test_models_offset_2_step_3

Dockerfile

@@ -1,20 +1,12 @@
-ARG BASE=nvcr.io/nvidia/pytorch:22.03-py3
+ARG BASE=nvidia/cuda:11.8.0-base-ubuntu22.04
 FROM ${BASE}
-RUN apt-get update && apt-get install -y --no-install-recommends gcc g++ make python3 python3-dev python3-pip python3-venv python3-wheel espeak espeak-ng libsndfile1-dev && rm -rf /var/lib/apt/lists/*
-RUN pip install llvmlite --ignore-installed
-
-# Create and activate virtual env
-ENV VIRTUAL_ENV=/venv
-RUN python3 -m venv $VIRTUAL_ENV
-ENV PATH="$VIRTUAL_ENV/bin:$PATH"
-RUN pip install -U pip setuptools wheel
+RUN apt-get update && apt-get upgrade -y
+RUN apt-get install -y --no-install-recommends gcc g++ make python3 python3-dev python3-pip python3-venv python3-wheel espeak-ng libsndfile1-dev && rm -rf /var/lib/apt/lists/*
+RUN pip3 install llvmlite --ignore-installed
 
 WORKDIR /root
-COPY requirements.txt /root
-COPY requirements.dev.txt /root
-COPY requirements.notebooks.txt /root
-RUN ["/bin/bash", "-c", "pip install -r <(cat requirements.txt requirements.dev.txt requirements.notebooks.txt)"]
 COPY . /root
+RUN pip3 install torch torchaudio --extra-index-url https://download.pytorch.org/whl/cu118
 RUN make install
 ENTRYPOINT ["tts"]
 CMD ["--help"]