From 86b0ed612cb597eae9bbe91d4b24f02eb2ffd284 Mon Sep 17 00:00:00 2001
From: Reuben Morais <reuben.morais@gmail.com>
Date: Fri, 1 Sep 2017 11:50:07 +0200
Subject: [PATCH] Make sure automation works with the new decoder

---
 .tc.training.yml      | 5 +++--
 bin/run-tc-ldc93s1.sh | 3 ++-
 tc-package.sh         | 4 +++-
 tc-train-tests.sh     | 2 ++
 4 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.tc.training.yml b/.tc.training.yml
index 29fa4595..b7aaa52f 100644
--- a/.tc.training.yml
+++ b/.tc.training.yml
@@ -11,16 +11,17 @@ payload:
   image: "ubuntu:14.04"
   env:
     TENSORFLOW_WHEEL: https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.master.cpu/artifacts/public/tensorflow_warpctc-1.3.0rc0-cp27-cp27mu-linux_x86_64.whl
+    DEEPSPEECH_ARTIFACTS_ROOT: https://queue.taskcluster.net/v1/task/{{ TASK_ID }}/runs/0/artifacts/public
   command:
     - "/bin/bash"
     - "--login"
     - "-cxe"
-    - apt-get -qq update && apt-get -qq -y install git &&
+    - apt-get -qq update && apt-get -qq -y install git pixz &&
       apt-get -qq -y install make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev wget curl llvm libncurses5-dev xz-utils tk-dev &&
       {{ SYSTEM_ADD_USER }} &&
       echo -e "#!/bin/bash\nset -xe\nexport PATH=/home/build-user/bin:$PATH && env && id && wget https://github.com/git-lfs/git-lfs/releases/download/v2.2.1/git-lfs-linux-amd64-2.2.1.tar.gz -O - | tar -C /tmp -zxf - && PREFIX=/home/build-user/ /tmp/git-lfs-2.2.1/install.sh && mkdir ~/DeepSpeech/ && git clone --quiet {{ GITHUB_HEAD_REPO_URL }} ~/DeepSpeech/ds/ && cd ~/DeepSpeech/ds && git checkout --quiet {{ GITHUB_HEAD_SHA }}" > /tmp/clone.sh && chmod +x /tmp/clone.sh &&
       {{ SYSTEM_DO_CLONE }} &&
-      sudo -H -u build-user TENSORFLOW_WHEEL=${TENSORFLOW_WHEEL} /bin/bash /home/build-user/DeepSpeech/ds/tc-train-tests.sh 2.7.13
+      sudo -H -u build-user TENSORFLOW_WHEEL=${TENSORFLOW_WHEEL} {{ TASK_ENV_VARS }} /bin/bash /home/build-user/DeepSpeech/ds/tc-train-tests.sh 2.7.13
   artifacts:
     "public":
       type: "directory"
diff --git a/bin/run-tc-ldc93s1.sh b/bin/run-tc-ldc93s1.sh
index 962c515d..759c6450 100755
--- a/bin/run-tc-ldc93s1.sh
+++ b/bin/run-tc-ldc93s1.sh
@@ -16,4 +16,5 @@ python -u DeepSpeech.py \
   --test_files ${ldc93s1_csv} --test_batch_size 1 \
   --n_hidden 494 --epoch 75 --random_seed 4567 --default_stddev 0.046875 \
   --max_to_keep 1 --checkpoint_dir '/tmp/ckpt' --checkpoint_secs 0 \
-  --learning_rate 0.001 --dropout_rate 0.05  --export_dir "/tmp/train"
+  --learning_rate 0.001 --dropout_rate 0.05  --export_dir "/tmp/train" \
+  --decoder_library_path "/tmp/ds/libctc_decoder_with_kenlm.so"
\ No newline at end of file
diff --git a/tc-package.sh b/tc-package.sh
index c5ba10c3..6409a717 100755
--- a/tc-package.sh
+++ b/tc-package.sh
@@ -13,7 +13,9 @@ tar -C ${DS_ROOT_TASK}/DeepSpeech/tf/bazel-bin/tensorflow/ \
 tar -C ${DS_ROOT_TASK}/DeepSpeech/tf/bazel-bin/native_client/ \
 	-uf ${TASKCLUSTER_ARTIFACTS}/native_client.tar \
 	libdeepspeech.so \
-	libdeepspeech_utils.so
+	libdeepspeech_utils.so \
+	libctc_decoder_with_kenlm.so \
+	generate_trie
 
 tar -C ${DS_ROOT_TASK}/DeepSpeech/ds/native_client/ \
 	-uf ${TASKCLUSTER_ARTIFACTS}/native_client.tar \
diff --git a/tc-train-tests.sh b/tc-train-tests.sh
index ddd56da6..c0c4e843 100644
--- a/tc-train-tests.sh
+++ b/tc-train-tests.sh
@@ -31,6 +31,8 @@ source ${PYENV_ROOT}/versions/${pyver}/envs/${PYENV_NAME}/bin/activate
 pip install --upgrade ${TENSORFLOW_WHEEL}
 grep -v "tensorflow" ${HOME}/DeepSpeech/ds/requirements.txt | pip install --upgrade -r /dev/stdin
 
+download_native_client_files "/tmp/ds"
+
 pushd ${HOME}/DeepSpeech/ds/
     time ./bin/run-tc-ldc93s1.sh
 popd