From 1540fa392e4aa64c5a74124a0dd4fd57c993b6f0 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 26 Oct 2018 14:59:12 +0200 Subject: [PATCH 1/4] Remove old AOT model --- taskcluster/darwin-opt-base.tyml | 1 - taskcluster/linux-opt-base.tyml | 1 - 2 files changed, 2 deletions(-) diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml index 5157302c..adc9b134 100644 --- a/taskcluster/darwin-opt-base.tyml +++ b/taskcluster/darwin-opt-base.tyml @@ -41,7 +41,6 @@ payload: TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow} SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph} DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb - DEEPSPEECH_PROD_MODEL: https://github.com/lissyx/DeepSpeech/releases/download/0.0.2/tc-fake-prod.988_e120.LSTM.ldc93s1.pb # There is no VM yet running tasks on OSX # so one should install by hand: diff --git a/taskcluster/linux-opt-base.tyml b/taskcluster/linux-opt-base.tyml index 986e61f1..3af60d35 100644 --- a/taskcluster/linux-opt-base.tyml +++ b/taskcluster/linux-opt-base.tyml @@ -38,7 +38,6 @@ then: TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow} SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph} DEEPSPEECH_TEST_MODEL: https://queue.taskcluster.net/v1/task/${training}/artifacts/public/output_graph.pb - DEEPSPEECH_PROD_MODEL: https://github.com/lissyx/DeepSpeech/releases/download/0.0.2/tc-fake-prod.988_e120.LSTM.ldc93s1.pb command: - "/bin/bash" From 4869474456f95500a171e0e8219a736d2b07d539 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 26 Oct 2018 14:59:57 +0200 Subject: [PATCH 2/4] Remove deprecated python deps --- requirements.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5df2bfb0..8cc67773 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,9 +5,8 @@ tensorflow == 1.11.0 numpy matplotlib scipy -paramiko >= 2.1 -pysftp sox +paramiko >= 2.1 python_speech_features pyxdg bs4 From 6296b5cb5494f22f9c051256c9932fd1e9565a72 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 26 Oct 2018 15:03:04 +0200 Subject: [PATCH 3/4] Update Python and NodeJS to their latest versions --- native_client/javascript/binding.gyp | 1 + taskcluster/.shared.yml | 8 ++++---- tc-tests-utils.sh | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/native_client/javascript/binding.gyp b/native_client/javascript/binding.gyp index 789e4a91..81e6be49 100644 --- a/native_client/javascript/binding.gyp +++ b/native_client/javascript/binding.gyp @@ -39,5 +39,6 @@ ], "variables": { "build_v8_with_gn": 0, + "enable_lto": 1 }, } diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml index a89860fc..b3663f04 100644 --- a/taskcluster/.shared.yml +++ b/taskcluster/.shared.yml @@ -38,11 +38,11 @@ nodejs: env: 'export EXTRA_ENV="PATH=$TASKCLUSTER_TASK_DIR/node-ds-test.brew/bin/:$PATH"' prep_4: 'nvm install 4.9.1 && nvm use 4.9.1' prep_5: 'nvm install 5.12.0 && nvm use 5.12.0' - prep_6: 'nvm install 6.14.1 && nvm use 6.14.1' + prep_6: 'nvm install 6.14.4 && nvm use 6.14.4' prep_7: 'nvm install 7.10.1 && nvm use 7.10.1' - prep_8: 'nvm install 8.11.1 && nvm use 8.11.1' - prep_9: 'nvm install 9.11.1 && nvm use 9.11.1' - prep_10: 'nvm install 10.3.0 && nvm use 10.3.0' + prep_8: 'nvm install 8.12.0 && nvm use 8.12.0' + prep_9: 'nvm install 9.11.2 && nvm use 9.11.2' + prep_10: 'nvm install 10.12.0 && nvm use 10.12.0' ## swig -javascript requires swig >= 3.0.7 (14.04 provides 2.0.11) ## force 3.0.10 for nodejs V8 API compatibility swig: diff --git a/tc-tests-utils.sh b/tc-tests-utils.sh index e4999410..7a0ac668 100755 --- a/tc-tests-utils.sh +++ b/tc-tests-utils.sh @@ -35,8 +35,8 @@ model_name="$(basename "${model_source}")" model_name_mmap="$(basename -s ".pb" "${model_source}").pbmm" model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}" -SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.14:ucs2 2.7.14:ucs4 3.4.8:ucs4 3.5.5:ucs4 3.6.4:ucs4 3.7.0:ucs4} -SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.14.1 7.10.1 8.11.1 9.11.1 10.3.0} +SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.15:ucs2 2.7.15:ucs4 3.4.9:ucs4 3.5.6:ucs4 3.6.7:ucs4 3.7.1:ucs4} +SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.14.4 7.10.1 8.12.0 9.11.2 10.12.0} strip() { echo "$(echo $1 | sed -e 's/^[[:space:]]+//' -e 's/[[:space:]]+$//')" From 65deefe173b2cf11bb9171de1906a18f9a7cedcd Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 26 Oct 2018 15:37:24 +0200 Subject: [PATCH 4/4] Update pyenv for newer CPython --- tc-tests-utils.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tc-tests-utils.sh b/tc-tests-utils.sh index 7a0ac668..59a383e3 100755 --- a/tc-tests-utils.sh +++ b/tc-tests-utils.sh @@ -284,7 +284,7 @@ install_pyenv() git clone --quiet https://github.com/pyenv/pyenv.git ${PYENV_ROOT} pushd ${PYENV_ROOT} - git checkout --quiet c057a80c8296a7c694e4ef80ecbac0d0c169df7a + git checkout --quiet 835707da2237b8f69560b2de27ae8ddd3e6cb1a4 popd eval "$(pyenv init -)" }