From 445e649c850288c9472de66447fd28810097b69e Mon Sep 17 00:00:00 2001 From: Alexandre Date: Thu, 14 Nov 2019 11:02:26 +0100 Subject: [PATCH 1/3] DS 0.6.0a15 --- DeepSpeech/Dockerfile.train | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/DeepSpeech/Dockerfile.train b/DeepSpeech/Dockerfile.train index 757ec199..f6b09362 100644 --- a/DeepSpeech/Dockerfile.train +++ b/DeepSpeech/Dockerfile.train @@ -1,8 +1,8 @@ FROM nvidia/cuda:10.0-cudnn7-runtime-ubuntu18.04 ARG ds_repo=mozilla/DeepSpeech -ARG ds_branch=c5935644a1758c5d9e678642eb83106376dc0cd8 -ARG ds_sha1=c5935644a1758c5d9e678642eb83106376dc0cd8 +ARG ds_branch=b3787ee1888322dc68b8b3e4a5f6f859ba9dd05e +ARG ds_sha1=b3787ee1888322dc68b8b3e4a5f6f859ba9dd05e ARG kenlm_repo=kpu/kenlm ARG kenlm_branch=2ad7cb56924cd3c6811c604973f592cb5ef604eb From 5c76ca3576e3665dbdb36459c99c6b366a0f74aa Mon Sep 17 00:00:00 2001 From: Alexandre Date: Thu, 14 Nov 2019 11:02:38 +0100 Subject: [PATCH 2/3] TaskCluster Commnity --- DeepSpeech/Dockerfile.train | 2 +- DeepSpeech/fr/build_lm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DeepSpeech/Dockerfile.train b/DeepSpeech/Dockerfile.train index f6b09362..3e35b92a 100644 --- a/DeepSpeech/Dockerfile.train +++ b/DeepSpeech/Dockerfile.train @@ -106,7 +106,7 @@ RUN cat requirements.txt | sed -e 's/^tensorflow/tensorflow-gpu/g' | pip install RUN pip install `python util/taskcluster.py --decoder` -RUN TASKCLUSTER_SCHEME="https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.%(branch_name)s.%(arch_string)s/artifacts/public/%(artifact_name)s" python util/taskcluster.py \ +RUN TASKCLUSTER_SCHEME="https://community-tc.services.mozilla.com/tasks/index/v1/task/project.deepspeech.tensorflow.pip.%(branch_name)s.%(arch_string)s/artifacts/public/%(artifact_name)s" python util/taskcluster.py \ --target="$(pwd)" \ --artifact="convert_graphdef_memmapped_format" \ --branch="r1.14" && chmod +x convert_graphdef_memmapped_format diff --git a/DeepSpeech/fr/build_lm.sh b/DeepSpeech/fr/build_lm.sh index fc84f812..e7c7fe63 100755 --- a/DeepSpeech/fr/build_lm.sh +++ b/DeepSpeech/fr/build_lm.sh @@ -49,7 +49,7 @@ pushd /mnt/extracted fi; if [ ! -f "/mnt/lm/trie" ]; then - curl -sSL https://index.taskcluster.net/v1/task/project.deepspeech.deepspeech.native_client.master.${DS_SHA1}.cpu/artifacts/public/native_client.tar.xz | pixz -d | tar -xf - + curl -sSL https://community-tc.services.mozilla.com/tasks/index/v1/task/project.deepspeech.deepspeech.native_client.master.${DS_SHA1}.cpu/artifacts/public/native_client.tar.xz | pixz -d | tar -xf - ./generate_trie /mnt/models/alphabet.txt /mnt/lm/lm.binary /mnt/lm/trie fi; From 4034ffb4935092b9746001474f5bb75bdeddbd2e Mon Sep 17 00:00:00 2001 From: Alexandre Date: Thu, 14 Nov 2019 11:30:21 +0100 Subject: [PATCH 3/3] Use indexed SHA1 for master --- DeepSpeech/Dockerfile.train | 2 +- DeepSpeech/fr/build_lm.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DeepSpeech/Dockerfile.train b/DeepSpeech/Dockerfile.train index 3e35b92a..b9a2f17b 100644 --- a/DeepSpeech/Dockerfile.train +++ b/DeepSpeech/Dockerfile.train @@ -2,7 +2,7 @@ FROM nvidia/cuda:10.0-cudnn7-runtime-ubuntu18.04 ARG ds_repo=mozilla/DeepSpeech ARG ds_branch=b3787ee1888322dc68b8b3e4a5f6f859ba9dd05e -ARG ds_sha1=b3787ee1888322dc68b8b3e4a5f6f859ba9dd05e +ARG ds_sha1=dab5183a985652f46b4b2dadde2d4df08e5fa4bf ARG kenlm_repo=kpu/kenlm ARG kenlm_branch=2ad7cb56924cd3c6811c604973f592cb5ef604eb diff --git a/DeepSpeech/fr/build_lm.sh b/DeepSpeech/fr/build_lm.sh index e7c7fe63..d9448080 100755 --- a/DeepSpeech/fr/build_lm.sh +++ b/DeepSpeech/fr/build_lm.sh @@ -49,7 +49,7 @@ pushd /mnt/extracted fi; if [ ! -f "/mnt/lm/trie" ]; then - curl -sSL https://community-tc.services.mozilla.com/tasks/index/v1/task/project.deepspeech.deepspeech.native_client.master.${DS_SHA1}.cpu/artifacts/public/native_client.tar.xz | pixz -d | tar -xf - + curl -sSL https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.deepspeech.native_client.master.${DS_SHA1}.cpu/artifacts/public/native_client.tar.xz | pixz -d | tar -xf - ./generate_trie /mnt/models/alphabet.txt /mnt/lm/lm.binary /mnt/lm/trie fi;