Skip to content

Commit 22f097e

Browse files
authored
Update version and add ci for newest pytorch (#418)
1 parent 89c14ee commit 22f097e

File tree

5 files changed

+30
-36
lines changed

5 files changed

+30
-36
lines changed

.github/workflows/ci.yaml

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16,17 +16,15 @@ jobs:
1616
strategy:
1717
max-parallel: 8
1818
matrix:
19-
python-version: [3.7]
20-
# 1.6 is failed on cpu: https://github.com/kan-bayashi/ParallelWaveGAN/issues/198
21-
# 1.10 does not support python 3.6
22-
pytorch-version: [1.4, 1.5.1, 1.7.1, 1.8.1, 1.9, 1.10.2, 1.11.0, 1.12.1, 1.13.1]
19+
python-version: ["3.8"]
20+
pytorch-version: [1.8.1, 1.9, 1.10.2, 1.11.0, 1.12.1, 1.13.1, 2.0.1, 2.1.0]
2321
steps:
2422
- uses: actions/checkout@master
25-
- uses: actions/setup-python@v2
23+
- uses: actions/setup-python@v4
2624
with:
2725
python-version: ${{ matrix.python-version }}
2826
architecture: 'x64'
29-
- uses: actions/cache@v2
27+
- uses: actions/cache@v3
3028
with:
3129
path: ~/.cache/pip
3230
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pytorch-version }}-pip-${{ hashFiles('**/setup.py') }}
@@ -59,12 +57,12 @@ jobs:
5957
pytest test
6058
6159
integration:
62-
runs-on: ubuntu-20.04
60+
runs-on: ubuntu-22.04
6361
strategy:
6462
max-parallel: 10
6563
matrix:
66-
python-version: [3.9]
67-
pytorch-version: [1.13.1]
64+
python-version: ["3.10"]
65+
pytorch-version: [2.1.0]
6866
config:
6967
- "parallel_wavegan.v1.debug.yaml"
7068
- "melgan.v1.debug.yaml"
@@ -77,11 +75,11 @@ jobs:
7775
- "uhifigan.v1.debug.yaml"
7876
steps:
7977
- uses: actions/checkout@master
80-
- uses: actions/setup-python@v2
78+
- uses: actions/setup-python@v4
8179
with:
8280
python-version: ${{ matrix.python-version }}
8381
architecture: 'x64'
84-
- uses: actions/cache@v2
82+
- uses: actions/cache@v3
8583
with:
8684
path: ~/.cache/pip
8785
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pytorch-version }}-pip-${{ hashFiles('**/setup.py') }}
@@ -105,19 +103,19 @@ jobs:
105103
path: egs/yesno/voc1
106104

107105
integration_segments:
108-
runs-on: ubuntu-20.04
106+
runs-on: ubuntu-22.04
109107
strategy:
110108
max-parallel: 10
111109
matrix:
112-
python-version: [3.9]
113-
pytorch-version: [1.13.1]
110+
python-version: ["3.10"]
111+
pytorch-version: [2.1.0]
114112
steps:
115113
- uses: actions/checkout@master
116-
- uses: actions/setup-python@v2
114+
- uses: actions/setup-python@v4
117115
with:
118116
python-version: ${{ matrix.python-version }}
119117
architecture: 'x64'
120-
- uses: actions/cache@v2
118+
- uses: actions/cache@v3
121119
with:
122120
path: ~/.cache/pip
123121
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pytorch-version }}-pip-${{ hashFiles('**/setup.py') }}
@@ -141,23 +139,23 @@ jobs:
141139
path: egs/yesno/voc1
142140

143141
integration_vq:
144-
runs-on: ubuntu-20.04
142+
runs-on: ubuntu-22.04
145143
strategy:
146144
max-parallel: 10
147145
matrix:
148-
python-version: [3.8]
149-
pytorch-version: [1.13.1]
146+
python-version: ["3.10"]
147+
pytorch-version: [2.1.0]
150148
config:
151149
- "melgan_vae.v3.debug.yaml"
152150
- "conditioned_melgan_vae.v3.debug.yaml"
153151
- "local_conditioned_melgan_vae.v3.debug.yaml"
154152
steps:
155153
- uses: actions/checkout@master
156-
- uses: actions/setup-python@v2
154+
- uses: actions/setup-python@v4
157155
with:
158156
python-version: ${{ matrix.python-version }}
159157
architecture: 'x64'
160-
- uses: actions/cache@v2
158+
- uses: actions/cache@v3
161159
with:
162160
path: ~/.cache/pip
163161
key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pytorch-version }}-pip-${{ hashFiles('**/setup.py') }}

