From 4103247a2136f7c14876cc313e288eaa2a321ff0 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Fri, 20 Sep 2019 19:45:19 +0200 Subject: [PATCH] Use TFLite runtime on RPi3/RPi4 --- taskcluster/.build.yml | 2 +- taskcluster/android-arm64-cpu-opt.yml | 2 +- taskcluster/android-armv7-cpu-opt.yml | 2 +- taskcluster/android-java-opt.yml | 2 +- taskcluster/android-x86_64-cpu-opt.yml | 2 +- taskcluster/darwin-amd64-cpu-opt.yml | 2 +- taskcluster/darwin-amd64-ctc-opt.yml | 2 +- taskcluster/darwin-amd64-tflite-opt.yml | 2 +- taskcluster/linux-amd64-cpu-opt.yml | 2 +- taskcluster/linux-amd64-ctc-opt.yml | 2 +- taskcluster/linux-amd64-gpu-opt.yml | 2 +- taskcluster/linux-amd64-tflite-opt.yml | 2 +- taskcluster/linux-arm64-cpu-opt.yml | 2 +- taskcluster/linux-rpi3-cpu-opt.yml | 2 +- taskcluster/node-package-cpu.yml | 2 +- taskcluster/node-package-gpu.yml | 2 +- taskcluster/tc-cpp_tflite-ds-tests.sh | 8 ++- taskcluster/tc-cpp_tflite_basic-ds-tests.sh | 18 +++++++ taskcluster/tc-node_tflite-tests.sh | 32 ++++++++++++ taskcluster/tc-python_tflite-tests.sh | 49 +++++++++++++++++++ taskcluster/test-cpp-raspbian-rpi3-opt.yml | 2 +- .../test-cpp_tflite-darwin-amd64-opt.yml | 2 +- .../test-cpp_tflite-linux-amd64-opt.yml | 2 +- taskcluster/test-cpp_tflite-win-amd64-opt.yml | 2 +- ...t-lite_benchmark_model-linux-amd64-opt.yml | 2 +- .../test-nodejs_10x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_11x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_12x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_4x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_6x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_7x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_8x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_9x-raspbian-rpi3-opt.yml | 2 +- .../test-python_37m-raspbian-rpi3-opt.yml | 2 +- ...raining_upstream-linux-amd64-py35m-opt.yml | 2 +- taskcluster/win-amd64-cpu-opt.yml | 2 +- taskcluster/win-amd64-gpu-opt.yml | 2 +- taskcluster/win-amd64-tflite-opt.yml | 2 +- 38 files changed, 139 insertions(+), 36 deletions(-) create mode 100644 taskcluster/tc-cpp_tflite_basic-ds-tests.sh create mode 100644 taskcluster/tc-node_tflite-tests.sh create mode 100644 taskcluster/tc-python_tflite-tests.sh diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml index 07b9808f..d78fae7a 100644 --- a/taskcluster/.build.yml +++ b/taskcluster/.build.yml @@ -23,4 +23,4 @@ build: tests_cmdline: '' convert_graphdef: '' benchmark_model_bin: '' - tensorflow_git_desc: 'TensorFlow: v1.14.0-14-g1aad02a' + tensorflow_git_desc: 'TensorFlow: v1.14.0-16-g3b4ce37' diff --git a/taskcluster/android-arm64-cpu-opt.yml b/taskcluster/android-arm64-cpu-opt.yml index ade8f098..39f4883c 100644 --- a/taskcluster/android-arm64-cpu-opt.yml +++ b/taskcluster/android-arm64-cpu-opt.yml @@ -12,7 +12,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.android-arm64/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.android-arm64/artifacts/public/home.tar.xz" scripts: build: "taskcluster/android-build.sh arm64-v8a" package: "taskcluster/android-package.sh arm64-v8a" diff --git a/taskcluster/android-armv7-cpu-opt.yml b/taskcluster/android-armv7-cpu-opt.yml index 9311c4db..e3311df4 100644 --- a/taskcluster/android-armv7-cpu-opt.yml +++ b/taskcluster/android-armv7-cpu-opt.yml @@ -12,7 +12,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.android-armv7/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.android-armv7/artifacts/public/home.tar.xz" scripts: build: "taskcluster/android-build.sh armeabi-v7a" package: "taskcluster/android-package.sh armeabi-v7a" diff --git a/taskcluster/android-java-opt.yml b/taskcluster/android-java-opt.yml index b53d60cf..e5042329 100644 --- a/taskcluster/android-java-opt.yml +++ b/taskcluster/android-java-opt.yml @@ -13,7 +13,7 @@ build: system_setup: > apt-get -qq -y install curl && ${swig.packages.install_script} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.android-armv7/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.android-armv7/artifacts/public/home.tar.xz" scripts: build: "taskcluster/android-apk-build.sh" package: "taskcluster/android-apk-package.sh" diff --git a/taskcluster/android-x86_64-cpu-opt.yml b/taskcluster/android-x86_64-cpu-opt.yml index 663c82df..b01601b7 100644 --- a/taskcluster/android-x86_64-cpu-opt.yml +++ b/taskcluster/android-x86_64-cpu-opt.yml @@ -12,7 +12,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.android-arm64/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.android-arm64/artifacts/public/home.tar.xz" scripts: build: "taskcluster/android-build.sh x86_64" package: "taskcluster/android-package.sh x86_64" diff --git a/taskcluster/darwin-amd64-cpu-opt.yml b/taskcluster/darwin-amd64-cpu-opt.yml index 77b7311f..52d306ae 100644 --- a/taskcluster/darwin-amd64-cpu-opt.yml +++ b/taskcluster/darwin-amd64-cpu-opt.yml @@ -6,7 +6,7 @@ build: - "index.project.deepspeech.deepspeech.native_client.osx.${event.head.sha}" - "notify.irc-channel.${notifications.irc}.on-exception" - "notify.irc-channel.${notifications.irc}.on-failed" - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.osx/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.osx/artifacts/public/home.tar.xz" scripts: build: "taskcluster/host-build.sh" package: "taskcluster/package.sh" diff --git a/taskcluster/darwin-amd64-ctc-opt.yml b/taskcluster/darwin-amd64-ctc-opt.yml index 0ab27427..7d7c0d19 100644 --- a/taskcluster/darwin-amd64-ctc-opt.yml +++ b/taskcluster/darwin-amd64-ctc-opt.yml @@ -6,7 +6,7 @@ build: - "index.project.deepspeech.deepspeech.native_client.osx-ctc.${event.head.sha}" - "notify.irc-channel.${notifications.irc}.on-exception" - "notify.irc-channel.${notifications.irc}.on-failed" - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.osx/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.osx/artifacts/public/home.tar.xz" maxRunTime: 14400 scripts: build: 'taskcluster/decoder-build.sh' diff --git a/taskcluster/darwin-amd64-tflite-opt.yml b/taskcluster/darwin-amd64-tflite-opt.yml index d8e229b2..af5c2257 100644 --- a/taskcluster/darwin-amd64-tflite-opt.yml +++ b/taskcluster/darwin-amd64-tflite-opt.yml @@ -6,7 +6,7 @@ build: - "index.project.deepspeech.deepspeech.native_client.osx-tflite.${event.head.sha}" - "notify.irc-channel.${notifications.irc}.on-exception" - "notify.irc-channel.${notifications.irc}.on-failed" - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.osx/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.osx/artifacts/public/home.tar.xz" scripts: build: "taskcluster/host-build.sh tflite" package: "taskcluster/package.sh" diff --git a/taskcluster/linux-amd64-cpu-opt.yml b/taskcluster/linux-amd64-cpu-opt.yml index ccc3d3bf..dff6f372 100644 --- a/taskcluster/linux-amd64-cpu-opt.yml +++ b/taskcluster/linux-amd64-cpu-opt.yml @@ -14,7 +14,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.cpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz" scripts: build: "taskcluster/host-build.sh" package: "taskcluster/package.sh" diff --git a/taskcluster/linux-amd64-ctc-opt.yml b/taskcluster/linux-amd64-ctc-opt.yml index 1e52d08d..5c6b247e 100644 --- a/taskcluster/linux-amd64-ctc-opt.yml +++ b/taskcluster/linux-amd64-ctc-opt.yml @@ -14,7 +14,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.cpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz" scripts: build: 'taskcluster/decoder-build.sh' package: 'taskcluster/decoder-package.sh' diff --git a/taskcluster/linux-amd64-gpu-opt.yml b/taskcluster/linux-amd64-gpu-opt.yml index 41e8129a..efebe872 100644 --- a/taskcluster/linux-amd64-gpu-opt.yml +++ b/taskcluster/linux-amd64-gpu-opt.yml @@ -12,7 +12,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.gpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.gpu/artifacts/public/home.tar.xz" maxRunTime: 14400 scripts: build: "taskcluster/cuda-build.sh" diff --git a/taskcluster/linux-amd64-tflite-opt.yml b/taskcluster/linux-amd64-tflite-opt.yml index a5f5b374..0e1772be 100644 --- a/taskcluster/linux-amd64-tflite-opt.yml +++ b/taskcluster/linux-amd64-tflite-opt.yml @@ -14,7 +14,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.cpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz" scripts: build: "taskcluster/host-build.sh tflite" package: "taskcluster/package.sh" diff --git a/taskcluster/linux-arm64-cpu-opt.yml b/taskcluster/linux-arm64-cpu-opt.yml index a63774e3..9d37c05e 100644 --- a/taskcluster/linux-arm64-cpu-opt.yml +++ b/taskcluster/linux-arm64-cpu-opt.yml @@ -4,7 +4,7 @@ build: - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.arm64" - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.${event.head.sha}.arm64" - "index.project.deepspeech.deepspeech.native_client.arm64.${event.head.sha}" - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.arm64/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.arm64/artifacts/public/home.tar.xz" ## multistrap 2.2.0-ubuntu1 is broken in 14.04: https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787 system_setup: > diff --git a/taskcluster/linux-rpi3-cpu-opt.yml b/taskcluster/linux-rpi3-cpu-opt.yml index ca2e30d1..fb5846ad 100644 --- a/taskcluster/linux-rpi3-cpu-opt.yml +++ b/taskcluster/linux-rpi3-cpu-opt.yml @@ -4,7 +4,7 @@ build: - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.arm" - "index.project.deepspeech.deepspeech.native_client.${event.head.branchortag}.${event.head.sha}.arm" - "index.project.deepspeech.deepspeech.native_client.arm.${event.head.sha}" - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.arm/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.arm/artifacts/public/home.tar.xz" ## multistrap 2.2.0-ubuntu1 is broken in 14.04: https://bugs.launchpad.net/ubuntu/+source/multistrap/+bug/1313787 system_setup: > diff --git a/taskcluster/node-package-cpu.yml b/taskcluster/node-package-cpu.yml index 7ef80132..bac60a62 100644 --- a/taskcluster/node-package-cpu.yml +++ b/taskcluster/node-package-cpu.yml @@ -17,7 +17,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.cpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz" scripts: build: "taskcluster/node-build.sh" package: "taskcluster/node-package.sh" diff --git a/taskcluster/node-package-gpu.yml b/taskcluster/node-package-gpu.yml index 5aeb156f..713c14bf 100644 --- a/taskcluster/node-package-gpu.yml +++ b/taskcluster/node-package-gpu.yml @@ -14,7 +14,7 @@ build: system_config: > ${swig.patch_nodejs.linux} - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.cpu/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/home.tar.xz" scripts: build: "taskcluster/node-build.sh --cuda" package: "taskcluster/node-package.sh" diff --git a/taskcluster/tc-cpp_tflite-ds-tests.sh b/taskcluster/tc-cpp_tflite-ds-tests.sh index 549befcc..38a65677 100644 --- a/taskcluster/tc-cpp_tflite-ds-tests.sh +++ b/taskcluster/tc-cpp_tflite-ds-tests.sh @@ -6,7 +6,7 @@ source $(dirname "$0")/tc-tests-utils.sh model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite} model_name=$(basename "${model_source}") -export DEEPSPEECH_ARTIFACTS_ROOT=${DEEPSPEECH_ARTIFACTS_TFLITE_ROOT} +model_name_mmap=$(basename "${model_source}") export DATA_TMP_DIR=${TASKCLUSTER_TMP_DIR} download_material "${TASKCLUSTER_TMP_DIR}/ds" @@ -15,4 +15,8 @@ export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH check_tensorflow_version -run_tflite_basic_inference_tests +run_all_inference_tests + +run_multi_inference_tests + +run_cpp_only_inference_tests diff --git a/taskcluster/tc-cpp_tflite_basic-ds-tests.sh b/taskcluster/tc-cpp_tflite_basic-ds-tests.sh new file mode 100644 index 00000000..549befcc --- /dev/null +++ b/taskcluster/tc-cpp_tflite_basic-ds-tests.sh @@ -0,0 +1,18 @@ +#!/bin/bash + +set -xe + +source $(dirname "$0")/tc-tests-utils.sh + +model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite} +model_name=$(basename "${model_source}") +export DEEPSPEECH_ARTIFACTS_ROOT=${DEEPSPEECH_ARTIFACTS_TFLITE_ROOT} +export DATA_TMP_DIR=${TASKCLUSTER_TMP_DIR} + +download_material "${TASKCLUSTER_TMP_DIR}/ds" + +export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH + +check_tensorflow_version + +run_tflite_basic_inference_tests diff --git a/taskcluster/tc-node_tflite-tests.sh b/taskcluster/tc-node_tflite-tests.sh new file mode 100644 index 00000000..77b5f71c --- /dev/null +++ b/taskcluster/tc-node_tflite-tests.sh @@ -0,0 +1,32 @@ +#!/bin/bash + +set -xe + +source $(dirname "$0")/tc-tests-utils.sh + +nodever=$1 + +if [ -z "${nodever}" ]; then + echo "No node version given, aborting." + exit 1 +fi; + +model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite} +model_name=$(basename "${model_source}") +model_name_mmap=$(basename "${model_source}") + +download_data + +node --version +npm --version + +NODE_ROOT="${DS_ROOT_TASK}/ds-test/" +NODE_CACHE="${DS_ROOT_TASK}/ds-test.cache/" +export NODE_PATH="${NODE_ROOT}/node_modules/" +export PATH="${NODE_ROOT}:${NODE_PATH}/.bin/:$PATH" + +npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${DEEPSPEECH_NODEJS}/deepspeech-${DS_VERSION}.tgz + +check_runtime_nodejs + +run_all_inference_tests diff --git a/taskcluster/tc-python_tflite-tests.sh b/taskcluster/tc-python_tflite-tests.sh new file mode 100644 index 00000000..6a419485 --- /dev/null +++ b/taskcluster/tc-python_tflite-tests.sh @@ -0,0 +1,49 @@ +#!/bin/bash + +set -xe + +source $(dirname "$0")/tc-tests-utils.sh + +extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias" + +unset PYTHON_BIN_PATH +unset PYTHONPATH + +if [ -d "${DS_ROOT_TASK}/pyenv.cache/" ]; then + export PYENV_ROOT="${DS_ROOT_TASK}/pyenv.cache/ds-test/.pyenv" +else + export PYENV_ROOT="${DS_ROOT_TASK}/ds-test/.pyenv" +fi; + +export PATH="${PYENV_ROOT}/bin:$PATH" + +mkdir -p ${PYENV_ROOT} || true + +model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite} +model_name=$(basename "${model_source}") +model_name_mmap=$(basename "${model_source}") + +download_data + +install_pyenv "${PYENV_ROOT}" +install_pyenv_virtualenv "$(pyenv root)/plugins/pyenv-virtualenv" + +maybe_ssl102_py37 ${pyver} + +maybe_numpy_min_version_winamd64 ${pyver} + +PYENV_NAME=deepspeech-test +LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH PYTHON_CONFIGURE_OPTS="--enable-unicode=${pyconf} ${PY37_OPENSSL} ${EXTRA_PYTHON_CONFIGURE_OPTS}" pyenv_install ${pyver} ${pyalias} + +setup_pyenv_virtualenv "${pyalias}" "${PYENV_NAME}" +virtualenv_activate "${pyalias}" "${PYENV_NAME}" + +deepspeech_pkg_url=$(get_python_pkg_url ${pyver_pkg} ${py_unicode_type}) +LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH pip install --verbose --only-binary :all: ${PY37_SOURCE_PACKAGE} --upgrade ${deepspeech_pkg_url} | cat + +which deepspeech +deepspeech --version + +run_all_inference_tests + +virtualenv_deactivate "${pyalias}" "${PYENV_NAME}" diff --git a/taskcluster/test-cpp-raspbian-rpi3-opt.yml b/taskcluster/test-cpp-raspbian-rpi3-opt.yml index 9d63c2e7..0940d859 100644 --- a/taskcluster/test-cpp-raspbian-rpi3-opt.yml +++ b/taskcluster/test-cpp-raspbian-rpi3-opt.yml @@ -4,7 +4,7 @@ build: - "linux-rpi3-cpu-opt" - "test-training_upstream-linux-amd64-py35m-opt" args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-ds-tests.sh" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU C++ tests" description: "Testing DeepSpeech C++ for Raspbian RPi3/ARMv7, CPU only, optimized version" diff --git a/taskcluster/test-cpp_tflite-darwin-amd64-opt.yml b/taskcluster/test-cpp_tflite-darwin-amd64-opt.yml index e05b2ed0..84af5847 100644 --- a/taskcluster/test-cpp_tflite-darwin-amd64-opt.yml +++ b/taskcluster/test-cpp_tflite-darwin-amd64-opt.yml @@ -7,7 +7,7 @@ build: > ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite-ds-tests.sh" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh" metadata: name: "DeepSpeech OSX AMD64 TFlite C++ tests" description: "Testing DeepSpeech C++ for OSX/AMD64, TFLite, optimized version" diff --git a/taskcluster/test-cpp_tflite-linux-amd64-opt.yml b/taskcluster/test-cpp_tflite-linux-amd64-opt.yml index 235c6fbc..2222e95a 100755 --- a/taskcluster/test-cpp_tflite-linux-amd64-opt.yml +++ b/taskcluster/test-cpp_tflite-linux-amd64-opt.yml @@ -4,7 +4,7 @@ build: - "linux-amd64-tflite-opt" - "test-training_upstream-linux-amd64-py35m-opt" args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-ds-tests.sh" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh" metadata: name: "DeepSpeech Linux AMD64 TFLite C++ tests" description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version" diff --git a/taskcluster/test-cpp_tflite-win-amd64-opt.yml b/taskcluster/test-cpp_tflite-win-amd64-opt.yml index dda1c6d4..59c81671 100644 --- a/taskcluster/test-cpp_tflite-win-amd64-opt.yml +++ b/taskcluster/test-cpp_tflite-win-amd64-opt.yml @@ -4,7 +4,7 @@ build: - "win-amd64-tflite-opt" - "test-training_upstream-linux-amd64-py35m-opt" args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite-ds-tests.sh" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh" metadata: name: "DeepSpeech Windows AMD64 TFLite C++ tests" description: "Testing DeepSpeech C++ for Windows/AMD64, TFLite, optimized version" diff --git a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml index 03325b47..8a3165c1 100644 --- a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml +++ b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml @@ -4,7 +4,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-lite_benchmark_model-ds-tests.sh" - benchmark_model_bin: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.cpu/artifacts/public/lite_benchmark_model" + benchmark_model_bin: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/lite_benchmark_model" metadata: name: "DeepSpeech Linux AMD64 CPU TF Lite benchmark_model" description: "Testing DeepSpeech TF Lite benchmark_model for Linux/AMD64, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml index a08662fc..14c33d04 100644 --- a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_buster.prep_10} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 10.x" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 10.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v10.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml index 76f2c76e..92c814ec 100644 --- a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_buster.prep_11} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 11.x" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 11.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v11.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml index 25d5621d..9c46a4a8 100644 --- a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_buster.prep_12} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 12.x" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 12.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v12.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml index 640f8830..39f5611c 100644 --- a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_buster.prep_4} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 4.x" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 4.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v4.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml index 18fefd48..1902e664 100644 --- a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_buster.prep_6} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 6.x" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 6.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v6.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml index 1c547533..26d92edf 100644 --- a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_buster.prep_7} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 7.x" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 7.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v7.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml index 92375870..aa057301 100644 --- a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_buster.prep_8} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 8.x" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 8.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v8.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml index 05b16277..34cb24b2 100644 --- a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_buster.prep_9} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 9.x" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 9.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v9.x, CPU only, optimized version" diff --git a/taskcluster/test-python_37m-raspbian-rpi3-opt.yml b/taskcluster/test-python_37m-raspbian-rpi3-opt.yml index 7d0674ff..a898510c 100644 --- a/taskcluster/test-python_37m-raspbian-rpi3-opt.yml +++ b/taskcluster/test-python_37m-raspbian-rpi3-opt.yml @@ -7,7 +7,7 @@ build: > apt-get -qq -y install ${python.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.3:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests.sh 3.7.3:m" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU Python v3.7 tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on Python v3.7, CPU only, optimized version" diff --git a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml index 09dc0893..238a28f1 100644 --- a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml +++ b/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml @@ -7,7 +7,7 @@ build: apt-get -qq -y install ${python.packages_trusty.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.5.5:m" - convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.cpu/artifacts/public/convert_graphdef_memmapped_format" + convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.cpu/artifacts/public/convert_graphdef_memmapped_format" metadata: name: "DeepSpeech Linux AMD64 CPU upstream training Py3.5" description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 3.5, CPU only, optimized version" diff --git a/taskcluster/win-amd64-cpu-opt.yml b/taskcluster/win-amd64-cpu-opt.yml index cea9922a..8a8dd303 100644 --- a/taskcluster/win-amd64-cpu-opt.yml +++ b/taskcluster/win-amd64-cpu-opt.yml @@ -6,7 +6,7 @@ build: - "index.project.deepspeech.deepspeech.native_client.win.${event.head.sha}" - "notify.irc-channel.${notifications.irc}.on-exception" - "notify.irc-channel.${notifications.irc}.on-failed" - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.win/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.win/artifacts/public/home.tar.xz" scripts: build: "taskcluster/win-build.sh" package: "taskcluster/win-package.sh" diff --git a/taskcluster/win-amd64-gpu-opt.yml b/taskcluster/win-amd64-gpu-opt.yml index a6477137..ba6f4096 100644 --- a/taskcluster/win-amd64-gpu-opt.yml +++ b/taskcluster/win-amd64-gpu-opt.yml @@ -6,7 +6,7 @@ build: - "index.project.deepspeech.deepspeech.native_client.win-cuda.${event.head.sha}" - "notify.irc-channel.${notifications.irc}.on-exception" - "notify.irc-channel.${notifications.irc}.on-failed" - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.win-cuda/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.win-cuda/artifacts/public/home.tar.xz" scripts: build: "taskcluster/win-build.sh --cuda" package: "taskcluster/win-package.sh" diff --git a/taskcluster/win-amd64-tflite-opt.yml b/taskcluster/win-amd64-tflite-opt.yml index 6d1416a0..467ca7ef 100644 --- a/taskcluster/win-amd64-tflite-opt.yml +++ b/taskcluster/win-amd64-tflite-opt.yml @@ -6,7 +6,7 @@ build: - "index.project.deepspeech.deepspeech.native_client.win-tflite.${event.head.sha}" - "notify.irc-channel.${notifications.irc}.on-exception" - "notify.irc-channel.${notifications.irc}.on-failed" - tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.1aad02a78e90307c9caf9dd617a1af747d2aa9a8.win/artifacts/public/home.tar.xz" + tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.3b4ce374f526a3e493728c9832b398dca826bd8e.win/artifacts/public/home.tar.xz" scripts: build: "taskcluster/win-build.sh tflite" package: "taskcluster/win-package.sh"