Skip to content

Commit

Permalink
change pt1.7.0 to pt1.7.1 in ci (espnet#2769)
Browse files Browse the repository at this point in the history
  • Loading branch information
kamo-naoyuki authored Dec 11, 2020
1 parent 29f1ddd commit f55f554
Show file tree
Hide file tree
Showing 11 changed files with 17 additions and 13 deletions.
8 changes: 4 additions & 4 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:
environment:
# default gcc version is 7
ESPNET_PYTHON_VERSION: 3.6
TH_VERSION: 1.7.0
TH_VERSION: 1.7.1
CHAINER_VERSION: 6.0.0
USE_CONDA: true
# To avoid UnicodeEncodeError for python<=3.6
Expand Down Expand Up @@ -69,7 +69,7 @@ jobs:
environment:
# default gcc version is 9
ESPNET_PYTHON_VERSION: 3.6
TH_VERSION: 1.7.0
TH_VERSION: 1.7.1
CHAINER_VERSION: 6.0.0
USE_CONDA: true
# To avoid UnicodeEncodeError for python<=3.6
Expand Down Expand Up @@ -118,7 +118,7 @@ jobs:
- image: centos:7
environment:
ESPNET_PYTHON_VERSION: 3.6
TH_VERSION: 1.7.0
TH_VERSION: 1.7.1
CHAINER_VERSION: 6.0.0
USE_CONDA: true
CC: /opt/rh/devtoolset-7/root/usr/bin/gcc
Expand Down Expand Up @@ -177,7 +177,7 @@ jobs:
- image: debian:9
environment:
ESPNET_PYTHON_VERSION: 3.6
TH_VERSION: 1.7.0
TH_VERSION: 1.7.1
CHAINER_VERSION: 6.0.0
USE_CONDA: true
CC: gcc-6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/centos7.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
image: centos:7
env:
ESPNET_PYTHON_VERSION: 3.6
TH_VERSION: 1.7.0
TH_VERSION: 1.7.1
CHAINER_VERSION: 6.0.0
USE_CONDA: true
CC: /opt/rh/devtoolset-7/root/usr/bin/gcc
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ jobs:
# os: [ubuntu-16.04, ubuntu-18.04]
os: [ubuntu-18.04]
python-version: [3.7, 3.8]
pytorch-version: [1.0.1, 1.1.0, 1.2.0, 1.3.1, 1.4.0, 1.5.1, 1.6.0, 1.7.0]
pytorch-version: [1.0.1, 1.1.0, 1.2.0, 1.3.1, 1.4.0, 1.5.1, 1.6.0, 1.7.1]
chainer-version: [6.0.0]
# NOTE(kamo): Conda is tested by Circle-CI
use-conda: [false]
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/debian9.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ jobs:
image: debian:9
env:
ESPNET_PYTHON_VERSION: 3.6
TH_VERSION: 1.7.0
TH_VERSION: 1.7.1
CHAINER_VERSION: 6.0.0
USE_CONDA: true
CC: gcc-6
Expand Down
3 changes: 2 additions & 1 deletion .mergify.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ pull_request_rules:
- "status-success=linter_and_test (ubuntu-18.04, 3.7, 1.4.0, 6.0.0, false)"
- "status-success=linter_and_test (ubuntu-18.04, 3.7, 1.5.1, 6.0.0, false)"
- "status-success=linter_and_test (ubuntu-18.04, 3.7, 1.6.0, 6.0.0, false)"
- "status-success=linter_and_test (ubuntu-18.04, 3.8, 1.7.0, 6.0.0, false)"
- "status-success=linter_and_test (ubuntu-18.04, 3.7, 1.7.1, 6.0.0, false)"
- "status-success=linter_and_test (ubuntu-18.04, 3.8, 1.7.1, 6.0.0, false)"
- "status-success=ci/circleci: test-centos7"
- "status-success=ci/circleci: test-debian9"
- "status-success=ci/circleci: test-ubuntu18"
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ addons:
- bc

env:
- USE_CONDA=false ESPNET_PYTHON_VERSION=3.8 TH_VERSION=1.7.0 CHAINER_VERSION=6.0.0 CC=gcc-7 CXX=g++-7
- USE_CONDA=false ESPNET_PYTHON_VERSION=3.8 TH_VERSION=1.7.1 CHAINER_VERSION=6.0.0 CC=gcc-7 CXX=g++-7
# torch nightly
# - USE_CONDA=false ESPNET_PYTHON_VERSION=3.7.3 TH_VERSION=nightly CHAINER_VERSION=6.0.0 CC=gcc-7 CXX=g++-7

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

# ESPnet: end-to-end speech processing toolkit

|system/pytorch ver.|1.0.1|1.1.0|1.2.0|1.3.1|1.4.0|1.5.1|1.6.0|1.7.0|
|system/pytorch ver.|1.0.1|1.1.0|1.2.0|1.3.1|1.4.0|1.5.1|1.6.0|1.7.1|
| :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: | :---: |
|ubuntu18/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)|
Expand Down
4 changes: 3 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,9 @@
if LooseVersion(torch.__version__) >= LooseVersion("1.1.0"):
requirements["install"].append("torch_optimizer")

if LooseVersion(torch.__version__) >= LooseVersion("1.7.0"):
if LooseVersion(torch.__version__) >= LooseVersion("1.7.1"):
requirements["install"].append("torchaudio==0.7.2")
elif LooseVersion(torch.__version__) >= LooseVersion("1.7.0"):
requirements["install"].append("torchaudio==0.7.0")
elif LooseVersion(torch.__version__) >= LooseVersion("1.6.0"):
# Due to https://github.com/pytorch/pytorch/issues/42213,
Expand Down
2 changes: 1 addition & 1 deletion tools/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
CHAINER_VERSION := 6.0.0
# Disable cupy installation
NO_CUPY :=
# PyTorch version: 0.4.1, 1.0.0, 1.0.1, 1.1.0, 1.2.0, 1.3.0, 1.3.1, 1.4.0, 1.5.0, 1.5.1, 1.6.0
# PyTorch version: 0.4.1, 1.0.0, 1.0.1, 1.1.0, 1.2.0, 1.3.0, 1.3.1, 1.4.0, 1.5.0, 1.5.1, 1.6.0, 1.7.0, 1.7.1
TH_VERSION := 1.4.0
WGET := wget --tries=3

Expand Down
1 change: 1 addition & 0 deletions tools/check_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,7 @@
"1.5.1",
"1.6.0",
"1.7.0",
"1.7.1",
)


Expand Down
2 changes: 1 addition & 1 deletion tools/check_pytorch_cuda_compatibility.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ def check(pytorch_version: str, cuda_version: str):
# You probably could perform pytorch with the cuda-version
# if you built pytorch at local.
maybe_supported = []
# 1.7.0
# 1.7.0 or 1.7.1
if LooseVersion("1.8") > LooseVersion(pytorch_version) >= LooseVersion("1.7"):
supported = ["11.0", "10.2", "10.1", "9.2"]
# 1.6.0
Expand Down

0 comments on commit f55f554

Please sign in to comment.