README.md

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -54,18 +54,16 @@ You can try the real-time end-to-end text-to-speech and singing voice synthesis
5454

5555
This repository is tested on Ubuntu 20.04 with a GPU Titan V.
5656

57-
- Python 3.7+
58-
- Cuda 10.0+
59-
- CuDNN 7+
57+
- Python 3.8+
58+
- Cuda 11.0+
59+
- CuDNN 8+
6060
- NCCL 2+ (for distributed multi-gpu training)
6161
- libsndfile (you can install via `sudo apt install libsndfile-dev` in ubuntu)
6262
- jq (you can install via `sudo apt install jq` in ubuntu)
6363
- sox (you can install via `sudo apt install sox` in ubuntu)
6464

6565
Different cuda version should be working but not explicitly tested.
66-
All of the codes are tested on Pytorch 1.4, 1.5.1, 1.7.1, 1.8.1, 1.9, 1.10.2, 1.11.0, 1.12.1, and 1.13.1.
67-
68-
Pytorch 1.6 works but there are some issues in cpu mode (See #198).
66+
All of the codes are tested on Pytorch 1.8.1, 1.9, 1.10.2, 1.11.0, 1.12.1, 1.13.1, 2.0.1 and 2.1.0.
6967

7068
## Setup
7169

parallel_wavegan/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# -*- coding: utf-8 -*-
22

3-
__version__ = "0.6.0"
3+
__version__ = "0.6.1"

setup.py

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
1111
from setuptools import find_packages
1212
from setuptools import setup
1313

14-
if LooseVersion(sys.version) < LooseVersion("3.7"):
14+
if LooseVersion(sys.version) < LooseVersion("3.8"):
1515
raise RuntimeError(
16-
"parallel-wavegan requires Python>=3.7, "
16+
"parallel-wavegan requires Python>=3.8, "
1717
"but your Python is {}".format(sys.version)
1818
)
1919
if LooseVersion(pip.__version__) < LooseVersion("19"):
@@ -24,7 +24,7 @@
2424

2525
requirements = {
2626
"install": [
27-
"torch>=1.4",
27+
"torch>=1.8",
2828
"setuptools>=38.5.1",
2929
"librosa>=0.8.0",
3030
"soundfile>=0.10.2",
@@ -37,8 +37,6 @@
3737
"yq>=2.10.0",
3838
"gdown",
3939
"filelock",
40-
# https://github.com/kan-bayashi/ParallelWaveGAN/runs/6646851174?check_suite_focus=true#step:6:294
41-
"protobuf<=3.20.1",
4240
],
4341
"setup": [
4442
"numpy",
@@ -72,7 +70,7 @@
7270
dirname = os.path.dirname(__file__)
7371
setup(
7472
name="parallel_wavegan",
75-
version="0.6.0",
73+
version="0.6.1",
7674
url="http://github.com/kan-bayashi/ParallelWaveGAN",
7775
author="Tomoki Hayashi",
7876
author_email="[email protected]",
@@ -87,9 +85,9 @@
8785
extras_require=extras_require,
8886
entry_points=entry_points,
8987
classifiers=[
90-
"Programming Language :: Python :: 3.7",
9188
"Programming Language :: Python :: 3.8",
9289
"Programming Language :: Python :: 3.9",
90+
"Programming Language :: Python :: 3.10",
9391
"Intended Audience :: Science/Research",
9492
"Operating System :: POSIX :: Linux",
9593
"License :: OSI Approved :: MIT License",

tools/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
PYTHON:= python3.7
1+
PYTHON:= python3.8
22
CUDA_VERSION:= 11.3
33
PYTORCH_VERSION:= 1.12.1
44
DOT:= .

0 commit comments

Comments
 (0)