Skip to content

Commit

Permalink
add pytorch=1.10.1, 1.11.0 to ci configurations
Browse files Browse the repository at this point in the history
  • Loading branch information
kamo-naoyuki committed May 10, 2022
1 parent 4d6c76a commit 4ff2ce1
Show file tree
Hide file tree
Showing 8 changed files with 35 additions and 16 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/centos7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 8 additions & 3 deletions .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/debian9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/test_import.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down
1 change: 1 addition & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion tools/Makefile
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 14 additions & 2 deletions tools/installers/install_torch.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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>=<number>
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 <torch-audio-ver> <default-cuda-version-for-pip-install-torch>

elif $(pytorch_plus 1.10.2); then
check_python_version 3.10 # Error if python>=<number>
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 <torch-audio-ver> <default-cuda-version-for-pip-install-torch>

elif $(pytorch_plus 1.10.1); then
check_python_version 3.10 # Error if python>=<number>
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 <torch-audio-ver> <default-cuda-version-for-pip-install-torch>

elif $(pytorch_plus 1.10.0); then
check_python_version 3.10 # Error if python>=<number>
check_python_version 3.11 # Error if python>=<number>
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 <torch-audio-ver> <default-cuda-version-for-pip-install-torch>

elif $(pytorch_plus 1.9.2); then
log "[ERROR] pytorch=${torch_version} doesn't exist"
exit 1
Expand Down

0 comments on commit 4ff2ce1

Please sign in to comment.