From 316cf02340a627548b71317ba04afac457f68101 Mon Sep 17 00:00:00 2001
From: D-Keqi <61508571+D-Keqi@users.noreply.github.com>
Date: Thu, 28 Apr 2022 10:04:29 +0800
Subject: [PATCH] fix conflict

---
 ci/test_integration_espnet2.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/ci/test_integration_espnet2.sh b/ci/test_integration_espnet2.sh
index a6704bbf02b..b77856d7b9e 100755
--- a/ci/test_integration_espnet2.sh
+++ b/ci/test_integration_espnet2.sh
@@ -100,16 +100,6 @@ if python3 -c "import fairseq" &> /dev/null; then
     cd "${cwd}"
 fi
 
-# [ESPnet2] test enh_asr1 recipe
-if python -c 'import torch as t; from distutils.version import LooseVersion as L; assert L(t.__version__) >= L("1.2.0")' &> /dev/null;  then
-    cd ./egs2/mini_an4/enh_asr1
-    echo "==== [ESPnet2] ENH_ASR ==="
-    ./run.sh --ngpu 0 --stage 0 --stop-stage 15 --skip-upload_hf false --feats-type "raw" --spk-num 1 --enh_asr_args "--max_epoch=1 --enh_separator_conf num_spk=1" --python "${python}"
-    # Remove generated files in order to reduce the disk usage
-    rm -rf exp dump data
-    cd "${cwd}"
-fi
-
 # [ESPnet2] test st recipe
 cd ./egs2/mini_an4/st1
 echo "==== [ESPnet2] ST ==="
@@ -144,6 +134,16 @@ echo "==== use_streaming, feats_type=raw, token_types=bpe, model_conf.extract_fe
 rm -rf exp dump data
 cd "${cwd}"
 
+# [ESPnet2] test enh_asr1 recipe
+if python -c 'import torch as t; from distutils.version import LooseVersion as L; assert L(t.__version__) >= L("1.2.0")' &> /dev/null;  then
+    cd ./egs2/mini_an4/enh_asr1
+    echo "==== [ESPnet2] ENH_ASR ==="
+    ./run.sh --ngpu 0 --stage 0 --stop-stage 15 --skip-upload_hf false --feats-type "raw" --spk-num 1 --enh_asr_args "--max_epoch=1 --enh_separator_conf num_spk=1" --python "${python}"
+    # Remove generated files in order to reduce the disk usage
+    rm -rf exp dump data
+    cd "${cwd}"
+fi
+
 # [ESPnet2] Validate configuration files
 echo "<blank>" > dummy_token_list
 echo "==== [ESPnet2] Validation configuration files ==="