Update CI for pytorch=1.10.1

yxf0605 · Dec 21, 2021 · 2f9479e · 2f9479e
1 parent 2dae3ee
commit 2f9479e
Show file tree

Hide file tree

Showing 9 changed files with 51 additions and 16 deletions.
diff --git 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.0
+        TH_VERSION: 1.10.1
         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
@@ -16,19 +16,19 @@ 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.0]
+        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]
         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.0
+            pytorch-version: 1.10.1
             chainer-verssion: 6.0.0
             use-conda: false
           - os: ubuntu-20.04
             python-version: 3.9
-            pytorch-version: 1.10.0
+            pytorch-version: 1.10.1
             chainer-verssion: 6.0.0
             use-conda: false
     steps:

diff --git 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.0
+        TH_VERSION: 1.10.1
         CHAINER_VERSION: 6.0.0
         USE_CONDA: true
         CC: gcc-6

diff --git a/.github/workflows/doc.yml b/.github/workflows/doc.yml
@@ -30,7 +30,7 @@ jobs:
       - name: install espnet
         env:
           ESPNET_PYTHON_VERSION: 3.8
-          TH_VERSION: 1.10.0
+          TH_VERSION: 1.10.1
           CHAINER_VERSION: 6.0.0
           USE_CONDA: false
           CC: gcc-7

diff --git 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.0]
+        pytorch-version: [1.10.1]
     steps:
     - uses: actions/checkout@v2
     - uses: actions/cache@v1

diff --git a/.mergify.yml b/.mergify.yml
@@ -11,10 +11,10 @@ pull_request_rules:
       - "check-success=linter_and_test (ubuntu-18.04, 3.7, 1.7.1, 6.0.0, false)"
       - "check-success=linter_and_test (ubuntu-18.04, 3.7, 1.8.1, 6.0.0, false)"
       - "check-success=linter_and_test (ubuntu-18.04, 3.7, 1.9.1, 6.0.0, false)"
-      - "check-success=linter_and_test (ubuntu-18.04, 3.7, 1.10.0, 6.0.0, false)"
-      - "check-success=linter_and_test (ubuntu-20.04, 3.8, 1.10.0, false, 6.0.0)"
-      - "check-success=linter_and_test (ubuntu-20.04, 3.9, 1.10.0, false, 6.0.0)"
-      - "check-success=test_import (ubuntu-latest, 3.9, 1.10.0)"
+      - "check-success=linter_and_test (ubuntu-18.04, 3.7, 1.10.1, 6.0.0, false)"
+      - "check-success=linter_and_test (ubuntu-20.04, 3.8, 1.10.1, false, 6.0.0)"
+      - "check-success=linter_and_test (ubuntu-20.04, 3.9, 1.10.1, false, 6.0.0)"
+      - "check-success=test_import (ubuntu-latest, 3.9, 1.10.1)"
     actions:
       merge:
         method: merge

diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 # 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.0|
+|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)|

diff --git a/tools/Makefile b/tools/Makefile
@@ -1,5 +1,5 @@
-# PyTorch version: 1.3.1, 1.4.0, 1.5.1, 1.6.0, 1.7.1, 1.8.1, 1.9.1 and 1.10.0 are tested.
-TH_VERSION := 1.10.0
+# 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.
+TH_VERSION := 1.10.1
 
 # Use pip for pytorch installation even if you have anaconda
 ifneq ($(shell test -f ./activate_python.sh && grep 'conda activate' ./activate_python.sh),)
@@ -188,7 +188,7 @@ s3prl.done: espnet.done
 k2.done: espnet.done
 	. ./activate_python.sh && ./installers/install_k2.sh
 	touch k2.done
-	
+
 gtn.done: espnet.done
 	. ./activate_python.sh && ./installers/install_gtn.sh
 	touch gtn.done

diff --git a/tools/installers/install_torch.sh b/tools/installers/install_torch.sh
@@ -121,14 +121,21 @@ log "[INFO] torch_version=${torch_version}"
 log "[INFO] cuda_version=${cuda_version}"
 
 
-if $(pytorch_plus 1.10.1); then
+if $(pytorch_plus 1.10.2); then
     log "[ERROR] This script doesn't support pytorch=${torch_version}"
     exit 1
 
+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_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
 
 elif $(pytorch_plus 1.9.1); then
     check_python_version 3.10
@@ -140,6 +147,10 @@ elif $(pytorch_plus 1.9.0); then
     check_cuda_version 11.1 10.2
     install_torch 0.9.0 10.2
 
+elif $(pytorch_plus 1.8.2); then
+    log "[ERROR] pytorch=${torch_version} doesn't exist"
+    exit 1
+
 elif $(pytorch_plus 1.8.1); then
     check_python_version 3.10
     check_cuda_version 11.1 10.2 10.1
@@ -150,6 +161,10 @@ elif $(pytorch_plus 1.8.0); then
     check_cuda_version 11.1 10.2 10.1
     install_torch 0.8.0 10.2
 
+elif $(pytorch_plus 1.7.2); then
+    log "[ERROR] pytorch=${torch_version} doesn't exist"
+    exit 1
+
 elif $(pytorch_plus 1.7.1); then
     check_python_version 3.10
     check_cuda_version 11.0 10.2 10.1 9.2
@@ -160,11 +175,19 @@ elif $(pytorch_plus 1.7.0); then
     check_cuda_version 11.0 10.2 10.1 9.2
     install_torch 0.7.0 10.2
 
+elif $(pytorch_plus 1.6.1); then
+    log "[ERROR] pytorch=${torch_version} doesn't exist"
+    exit 1
+
 elif $(pytorch_plus 1.6.0); then
     check_python_version 3.9
     check_cuda_version 10.2 10.1 9.2
     install_torch 0.6.0 10.2
 
+elif $(pytorch_plus 1.5.2); then
+    log "[ERROR] pytorch=${torch_version} doesn't exist"
+    exit 1
+
 elif $(pytorch_plus 1.5.1); then
     check_python_version 3.9
     check_cuda_version 10.2 10.1 9.2
@@ -175,11 +198,19 @@ elif $(pytorch_plus 1.5.0); then
     check_cuda_version 10.2 10.1 9.2
     install_torch 0.5.0 10.2
 
+elif $(pytorch_plus 1.4.1); then
+    log "[ERROR] pytorch=${torch_version} doesn't exist"
+    exit 1
+
 elif $(pytorch_plus 1.4.0); then
     check_python_version 3.9
     check_cuda_version 10.1 10.0 9.2
     install_torch 0.4.0 10.1
 
+elif $(pytorch_plus 1.3.2); then
+    log "[ERROR] pytorch=${torch_version} doesn't exist"
+    exit 1
+
 elif $(pytorch_plus 1.3.1); then
     check_python_version 3.8
     check_cuda_version 10.1 10.0 9.2
@@ -190,6 +221,10 @@ elif $(pytorch_plus 1.3.0); then
     check_cuda_version 10.1 10.0 9.2
     install_torch 0.3.1 10.1
 
+elif $(pytorch_plus 1.2.1); then
+    log "[ERROR] pytorch=${torch_version} doesn't exist"
+    exit 1
+
 elif $(pytorch_plus 1.2.0); then
     check_python_version 3.8
     check_cuda_version 10.0 9.2