Merge remote-tracking branch 'dan/master' into doc

k2-fsa · Nov 4, 2021 · 4a020d3 · 4a020d3
2 parents eaa2263 + e6db5dc
commit 4a020d3
Show file tree

Hide file tree

Showing 42 changed files with 1,214 additions and 374 deletions.
diff --git a/.github/workflows/build-cpu.yml b/.github/workflows/build-cpu.yml
@@ -23,21 +23,21 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
+    types: [labeled]
 
 env:
   BUILD_TYPE: Release
 
 jobs:
   build-cpu:
+    if: github.event.label.name == 'ready' || github.event_name == 'push'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04, macos-10.15]
-        torch: ["1.5.0", "1.5.1", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0"]
-        # Python 3.9 is for PyTorch 1.7.1, 1.8.x, 1.9.0,
+        torch: ["1.5.0", "1.5.1", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0", "1.9.1", "1.10"]
+        # Python 3.9 is for PyTorch 1.7.1, 1.8.x, 1.9.x, 1.10
         python-version: [3.6, 3.7, 3.8, 3.9]
         exclude:
           - python-version: 3.9 # exclude Python 3.9 for [1.5.0, 1.5.1, 1.6.0, 1.7.0]

diff --git a/.github/workflows/build-doc.yml b/.github/workflows/build-doc.yml
@@ -23,6 +23,7 @@ on:
     branches:
     - master
     - doc
+    - doc-test
 
 env:
   # debug is faster in terms of compilation time

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -23,33 +23,56 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
+    types: [labeled]
 
 env:
   BUILD_TYPE: Release
 
 jobs:
   build:
+    if: github.event.label.name == 'ready' || github.event_name == 'push'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04]
         # from https://download.pytorch.org/whl/torch_stable.html
-        # 1.9.0 supports: cuda10.2 (default), 11.1
+        # Note: There are no torch versions for CUDA 11.2
+        #
+        # 1.10 supports: cuda10.2 (default), 11.1, 11.3
+        # 1.9.x supports: cuda10.2 (default), 11.1
         # PyTorch 1.8.x supports: cuda 10.1, 10.2 (default), 11.1
         # PyTorch 1.7.x supports: cuda 10.1, 10.2 (default), 11.0
         # PyTorch 1.6.0 supports: cuda 10.1, 10.2 (default)
         # PyTorch 1.5.x supports: cuda 10.1, 10.2 (default)
         # Other PyTorch versions are not tested
-        cuda: ["10.1", "10.2", "11.0", "11.1"]
+        # CUDA 11.3 is for torch 1.10
+        cuda: ["10.1", "10.2", "11.0", "11.1", "11.3"]
         gcc: ["7"]
-        torch: ["1.5.0", "1.5.1", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0"]
-        # Python 3.9 is for PyTorch 1.7.1, 1.8.0, 1.8.1, 1.9.0
+        torch: ["1.5.0", "1.5.1", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0", "1.9.1", "1.10"]
+        #
+        # Python 3.9 is for PyTorch 1.7.1, 1.8.0, 1.8.1, 1.9.x, 1.10
         python-version: [3.6, 3.7, 3.8, 3.9]
         exclude:
-          - cuda: "11.0" # exclude 11.0 for [1.5.0, 1.5.1, 1.6.0, 1.8.0, 1.8.1, 1.9.0]
+          - cuda: "11.3" # exclude 11.3 for [1.5.0, 1.5.1, 1.6.0, 1.7.0, 1.7.1, 1.8.0, 1.8.1, 1.9.0, 1.9.1]
+            torch: "1.5.0"
+          - cuda: "11.3"
+            torch: "1.5.1"
+          - cuda: "11.3"
+            torch: "1.6.0"
+          - cuda: "11.3"
+            torch: "1.7.0"
+          - cuda: "11.3"
+            torch: "1.7.1"
+          - cuda: "11.3"
+            torch: "1.8.0"
+          - cuda: "11.3"
+            torch: "1.8.1"
+          - cuda: "11.3"
+            torch: "1.9.0"
+          - cuda: "11.3"
+            torch: "1.9.1"
+          - cuda: "11.0" # exclude 11.0 for [1.5.0, 1.5.1, 1.6.0, 1.8.0, 1.8.1, 1.9.0, 1.9.1, 1.10]
             torch: "1.5.0"
           - cuda: "11.0"
             torch: "1.5.1"
@@ -61,6 +84,10 @@ jobs:
             torch: "1.8.1"
           - cuda: "11.0"
             torch: "1.9.0"
+          - cuda: "11.0"
+            torch: "1.9.1"
+          - cuda: "11.0"
+            torch: "1.10"
           - cuda: "11.1" # exclude 11.1 for [1.5.0, 1.5.1, 1.6.0, 1.7.0, 1.7.1]
             torch: "1.5.0"
           - cuda: "11.1"
@@ -71,8 +98,12 @@ jobs:
             torch: "1.7.0"
           - cuda: "11.1"
             torch: "1.7.1"
-          - cuda: "10.1" # exclude CUDA 10.1 for [1.9.0]
+          - cuda: "10.1" # exclude CUDA 10.1 for [1.9.0, 1.9.1, 1.10]
             torch: "1.9.0"
+          - cuda: "10.1"
+            torch: "1.9.1"
+          - cuda: "10.1"
+            torch: "1.10"
           - python-version: 3.9 # exclude Python 3.9 for [1.5.0, 1.5.1, 1.6.0, 1.7.0]
             torch: "1.5.0"
           - python-version: 3.9
@@ -117,6 +148,10 @@ jobs:
           echo "CXX=/usr/bin/g++-${{ matrix.gcc }}" >> $GITHUB_ENV
           echo "CUDAHOSTCXX=/usr/bin/g++-${{ matrix.gcc }}" >> $GITHUB_ENV
 
+      - name: Install git lfs
+        run: |
+          sudo apt-get install -y git-lfs
+
       - name: Setup Python ${{ matrix.python-version }}
         uses: actions/setup-python@v2
         with:

diff --git a/.github/workflows/build_conda.yml b/.github/workflows/build_conda.yml
@@ -32,21 +32,20 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16.04]
-        # anaconda does not support 3.9 as of 2021.05.08
+        os: [ubuntu-18.04]
         python-version: [3.6, 3.7, 3.8, 3.9]
-        # python-version: [3.6, 3.7, 3.8]
-        cuda: ["10.1", "10.2", "11.0", "11.1"]
+        cuda: ["10.1", "10.2", "11.0", "11.1", "11.3"]
         # from https://download.pytorch.org/whl/torch_stable.html
         #
-        # PyTorch 1.9.0 supports: 10.2 (default), 11.1
+        # PyTorch 1.10 supports: 10.2 (default), 11.1, 11.3
+        # PyTorch 1.9.x supports: 10.2 (default), 11.1
         # PyTorch 1.8.1 supports: cuda 10.1, 10.2 (default), 11.1
         # PyTorch 1.8.0 supports: cuda 10.1, 10.2 (default), 11.1
         # PyTorch 1.7.x supports: cuda 10.1, 10.2 (default), 11.0, 9.2 (not included in this setup)
         # PyTorch 1.6.0 supports: cuda 10.1, 10.2 (default), 9.2 (not included in this setup)
         # PyTorch 1.5.x supports: cuda 10.1, 10.2 (default), 9.2 (not included in this setup)
         #
-        # PyTorch 1.8.x and 1.7.1 support 3.6, 3.7, 3.8, 3.9
+        # PyTorch 1.7.1, 1.8.x, 1.9.x, and 1.10 support 3.6, 3.7, 3.8, 3.9
         # PyTorch 1.7.0, 1.6.0, and 1.5.x support 3.6, 3.7, 3.8
         #
         # Other PyTorch versions are not tested
@@ -57,9 +56,9 @@ jobs:
         #  https://github.com/csukuangfj/k2/runs/2533830771?check_suite_focus=true
         #  and
         #  https://github.com/NVIDIA/apex/issues/805
-        torch: ["1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0"]
+        torch: ["1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0", "1.9.1", "1.10"]
         exclude:
-          # - cuda: "11.0" # exclude 11.0 for [1.5.0, 1.5.1, 1.6.0, 1.8.0, 1.8.1, 1.9.0]
+          # - cuda: "11.0" # exclude 11.0 for [1.5.0, 1.5.1, 1.6.0, 1.8.0, 1.8.1, 1.9.0, 1.9.1, 1.10]
           #   torch: "1.5.0"
           # - cuda: "11.0"
           #   torch: "1.5.1"
@@ -71,6 +70,10 @@ jobs:
             torch: "1.8.1"
           - cuda: "11.0"
             torch: "1.9.0"
+          - cuda: "11.0"
+            torch: "1.9.1"
+          - cuda: "11.0"
+            torch: "1.10"
           # - cuda: "11.1" # exclude 11.1 for [1.5.0, 1.5.1, 1.6.0, 1.7.0, 1.7.1]
           #   torch: "1.5.0"
           # - cuda: "11.1"
@@ -81,8 +84,12 @@ jobs:
             torch: "1.7.0"
           - cuda: "11.1"
             torch: "1.7.1"
-          - cuda: "10.1" # exclude 10.1 for [1.9.0]
+          - cuda: "10.1" # exclude 10.1 for [1.9.0, 1.9.1, 1.10]
             torch: "1.9.0"
+          - cuda: "10.1"
+            torch: "1.9.1"
+          - cuda: "10.1"
+            torch: "1.10"
           - python-version: 3.9 # exclude Python 3.9 for [1.5.0, 1.5.1, 1.6.0, 1.7.0]
             torch: "1.5.0"
           - python-version: 3.9
@@ -142,6 +149,10 @@ jobs:
           conda info
           nproc
 
+      - name: Install git lfs
+        run: |
+          sudo apt-get install -y git-lfs
+
       - name: Download cudnn 8.0
         shell: bash -l {0}
         env:

diff --git a/.github/workflows/build_conda_cpu.yml b/.github/workflows/build_conda_cpu.yml
@@ -42,27 +42,25 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        os: [ubuntu-16.04, macos-10.15]
-        # anaconda does not support 3.9 as of 2021.05.08
-        # python-version: [3.6, 3.7, 3.8, 3.9]
-        python-version: [3.6, 3.7, 3.8]
+        os: [ubuntu-18.04, macos-10.15]
+        python-version: [3.6, 3.7, 3.8, 3.9]
         # from https://download.pytorch.org/whl/torch_stable.html
         #
-        # PyTorch 1.9.0, 1.8.x, and 1.7.1 support 3.6, 3.7, 3.8, 3.9
+        # PyTorch 1.10, 1.9.x, 1.8.x, and 1.7.1 support 3.6, 3.7, 3.8, 3.9
         # PyTorch 1.7.0, 1.6.0, and 1.5.x support 3.6, 3.7, 3.8
         #
         # Other PyTorch versions are not tested
         #
-        torch: ["1.5.0", "1.5.1", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0"]
-        # exclude:
-        #   - python-version: 3.9 # exclude Python 3.9 for [1.5.0, 1.5.1, 1.6.0, 1.7.0]
-        #     torch: "1.5.0"
-        #   - python-version: 3.9
-        #     torch: "1.5.1"
-        #   - python-version: 3.9
-        #     torch: "1.6.0"
-        #   - python-version: 3.9
-        #     torch: "1.7.0"
+        torch: ["1.5.0", "1.5.1", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0", "1.9.1", "1.10"]
+        exclude:
+          - python-version: 3.9 # exclude Python 3.9 for [1.5.0, 1.5.1, 1.6.0, 1.7.0]
+            torch: "1.5.0"
+          - python-version: 3.9
+            torch: "1.5.1"
+          - python-version: 3.9
+            torch: "1.6.0"
+          - python-version: 3.9
+            torch: "1.7.0"
 
     steps:
       # refer to https://github.com/actions/checkout

diff --git a/.github/workflows/nightly-cpu.yml b/.github/workflows/nightly-cpu.yml
@@ -39,14 +39,11 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-18.04, macos-10.15]
-        # Python 3.9 is for PyTorch 1.7.1, 1.8.x, 1.9.0
-        # torch 1.3.1 supports only Python 3.5/6/7
+        # Python 3.9 is for PyTorch 1.7.1, 1.8.x, 1.9.x, 1.10
         python-version: [3.6, 3.7, 3.8, 3.9]
-        torch: ["1.3.1", "1.4.0", "1.5.0", "1.5.1", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0"]
+        torch: ["1.4.0", "1.5.0", "1.5.1", "1.6.0", "1.7.0", "1.7.1", "1.8.0", "1.8.1", "1.9.0", "1.9.1", "1.10"]
         exclude:
-          - python-version: 3.9 # exclude Python 3.9 for [1.3.1, 1.4.0, 1.5.0, 1.5.1, 1.6.0, 1.7.0]
-            torch: "1.3.1"
-          - python-version: 3.9
+          - python-version: 3.9 # exclude Python 3.9 for [1.4.0, 1.5.0, 1.5.1, 1.6.0, 1.7.0]
             torch: "1.4.0"
           - python-version: 3.9
             torch: "1.5.0"
@@ -56,8 +53,6 @@ jobs:
             torch: "1.6.0"
           - python-version: 3.9
             torch: "1.7.0"
-          - python-version: 3.8 # exclude Python 3.8 for [1.3.1]
-            torch: "1.3.1"
 
     steps:
       - uses: actions/checkout@v2

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -1,6 +1,9 @@
 name: nightly
 
 on:
+  push:
+    branches:
+      - nightly
   schedule:
     # minute (0-59)
     # hour (0-23)
@@ -80,6 +83,10 @@ jobs:
           ./scripts/github_actions/install_torch.sh
           python3 -c "import torch; print('torch version:', torch.__version__)"
 
+      - name: Install git lfs
+        run: |
+          sudo apt-get install -y git-lfs
+
       - name: Download cudnn 8.0
         env:
           cuda: ${{ matrix.cuda }}

diff --git a/.github/workflows/run-tests-cpu.yml b/.github/workflows/run-tests-cpu.yml
@@ -23,11 +23,11 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
+    types: [labeled]
 
 jobs:
   run-tests-cpu:
+    if: github.event.label.name == 'ready' || github.event_name == 'push'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false

diff --git a/.github/workflows/run-tests.yml b/.github/workflows/run-tests.yml
@@ -23,11 +23,11 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
+    types: [labeled]
 
 jobs:
   run-tests:
+    if: github.event.label.name == 'ready' || github.event_name == 'push'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
@@ -91,6 +91,10 @@ jobs:
           ./scripts/github_actions/install_torch.sh
           python3 -c "import torch; print('torch version:', torch.__version__)"
 
+      - name: Install git lfs
+        run: |
+          sudo apt-get install -y git-lfs
+
       - name: Download cudnn 8.0
         env:
           cuda: ${{ matrix.cuda }}

diff --git a/.github/workflows/wheel-stable.yml b/.github/workflows/wheel-stable.yml
@@ -70,6 +70,10 @@ jobs:
           ./scripts/github_actions/install_torch.sh
           python3 -c "import torch; print('torch version:', torch.__version__)"
 
+      - name: Install git lfs
+        run: |
+          sudo apt-get install -y git-lfs
+
       - name: Download cudnn 8.0
         env:
           cuda: ${{ matrix.cuda }}

diff --git a/.github/workflows/wheel.yml b/.github/workflows/wheel.yml
@@ -70,6 +70,10 @@ jobs:
           ./scripts/github_actions/install_torch.sh
           python3 -c "import torch; print('torch version:', torch.__version__)"
 
+      - name: Install git lfs
+        run: |
+          sudo apt-get install -y git-lfs
+
       - name: Download cudnn 8.0
         env:
           cuda: ${{ matrix.cuda }}

diff --git a/.github/workflows/windows.yml b/.github/workflows/windows.yml
@@ -22,15 +22,15 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
+    types: [labeled]
 
 env:
   BUILD_TYPE: Release
 
 jobs:
   build-windows:
     # see https://github.com/actions/virtual-environments/blob/win19/20210525.0/images/win/Windows2019-Readme.md
+    if: github.event.label.name == 'ready' || github.event_name == 'push'
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
-Original file line number
+Diff line change
@@ Expand Up / @@ -23,6 +23,7 @@ on: @@
         branches:
         - master
         - doc
+        - doc-test
     env:
       # debug is faster in terms of compilation time
@@ Expand Down @@