Merge remote-tracking branch 'dan/master' into ctc-ali

k2-fsa · csukuangfj · Oct 18, 2021 · Sep 7, 2021 · Sep 7, 2021 · Sep 8, 2021
commit 4580ff10df946eb9046eb1d870bcf7fb6ab0cf97
diff --git a/icefall/decode.py b/icefall/decode.py
@@ -881,33 +881,9 @@ def rescore_with_attention_decoder(
                 + n_scale * ngram_lm_scores.values
                 + a_scale * attention_scores
             )
-            ragged_tot_scores = k2.RaggedTensor(seq_to_path_shape, tot_scores)
-            argmax_indexes = ragged_tot_scores.argmax()
-
-            best_path_indexes = k2.index_select(new2old, argmax_indexes)
-
-            # best_path is a k2.RaggedTensor with 2 axes [path][arc_pos]
-            best_path, _ = path_2axes.index(
-                indexes=best_path_indexes, axis=0, need_value_indexes=False
-            )
-
-            # labels is a k2.RaggedTensor with 2 axes [path][token_id]
-            # Note that it contains -1s.
-            labels = k2.ragged.index(lattice.labels.contiguous(), best_path)
-
-            labels = labels.remove_values_eq(-1)
-
-            if isinstance(lattice.aux_labels, torch.Tensor):
-                aux_labels = k2.index_select(
-                    lattice.aux_labels, best_path.values
-                )
-            else:
-                aux_labels, _ = lattice.aux_labels.index(
-                    indexes=best_path.values, axis=0, need_value_indexes=False
-                )
-
-            best_path_fsa = k2.linear_fsa(labels)
-            best_path_fsa.aux_labels = aux_labels
+            ragged_tot_scores = k2.RaggedTensor(nbest.shape, tot_scores)
+            max_indexes = ragged_tot_scores.argmax()
+            best_path = k2.index_fsa(nbest.fsa, max_indexes)
 
             key = f"ngram_lm_scale_{n_scale}_attention_scale_{a_scale}"
             ans[key] = best_path

diff --git a/test/test_utils.py b/test/test_utils.py
@@ -114,6 +114,18 @@ def test_attribute_dict():
     s.c = 100
     assert s["c"] == 100
 
+    assert hasattr(s, "a")
+    assert hasattr(s, "b")
+    assert getattr(s, "a") == 10
+    del s.a
+    assert hasattr(s, "a") is False
+    setattr(s, "c", 100)
+    s.c = 100
+    try:
+        del s.a
+    except AttributeError as ex:
+        print(f"Caught exception: {ex}")
+
 
 def test_get_env_info():
     s = get_env_info()