From 4ff2ce1244e0af72439deaa59226eba434a70618 Mon Sep 17 00:00:00 2001 From: kamo-naoyuki Date: Tue, 10 May 2022 11:34:31 +0900 Subject: [PATCH] add pytorch=1.10.1, 1.11.0 to ci configurations --- .github/workflows/centos7.yml | 2 +- .github/workflows/ci.yaml | 11 ++++++++--- .github/workflows/debian9.yml | 2 +- .github/workflows/test_import.yaml | 2 +- README.md | 15 ++++++++------- setup.py | 1 + tools/Makefile | 2 +- tools/installers/install_torch.sh | 16 ++++++++++++++-- 8 files changed, 35 insertions(+), 16 deletions(-) diff --git a/.github/workflows/centos7.yml b/.github/workflows/centos7.yml index 94d5973e859..d365c2e4961 100644 --- a/.github/workflows/centos7.yml +++ b/.github/workflows/centos7.yml @@ -19,7 +19,7 @@ jobs: # ImportError: /lib64/libstdc++.so.6: version `CXXABI_1.3.8' not found # (required by /__w/espnet/espnet/tools/venv/envs/espnet/lib/python3.6/site-packages/pyworld/pyworld.cpython-36m-x86_64-linux-gnu.so) # NOTE(kamo): The issue doens't exist for python3.7? - TH_VERSION: 1.10.1 + TH_VERSION: 1.11.0 CHAINER_VERSION: 6.0.0 USE_CONDA: true CC: /opt/rh/devtoolset-7/root/usr/bin/gcc diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index a01edd95bc7..ac69ca49b32 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -16,19 +16,24 @@ jobs: matrix: os: [ubuntu-18.04] python-version: [3.7] - pytorch-version: [1.3.1, 1.4.0, 1.5.1, 1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.1] + pytorch-version: [1.3.1, 1.4.0, 1.5.1, 1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.2, 1.11.0] chainer-version: [6.0.0] # NOTE(kamo): Conda is tested by Circle-CI use-conda: [false] include: - os: ubuntu-20.04 python-version: 3.8 - pytorch-version: 1.10.1 + pytorch-version: 1.11.0 chainer-verssion: 6.0.0 use-conda: false - os: ubuntu-20.04 python-version: 3.9 - pytorch-version: 1.10.1 + pytorch-version: 1.11.0 + chainer-verssion: 6.0.0 + use-conda: false + - os: ubuntu-20.04 + python-version: 3.10 + pytorch-version: 1.11.0 chainer-verssion: 6.0.0 use-conda: false steps: diff --git a/.github/workflows/debian9.yml b/.github/workflows/debian9.yml index a29e5474ad4..79a68e8383d 100644 --- a/.github/workflows/debian9.yml +++ b/.github/workflows/debian9.yml @@ -15,7 +15,7 @@ jobs: image: debian:9 env: ESPNET_PYTHON_VERSION: 3.7 - TH_VERSION: 1.10.1 + TH_VERSION: 1.11.0 CHAINER_VERSION: 6.0.0 USE_CONDA: true CC: gcc-6 diff --git a/.github/workflows/test_import.yaml b/.github/workflows/test_import.yaml index ead9f587c07..1031d3e5601 100644 --- a/.github/workflows/test_import.yaml +++ b/.github/workflows/test_import.yaml @@ -16,7 +16,7 @@ jobs: matrix: os: [ubuntu-latest] python-version: [3.9] - pytorch-version: [1.10.1] + pytorch-version: [1.11.0] steps: - uses: actions/checkout@v2 - uses: actions/cache@v1 diff --git a/README.md b/README.md index 67579053c77..0493ec5b56e 100644 --- a/README.md +++ b/README.md @@ -2,14 +2,15 @@ # ESPnet: end-to-end speech processing toolkit -|system/pytorch ver.|1.3.1|1.4.0|1.5.1|1.6.0|1.7.1|1.8.1|1.9.1|1.10.1| -| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | -|ubuntu20/python3.9/pip||||||||[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)| -|ubuntu20/python3.8/pip||||||||[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)| +|system/pytorch ver.|1.3.1|1.4.0|1.5.1|1.6.0|1.7.1|1.8.1|1.9.1|1.10.2|1.11.0| +| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | +|ubuntu20/python3.10/pip|||||||||[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)| +|ubuntu20/python3.9/pip|||||||||[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)| +|ubuntu20/python3.8/pip|||||||||[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)| |ubuntu18/python3.7/pip|[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)|[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)|[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)|[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)|[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)|[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)|[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)|[![Github Actions](https://github.com/espnet/espnet/workflows/CI/badge.svg)](https://github.com/espnet/espnet/actions)| -|debian9/python3.7/conda||||||||[![debian9](https://github.com/espnet/espnet/workflows/debian9/badge.svg)](https://github.com/espnet/espnet/actions?query=workflow%3Adebian9)| -|centos7/python3.7/conda||||||||[![centos7](https://github.com/espnet/espnet/workflows/centos7/badge.svg)](https://github.com/espnet/espnet/actions?query=workflow%3Acentos7)| -|doc/python3.8||||||||[![doc](https://github.com/espnet/espnet/workflows/doc/badge.svg)](https://github.com/espnet/espnet/actions?query=workflow%3Adoc)| +|debian9/python3.7/conda|||||||||[![debian9](https://github.com/espnet/espnet/workflows/debian9/badge.svg)](https://github.com/espnet/espnet/actions?query=workflow%3Adebian9)| +|centos7/python3.7/conda|||||||||[![centos7](https://github.com/espnet/espnet/workflows/centos7/badge.svg)](https://github.com/espnet/espnet/actions?query=workflow%3Acentos7)| +|doc/python3.8|||||||||[![doc](https://github.com/espnet/espnet/workflows/doc/badge.svg)](https://github.com/espnet/espnet/actions?query=workflow%3Adoc)| [![PyPI version](https://badge.fury.io/py/espnet.svg)](https://badge.fury.io/py/espnet) [![Python Versions](https://img.shields.io/pypi/pyversions/espnet.svg)](https://pypi.org/project/espnet/) diff --git a/setup.py b/setup.py index dbe351bc1e0..dd7dc887308 100644 --- a/setup.py +++ b/setup.py @@ -136,6 +136,7 @@ "Programming Language :: Python :: 3.7", "Programming Language :: Python :: 3.8", "Programming Language :: Python :: 3.9", + "Programming Language :: Python :: 3.10", "Development Status :: 5 - Production/Stable", "Intended Audience :: Science/Research", "Operating System :: POSIX :: Linux", diff --git a/tools/Makefile b/tools/Makefile index 6431955b1b9..f40f6c57d39 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -1,4 +1,4 @@ -# PyTorch version: 1.3.1, 1.4.0, 1.5.1, 1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.0 and 1.10.1 are tested. +# PyTorch version: 1.3.1, 1.4.0, 1.5.1, 1.6.0, 1.7.1, 1.8.1, 1.9.1, 1.10.0, 1.10.1 and 1.11.0 are tested. TH_VERSION := 1.10.1 # Use pip for pytorch installation even if you have anaconda diff --git a/tools/installers/install_torch.sh b/tools/installers/install_torch.sh index 285e37b6fd4..7faa4d535e7 100755 --- a/tools/installers/install_torch.sh +++ b/tools/installers/install_torch.sh @@ -121,18 +121,30 @@ log "[INFO] torch_version=${torch_version}" log "[INFO] cuda_version=${cuda_version}" -if $(pytorch_plus 1.10.2); then +if $(pytorch_plus 1.11.1); then log "[ERROR] This script doesn't support pytorch=${torch_version}" exit 1 +elif $(pytorch_plus 1.11.0); then + check_python_version 3.11 # Error if python>= + check_cuda_version 11.5 11.3 11.1 10.2 # Error if cuda_version doesn't match with any given numbers + install_torch 0.11.0 10.2 # install_torch + +elif $(pytorch_plus 1.10.2); then + check_python_version 3.10 # Error if python>= + check_cuda_version 11.3 11.1 10.2 # Error if cuda_version doesn't match with any given numbers + install_torch 0.10.2 10.2 # install_torch + elif $(pytorch_plus 1.10.1); then check_python_version 3.10 # Error if python>= check_cuda_version 11.3 11.1 10.2 # Error if cuda_version doesn't match with any given numbers install_torch 0.10.1 10.2 # install_torch + elif $(pytorch_plus 1.10.0); then - check_python_version 3.10 # Error if python>= + check_python_version 3.11 # Error if python>= check_cuda_version 11.3 11.1 10.2 # Error if cuda_version doesn't match with any given numbers install_torch 0.10.0 10.2 # install_torch + elif $(pytorch_plus 1.9.2); then log "[ERROR] pytorch=${torch_version} doesn't exist" exit 1