Update version and add ci for newest pytorch (#418)

kan-bayashi · Nov 13, 2023 · 22f097e · 22f097e
1 parent 89c14ee
commit 22f097e
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 36 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -16,17 +16,15 @@ jobs:
     strategy:
       max-parallel: 8
       matrix:
-        python-version: [3.7]
-        # 1.6 is failed on cpu: https://github.com/kan-bayashi/ParallelWaveGAN/issues/198
-        # 1.10 does not support python 3.6
-        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]
+        python-version: ["3.8"]
+        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]
     steps:
       - uses: actions/checkout@master
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pytorch-version }}-pip-${{ hashFiles('**/setup.py') }}
@@ -59,12 +57,12 @@ jobs:
           pytest test
 
   integration:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 10
       matrix:
-        python-version: [3.9]
-        pytorch-version: [1.13.1]
+        python-version: ["3.10"]
+        pytorch-version: [2.1.0]
         config:
           - "parallel_wavegan.v1.debug.yaml"
           - "melgan.v1.debug.yaml"
@@ -77,11 +75,11 @@ jobs:
           - "uhifigan.v1.debug.yaml"
     steps:
       - uses: actions/checkout@master
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pytorch-version }}-pip-${{ hashFiles('**/setup.py') }}
@@ -105,19 +103,19 @@ jobs:
           path: egs/yesno/voc1
 
   integration_segments:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 10
       matrix:
-        python-version: [3.9]
-        pytorch-version: [1.13.1]
+        python-version: ["3.10"]
+        pytorch-version: [2.1.0]
     steps:
       - uses: actions/checkout@master
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pytorch-version }}-pip-${{ hashFiles('**/setup.py') }}
@@ -141,23 +139,23 @@ jobs:
           path: egs/yesno/voc1
 
   integration_vq:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       max-parallel: 10
       matrix:
-        python-version: [3.8]
-        pytorch-version: [1.13.1]
+        python-version: ["3.10"]
+        pytorch-version: [2.1.0]
         config:
           - "melgan_vae.v3.debug.yaml"
           - "conditioned_melgan_vae.v3.debug.yaml"
           - "local_conditioned_melgan_vae.v3.debug.yaml"
     steps:
       - uses: actions/checkout@master
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v4
         with:
           python-version: ${{ matrix.python-version }}
           architecture: 'x64'
-      - uses: actions/cache@v2
+      - uses: actions/cache@v3
         with:
           path: ~/.cache/pip
           key: ${{ runner.os }}-${{ matrix.python-version }}-${{ matrix.pytorch-version }}-pip-${{ hashFiles('**/setup.py') }}

diff --git a/README.md b/README.md
@@ -54,18 +54,16 @@ You can try the real-time end-to-end text-to-speech and singing voice synthesis
 
 This repository is tested on Ubuntu 20.04 with a GPU Titan V.
 
-- Python 3.7+
-- Cuda 10.0+
-- CuDNN 7+
+- Python 3.8+
+- Cuda 11.0+
+- CuDNN 8+
 - NCCL 2+ (for distributed multi-gpu training)
 - libsndfile (you can install via `sudo apt install libsndfile-dev` in ubuntu)
 - jq (you can install via `sudo apt install jq` in ubuntu)
 - sox (you can install via `sudo apt install sox` in ubuntu)
 
 Different cuda version should be working but not explicitly tested.  
-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.
-
-Pytorch 1.6 works but there are some issues in cpu mode (See #198).
+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.
 
 ## Setup
 

diff --git a/parallel_wavegan/__init__.py b/parallel_wavegan/__init__.py
@@ -1,3 +1,3 @@
 # -*- coding: utf-8 -*-
 
-__version__ = "0.6.0"
+__version__ = "0.6.1"
diff --git a/setup.py b/setup.py
@@ -11,9 +11,9 @@
 from setuptools import find_packages
 from setuptools import setup
 
-if LooseVersion(sys.version) < LooseVersion("3.7"):
+if LooseVersion(sys.version) < LooseVersion("3.8"):
     raise RuntimeError(
-        "parallel-wavegan requires Python>=3.7, "
+        "parallel-wavegan requires Python>=3.8, "
         "but your Python is {}".format(sys.version)
     )
 if LooseVersion(pip.__version__) < LooseVersion("19"):
@@ -24,7 +24,7 @@
 
 requirements = {
     "install": [
-        "torch>=1.4",
+        "torch>=1.8",
         "setuptools>=38.5.1",
         "librosa>=0.8.0",
         "soundfile>=0.10.2",
@@ -37,8 +37,6 @@
         "yq>=2.10.0",
         "gdown",
         "filelock",
-        # https://github.com/kan-bayashi/ParallelWaveGAN/runs/6646851174?check_suite_focus=true#step:6:294
-        "protobuf<=3.20.1",
     ],
     "setup": [
         "numpy",
@@ -72,7 +70,7 @@
 dirname = os.path.dirname(__file__)
 setup(
     name="parallel_wavegan",
-    version="0.6.0",
+    version="0.6.1",
     url="http://github.com/kan-bayashi/ParallelWaveGAN",
     author="Tomoki Hayashi",
     author_email="hayashi.tomoki@g.sp.m.is.nagoya-u.ac.jp",
@@ -87,9 +85,9 @@
     extras_require=extras_require,
     entry_points=entry_points,
     classifiers=[
-        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Intended Audience :: Science/Research",
         "Operating System :: POSIX :: Linux",
         "License :: OSI Approved :: MIT License",

diff --git a/tools/Makefile b/tools/Makefile
@@ -1,4 +1,4 @@
-PYTHON:= python3.7
+PYTHON:= python3.8
 CUDA_VERSION:= 11.3
 PYTORCH_VERSION:= 1.12.1
 DOT:= .