From cc77cb3459e2a34b542d55ced6127a6b0372c14b Mon Sep 17 00:00:00 2001
From: Fangjun Kuang <csukuangfj@gmail.com>
Date: Fri, 17 Sep 2021 16:49:03 +0800
Subject: [PATCH] Fix decode.py to remove the correct axis. (#50)

* Fix decode.py to remove the correct axis.

* Run GitHub actions manually.
---
 .github/workflows/run-yesno-recipe.yml | 10 +++++-----
 .github/workflows/test.yml             |  6 +++---
 icefall/decode.py                      | 10 +++++-----
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/run-yesno-recipe.yml b/.github/workflows/run-yesno-recipe.yml
index 448ec3e32..edd3d39ce 100644
--- a/.github/workflows/run-yesno-recipe.yml
+++ b/.github/workflows/run-yesno-recipe.yml
@@ -21,11 +21,11 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
+    types: [labeled]
 
 jobs:
   run-yesno-recipe:
+    if: github.event.label.name == 'ready' || github.event_name == 'push'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
@@ -33,6 +33,8 @@ jobs:
         # TODO: enable macOS for CPU testing
         os: [ubuntu-18.04]
         python-version: [3.8]
+        torch: ["1.8.1"]
+        k2-version: ["1.8.dev20210917"]
       fail-fast: false
 
     steps:
@@ -54,10 +56,8 @@ jobs:
 
       - name: Install Python dependencies
         run: |
-          python3 -m pip install --upgrade pip black flake8
           python3 -m pip install -U pip
-          python3 -m pip install k2==1.7.dev20210914+cpu.torch1.7.1 -f https://k2-fsa.org/nightly/
-          python3 -m pip install torchaudio==0.7.2
+          pip install k2==${{ matrix.k2-version }}+cpu.torch${{ matrix.torch }} -f https://k2-fsa.org/nightly/
           python3 -m pip install git+https://github.com/lhotse-speech/lhotse
 
           # We are in ./icefall and there is a file: requirements.txt in it
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 13b7742d9..6da27170c 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -21,18 +21,18 @@ on:
     branches:
       - master
   pull_request:
-    branches:
-      - master
+    types: [labeled]
 
 jobs:
   test:
+    if: github.event.label.name == 'ready' || github.event_name == 'push'
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
         os: [ubuntu-18.04, macos-10.15]
         python-version: [3.6, 3.7, 3.8, 3.9]
         torch: ["1.8.1"]
-        k2-version: ["1.7.dev20210914"]
+        k2-version: ["1.8.dev20210917"]
 
       fail-fast: false
 
diff --git a/icefall/decode.py b/icefall/decode.py
index dfac5700e..29b76d973 100644
--- a/icefall/decode.py
+++ b/icefall/decode.py
@@ -222,7 +222,7 @@ def nbest_decoding(
         word_seq = k2.ragged.index(lattice.aux_labels, path)
     else:
         word_seq = lattice.aux_labels.index(path)
-        word_seq = word_seq.remove_axis(1)
+        word_seq = word_seq.remove_axis(word_seq.num_axes - 2)
 
     # Remove 0 (epsilon) and -1 from word_seq
     word_seq = word_seq.remove_values_leq(0)
@@ -432,7 +432,7 @@ def rescore_with_n_best_list(
         word_seq = k2.ragged.index(lattice.aux_labels, path)
     else:
         word_seq = lattice.aux_labels.index(path)
-        word_seq = word_seq.remove_axis(1)
+        word_seq = word_seq.remove_axis(word_seq.num_axes - 2)
 
     # Remove epsilons and -1 from word_seq
     word_seq = word_seq.remove_values_leq(0)
@@ -669,7 +669,7 @@ def nbest_oracle(
         word_seq = k2.ragged.index(lattice.aux_labels, path)
     else:
         word_seq = lattice.aux_labels.index(path)
-        word_seq = word_seq.remove_axis(1)
+        word_seq = word_seq.remove_axis(word_seq.num_axes - 2)
 
     word_seq = word_seq.remove_values_leq(0)
     unique_word_seq, _, _ = word_seq.unique(
@@ -761,7 +761,7 @@ def rescore_with_attention_decoder(
         word_seq = k2.ragged.index(lattice.aux_labels, path)
     else:
         word_seq = lattice.aux_labels.index(path)
-        word_seq = word_seq.remove_axis(1)
+        word_seq = word_seq.remove_axis(word_seq.num_axes - 2)
 
     # Remove epsilons and -1 from word_seq
     word_seq = word_seq.remove_values_leq(0)
@@ -815,7 +815,7 @@ def rescore_with_attention_decoder(
         token_seq = k2.ragged.index(lattice.tokens, path)
     else:
         token_seq = lattice.tokens.index(path)
-        token_seq = token_seq.remove_axis(1)
+        token_seq = token_seq.remove_axis(token_seq.num_axes - 2)
 
     # Remove epsilons and -1 from token_seq
     token_seq = token_seq.remove_values_leq(0)