From d5ac1b20de4fe008944dafd6d8e2dac0fae3cec8 Mon Sep 17 00:00:00 2001
From: Mathieu Poumeyrol <kali@zoy.org>
Date: Tue, 16 May 2023 09:55:17 +0200
Subject: [PATCH] kill kaldi

---
 CHANGELOG.md                                      |  3 +++
 onnx/test_cases/qlstm_3-2-3_T3_S1/vars.sh         |  1 -
 onnx/test_cases/qrelu_1/vars.sh                   |  1 -
 onnx/test_cases/qrelu_2/vars.sh                   |  1 -
 onnx/test_cases/qsigmoid_1/vars.sh                |  1 -
 onnx/test_cases/qsigmoid_2/vars.sh                |  1 -
 onnx/test_cases/qtanh_1/vars.sh                   |  1 -
 onnx/test_cases/qtanh_2/vars.sh                   |  1 -
 onnx/test_cases/qtdnn_10x5_101_i32_biases/vars.sh |  1 -
 onnx/test_cases/run_all.sh                        | 10 +++-------
 post-release.sh                                   |  2 +-
 release.sh                                        |  2 +-
 12 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6391fdd492..18dbe79241 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# Unreleased, targetting 0.21
+* [kaldi] remove experimental kaldi support
+
 # 0.20.5 - 2023-05-26
 * Various bugfix around Einsum
 * Einsum now has functions to translate to MatMul and other axes manipulations
diff --git a/onnx/test_cases/qlstm_3-2-3_T3_S1/vars.sh b/onnx/test_cases/qlstm_3-2-3_T3_S1/vars.sh
index 0ca3c6d0b1..851705d38c 100644
--- a/onnx/test_cases/qlstm_3-2-3_T3_S1/vars.sh
+++ b/onnx/test_cases/qlstm_3-2-3_T3_S1/vars.sh
@@ -1,5 +1,4 @@
 left_context=0
 right_context=0
 subsampling=1
-adjust_final_offset=0
 IGNORE=nnef
diff --git a/onnx/test_cases/qrelu_1/vars.sh b/onnx/test_cases/qrelu_1/vars.sh
index 0ca3c6d0b1..851705d38c 100644
--- a/onnx/test_cases/qrelu_1/vars.sh
+++ b/onnx/test_cases/qrelu_1/vars.sh
@@ -1,5 +1,4 @@
 left_context=0
 right_context=0
 subsampling=1
-adjust_final_offset=0
 IGNORE=nnef
diff --git a/onnx/test_cases/qrelu_2/vars.sh b/onnx/test_cases/qrelu_2/vars.sh
index 0ca3c6d0b1..851705d38c 100644
--- a/onnx/test_cases/qrelu_2/vars.sh
+++ b/onnx/test_cases/qrelu_2/vars.sh
@@ -1,5 +1,4 @@
 left_context=0
 right_context=0
 subsampling=1
-adjust_final_offset=0
 IGNORE=nnef
diff --git a/onnx/test_cases/qsigmoid_1/vars.sh b/onnx/test_cases/qsigmoid_1/vars.sh
index 0ca3c6d0b1..851705d38c 100644
--- a/onnx/test_cases/qsigmoid_1/vars.sh
+++ b/onnx/test_cases/qsigmoid_1/vars.sh
@@ -1,5 +1,4 @@
 left_context=0
 right_context=0
 subsampling=1
-adjust_final_offset=0
 IGNORE=nnef
diff --git a/onnx/test_cases/qsigmoid_2/vars.sh b/onnx/test_cases/qsigmoid_2/vars.sh
index 0ca3c6d0b1..851705d38c 100644
--- a/onnx/test_cases/qsigmoid_2/vars.sh
+++ b/onnx/test_cases/qsigmoid_2/vars.sh
@@ -1,5 +1,4 @@
 left_context=0
 right_context=0
 subsampling=1
-adjust_final_offset=0
 IGNORE=nnef
diff --git a/onnx/test_cases/qtanh_1/vars.sh b/onnx/test_cases/qtanh_1/vars.sh
index 0ca3c6d0b1..851705d38c 100644
--- a/onnx/test_cases/qtanh_1/vars.sh
+++ b/onnx/test_cases/qtanh_1/vars.sh
@@ -1,5 +1,4 @@
 left_context=0
 right_context=0
 subsampling=1
-adjust_final_offset=0
 IGNORE=nnef
diff --git a/onnx/test_cases/qtanh_2/vars.sh b/onnx/test_cases/qtanh_2/vars.sh
index 0ca3c6d0b1..851705d38c 100644
--- a/onnx/test_cases/qtanh_2/vars.sh
+++ b/onnx/test_cases/qtanh_2/vars.sh
@@ -1,5 +1,4 @@
 left_context=0
 right_context=0
 subsampling=1
-adjust_final_offset=0
 IGNORE=nnef
diff --git a/onnx/test_cases/qtdnn_10x5_101_i32_biases/vars.sh b/onnx/test_cases/qtdnn_10x5_101_i32_biases/vars.sh
index c92d744ce9..9e202733c9 100644
--- a/onnx/test_cases/qtdnn_10x5_101_i32_biases/vars.sh
+++ b/onnx/test_cases/qtdnn_10x5_101_i32_biases/vars.sh
@@ -1,5 +1,4 @@
 left_context=1
 right_context=1
 subsampling=1
-adjust_final_offset=0
 IGNORE=nnef
diff --git a/onnx/test_cases/run_all.sh b/onnx/test_cases/run_all.sh
index 2035dd96da..c4d6f62e61 100755
--- a/onnx/test_cases/run_all.sh
+++ b/onnx/test_cases/run_all.sh
@@ -26,7 +26,7 @@ do
     then
         continue
     fi
-    unset OPTIONS IGNORE MODEL left_context right_context subsampling adjust_final_offset
+    unset OPTIONS IGNORE MODEL left_context right_context subsampling
     . $tc/vars.sh
     for file in $CACHE_FILES
     do
@@ -50,15 +50,11 @@ do
         options="$OPTIONS"
         if [ -n "$left_context" -a "$left_context" != "0" ]
         then
-            options="$options --kaldi-left-context $left_context"
+            options="$options --edge-left-context $left_context"
         fi
         if [ -n "$right_context" -a "$right_context" != "0" ]
         then
-            options="$options --kaldi-right-context $right_context"
-        fi
-        if [ -n "$adjust_final_offset" -a "$adjust_final_offset" != "0" ]
-        then
-            options="$options --kaldi-adjust-final-offset $adjust_final_offset"
+            options="$options --edge-right-context $right_context"
         fi
         cmd="$TRACT_RUN \
             $MODEL \
diff --git a/post-release.sh b/post-release.sh
index 087fd62bc3..fceb9d2972 100755
--- a/post-release.sh
+++ b/post-release.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 VERSION=$1
-CRATES="data linalg core nnef nnef/nnef-resources pulse-opl pulse hir tensorflow onnx-opl onnx kaldi libcli cli ffi"
+CRATES="data linalg core nnef nnef/nnef-resources pulse-opl pulse hir tensorflow onnx-opl onnx libcli cli ffi"
 
 if [ `uname` = "Darwin" ]
 then
diff --git a/release.sh b/release.sh
index 607bbfb858..61d170d21a 100755
--- a/release.sh
+++ b/release.sh
@@ -9,7 +9,7 @@ cargo install tomato-toml
 
 CRATE=$1
 VERSION=$2
-CRATES="data linalg core nnef nnef/nnef-resources pulse-opl pulse hir tensorflow onnx-opl onnx kaldi libcli ffi cli"
+CRATES="data linalg core nnef nnef/nnef-resources pulse-opl pulse hir tensorflow onnx-opl onnx libcli ffi cli"
 
 if [ -z "$VERSION" ]
 then