From 581515e094a00c73941fa7f42cc2d1df39dedf9e Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Wed, 8 Jan 2020 15:03:54 +0100 Subject: [PATCH] Add 8kHz training test coverage Fixes #2638 --- bin/run-tc-ldc93s1_new.sh | 4 +- bin/run-tc-ldc93s1_tflite.sh | 4 + data/smoke_test/LDC93S1_pcms16le_1_16000.wav | Bin 0 -> 93638 bytes taskcluster/.build.yml | 1 + taskcluster/darwin-opt-base.tyml | 6 +- taskcluster/linux-opt-base.tyml | 6 +- taskcluster/tc-android-apk-tests.sh | 3 + taskcluster/tc-android-ds-tests.sh | 3 + taskcluster/tc-cpp-ds-tests-prod.sh | 5 +- taskcluster/tc-cpp-ds-tests.sh | 3 + taskcluster/tc-cpp_tflite-ds-tests.sh | 3 + taskcluster/tc-cpp_tflite-tests-prod.sh | 5 +- taskcluster/tc-cpp_tflite_basic-ds-tests.sh | 3 + taskcluster/tc-cppwin-ds-tests.sh | 3 + taskcluster/tc-electron-tests.sh | 3 + taskcluster/tc-netframework-ds-tests.sh | 3 + taskcluster/tc-node-tests-prod.sh | 5 +- taskcluster/tc-node-tests.sh | 3 + taskcluster/tc-node_tflite-tests-prod.sh | 5 +- taskcluster/tc-node_tflite-tests.sh | 3 + taskcluster/tc-python-tests-prod.sh | 7 +- taskcluster/tc-python-tests.sh | 3 + taskcluster/tc-python_tflite-tests-prod.sh | 5 +- taskcluster/tc-python_tflite-tests.sh | 3 + taskcluster/tc-tests-utils.sh | 172 ++++++++++++------ taskcluster/tc-train-tests.sh | 25 ++- taskcluster/test-android-opt-base.tyml | 2 +- .../test-apk-android-24-x86_64-opt.yml | 5 +- .../test-apk-android-25-x86_64-opt.yml | 5 +- ...est-apk-android-26-x86_64-opt.yml.disabled | 2 +- ...est-apk-android-28-x86_64-opt.yml.disabled | 2 +- taskcluster/test-armbian-opt-base.tyml | 2 +- .../test-benchmark-linux-amd64-opt.yml | 3 +- taskcluster/test-cpp-android-24-arm64-opt.yml | 5 +- taskcluster/test-cpp-android-24-armv7-opt.yml | 5 +- taskcluster/test-cpp-android-25-arm64-opt.yml | 5 +- taskcluster/test-cpp-android-25-armv7-opt.yml | 5 +- taskcluster/test-cpp-armbian-arm64-opt.yml | 10 - .../test-cpp-linux-amd64-prod_pbmodel-opt.yml | 2 +- taskcluster/test-cpp-raspbian-rpi3-opt.yml | 10 - .../test-cpp_16k-armbian-arm64-opt.yml | 11 ++ ....yml => test-cpp_16k-darwin-amd64-opt.yml} | 9 +- taskcluster/test-cpp_16k-linux-amd64-opt.yml | 11 ++ .../test-cpp_16k-raspbian-rpi3-opt.yml | 11 ++ ...opt.yml => test-cpp_16k-win-amd64-opt.yml} | 9 +- ... test-cpp_16k_tflite-darwin-amd64-opt.yml} | 9 +- .../test-cpp_16k_tflite-linux-amd64-opt.yml | 11 ++ .../test-cpp_16k_tflite-win-amd64-opt.yml | 11 ++ ...pt.yml => test-cpp_8k-linux-amd64-opt.yml} | 9 +- ...=> test-cpp_8k_tflite-linux-amd64-opt.yml} | 9 +- .../test-cpp_tflite-linux-amd64-prod-opt.yml | 2 +- taskcluster/test-cpp_tflite-win-amd64-opt.yml | 10 - taskcluster/test-darwin-opt-base.tyml | 2 +- .../test-electronjs_v3.1-darwin-amd64-opt.yml | 5 +- .../test-electronjs_v3.1-win-amd64-opt.yml | 5 +- ...st-electronjs_v3.1_16k-linux-amd64-opt.yml | 15 ++ ...st-electronjs_v3.1_8k-linux-amd64-opt.yml} | 9 +- .../test-electronjs_v4.0-darwin-amd64-opt.yml | 5 +- .../test-electronjs_v4.0-win-amd64-opt.yml | 5 +- ...st-electronjs_v4.0_16k-linux-amd64-opt.yml | 15 ++ ...st-electronjs_v4.0_8k-linux-amd64-opt.yml} | 9 +- .../test-electronjs_v4.1-darwin-amd64-opt.yml | 5 +- .../test-electronjs_v4.1-win-amd64-opt.yml | 5 +- ...st-electronjs_v4.1_16k-linux-amd64-opt.yml | 15 ++ ...st-electronjs_v4.1_8k-linux-amd64-opt.yml} | 9 +- .../test-electronjs_v4.2-darwin-amd64-opt.yml | 5 +- .../test-electronjs_v4.2-win-amd64-opt.yml | 5 +- ...st-electronjs_v4.2_16k-linux-amd64-opt.yml | 15 ++ ...st-electronjs_v4.2_8k-linux-amd64-opt.yml} | 9 +- .../test-electronjs_v5.0-darwin-amd64-opt.yml | 5 +- .../test-electronjs_v5.0-win-amd64-opt.yml | 5 +- ...st-electronjs_v5.0_16k-linux-amd64-opt.yml | 15 ++ ...st-electronjs_v5.0_8k-linux-amd64-opt.yml} | 9 +- .../test-electronjs_v6.0-darwin-amd64-opt.yml | 5 +- .../test-electronjs_v6.0-win-amd64-opt.yml | 5 +- ...st-electronjs_v6.0_16k-linux-amd64-opt.yml | 15 ++ ...st-electronjs_v6.0_8k-linux-amd64-opt.yml} | 9 +- .../test-electronjs_v7.0-darwin-amd64-opt.yml | 5 +- .../test-electronjs_v7.0-win-amd64-opt.yml | 5 +- ...st-electronjs_v7.0_16k-linux-amd64-opt.yml | 15 ++ ...st-electronjs_v7.0_8k-linux-amd64-opt.yml} | 9 +- .../test-electronjs_v7.1-darwin-amd64-opt.yml | 5 +- .../test-electronjs_v7.1-win-amd64-opt.yml | 5 +- ...st-electronjs_v7.1_16k-linux-amd64-opt.yml | 15 ++ ...st-electronjs_v7.1_8k-linux-amd64-opt.yml} | 9 +- taskcluster/test-linux-opt-base.tyml | 2 +- ...t-lite_benchmark_model-linux-amd64-opt.yml | 3 +- .../test-netframework-win-amd64-opt.yml | 5 +- .../test-nodejs_10x-armbian-arm64-opt.yml | 5 +- .../test-nodejs_10x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_10x-raspbian-rpi3-opt.yml | 5 +- taskcluster/test-nodejs_10x-win-amd64-opt.yml | 5 +- .../test-nodejs_10x_16k-linux-amd64-opt.yml | 15 ++ ..._10x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...js_10x_16k_tflite-linux-amd64-prod-opt.yml | 13 ++ .../test-nodejs_10x_8k-linux-amd64-opt.yml | 15 ++ ...s_10x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...js_10x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- .../test-nodejs_11x-armbian-arm64-opt.yml | 5 +- .../test-nodejs_11x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_11x-raspbian-rpi3-opt.yml | 5 +- taskcluster/test-nodejs_11x-win-amd64-opt.yml | 5 +- .../test-nodejs_11x_16k-linux-amd64-opt.yml | 15 ++ ..._11x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...js_11x_16k_tflite-linux-amd64-prod-opt.yml | 13 ++ .../test-nodejs_11x_8k-linux-amd64-opt.yml | 15 ++ ...s_11x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...js_11x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- .../test-nodejs_12x-armbian-arm64-opt.yml | 5 +- .../test-nodejs_12x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_12x-raspbian-rpi3-opt.yml | 5 +- taskcluster/test-nodejs_12x-win-amd64-opt.yml | 5 +- .../test-nodejs_12x_16k-linux-amd64-opt.yml | 15 ++ ..._12x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...js_12x_16k_tflite-linux-amd64-prod-opt.yml | 13 ++ .../test-nodejs_12x_8k-linux-amd64-opt.yml | 15 ++ ...s_12x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...js_12x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- .../test-nodejs_13x-armbian-arm64-opt.yml | 5 +- .../test-nodejs_13x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_13x-raspbian-rpi3-opt.yml | 5 +- taskcluster/test-nodejs_13x-win-amd64-opt.yml | 5 +- .../test-nodejs_13x_16k-linux-amd64-opt.yml | 15 ++ ..._13x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...s_13x_16k_multiarchpkg-linux-amd64-opt.yml | 15 ++ ...iarchpkg-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...js_13x_16k_tflite-linux-amd64-prod-opt.yml | 13 ++ .../test-nodejs_13x_8k-linux-amd64-opt.yml | 15 ++ ...s_13x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...js_13x_8k_multiarchpkg-linux-amd64-opt.yml | 15 ++ ...iarchpkg-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...js_13x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- ...ejs_13x_multiarchpkg-armbian-arm64-opt.yml | 5 +- ...dejs_13x_multiarchpkg-darwin-amd64-opt.yml | 5 +- ...ejs_13x_multiarchpkg-raspbian-rpi3-opt.yml | 5 +- ...-nodejs_13x_multiarchpkg-win-amd64-opt.yml | 5 +- .../test-nodejs_4x-armbian-arm64-opt.yml | 5 +- .../test-nodejs_4x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_4x-raspbian-rpi3-opt.yml | 5 +- taskcluster/test-nodejs_4x-win-amd64-opt.yml | 5 +- .../test-nodejs_4x_16k-linux-amd64-opt.yml | 14 ++ ...s_4x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...ejs_4x_16k_tflite-linux-amd64-prod-opt.yml | 12 ++ .../test-nodejs_4x_8k-linux-amd64-opt.yml | 14 ++ ...js_4x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...ejs_4x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- .../test-nodejs_5x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_5x_16k-linux-amd64-opt.yml | 14 ++ ...s_5x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...ejs_5x_16k_tflite-linux-amd64-prod-opt.yml | 12 ++ .../test-nodejs_5x_8k-linux-amd64-opt.yml | 14 ++ ...js_5x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...ejs_5x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- .../test-nodejs_6x-armbian-arm64-opt.yml | 5 +- .../test-nodejs_6x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_6x-raspbian-rpi3-opt.yml | 5 +- taskcluster/test-nodejs_6x-win-amd64-opt.yml | 5 +- .../test-nodejs_6x_16k-linux-amd64-opt.yml | 14 ++ ...s_6x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...ejs_6x_16k_tflite-linux-amd64-prod-opt.yml | 12 ++ .../test-nodejs_6x_8k-linux-amd64-opt.yml | 14 ++ ...js_6x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...ejs_6x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- .../test-nodejs_7x-armbian-arm64-opt.yml | 5 +- .../test-nodejs_7x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_7x-raspbian-rpi3-opt.yml | 5 +- taskcluster/test-nodejs_7x-win-amd64-opt.yml | 5 +- .../test-nodejs_7x_16k-linux-amd64-opt.yml | 14 ++ ...s_7x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...ejs_7x_16k_tflite-linux-amd64-prod-opt.yml | 12 ++ .../test-nodejs_7x_8k-linux-amd64-opt.yml | 14 ++ ...js_7x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...ejs_7x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- .../test-nodejs_8x-armbian-arm64-opt.yml | 5 +- .../test-nodejs_8x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_8x-raspbian-rpi3-opt.yml | 5 +- taskcluster/test-nodejs_8x-win-amd64-opt.yml | 5 +- .../test-nodejs_8x_16k-linux-amd64-opt.yml | 14 ++ ...s_8x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...ejs_8x_16k_tflite-linux-amd64-prod-opt.yml | 12 ++ .../test-nodejs_8x_8k-linux-amd64-opt.yml | 14 ++ ...js_8x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...ejs_8x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- .../test-nodejs_9x-armbian-arm64-opt.yml | 5 +- .../test-nodejs_9x-darwin-amd64-opt.yml | 5 +- .../test-nodejs_9x-raspbian-rpi3-opt.yml | 5 +- taskcluster/test-nodejs_9x-win-amd64-opt.yml | 5 +- .../test-nodejs_9x_16k-linux-amd64-opt.yml | 14 ++ ...s_9x_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- ...ejs_9x_16k_tflite-linux-amd64-prod-opt.yml | 12 ++ .../test-nodejs_9x_8k-linux-amd64-opt.yml | 14 ++ ...js_9x_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...ejs_9x_8k_tflite-linux-amd64-prod-opt.yml} | 6 +- .../test-python_27m-darwin-amd64-opt.yml | 5 +- .../test-python_27m_16k-linux-amd64-opt.yml | 14 ++ ...n_27m_16k-linux-amd64-prod_pbmodel-opt.yml | 12 ++ .../test-python_27m_8k-linux-amd64-opt.yml | 14 ++ ...on_27m_8k-linux-amd64-prod_pbmodel-opt.yml | 12 ++ ...on_27m_tflite_16k-linux-amd64-prod-opt.yml | 12 ++ ...on_27m_tflite_8k-linux-amd64-prod-opt.yml} | 6 +- .../test-python_27mu_16k-linux-amd64-opt.yml | 14 ++ ..._27mu_16k-linux-amd64-prod_pbmodel-opt.yml | 12 ++ .../test-python_27mu_8k-linux-amd64-opt.yml | 14 ++ ...n_27mu_8k-linux-amd64-prod_pbmodel-opt.yml | 12 ++ ...n_27mu_tflite_16k-linux-amd64-prod-opt.yml | 12 ++ ...n_27mu_tflite_8k-linux-amd64-prod-opt.yml} | 6 +- .../test-python_35-darwin-amd64-opt.yml | 5 +- .../test-python_35-linux-amd64-opt.yml | 13 -- taskcluster/test-python_35-win-amd64-opt.yml | 5 +- .../test-python_35_16k-linux-amd64-opt.yml | 14 ++ ...on_35_16k-linux-amd64-prod_pbmodel-opt.yml | 12 ++ ... => test-python_35_8k-linux-amd64-opt.yml} | 9 +- ...on_35_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...hon_35_tflite_16k-linux-amd64-prod-opt.yml | 12 ++ ...hon_35_tflite_8k-linux-amd64-prod-opt.yml} | 6 +- .../test-python_36-darwin-amd64-opt.yml | 5 +- taskcluster/test-python_36-win-amd64-opt.yml | 5 +- .../test-python_36_16k-linux-amd64-opt.yml | 14 ++ ...n_36_16k-linux-amd64-prod_pbmodel-opt.yml} | 7 +- .../test-python_36_8k-linux-amd64-opt.yml | 14 ++ ...on_36_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...hon_36_tflite_16k-linux-amd64-prod-opt.yml | 12 ++ ...hon_36_tflite_8k-linux-amd64-prod-opt.yml} | 6 +- .../test-python_37-darwin-amd64-opt.yml | 5 +- .../test-python_37-linux-amd64-opt.yml | 13 -- taskcluster/test-python_37-win-amd64-opt.yml | 5 +- .../test-python_37_16k-linux-amd64-opt.yml | 14 ++ ...on_37_16k-linux-amd64-prod_pbmodel-opt.yml | 12 ++ .../test-python_37_8k-linux-amd64-opt.yml | 14 ++ ...on_37_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...hon_37_tflite_16k-linux-amd64-prod-opt.yml | 12 ++ ...thon_37_tflite_8k-linux-amd64-prod-opt.yml | 12 ++ .../test-python_37m-armbian-arm64-opt.yml | 5 +- .../test-python_37m-raspbian-rpi3-opt.yml | 5 +- .../test-python_38-darwin-amd64-opt.yml | 5 +- .../test-python_38-linux-amd64-opt.yml | 13 -- ...python_38-linux-amd64-prod_pbmodel-opt.yml | 12 -- taskcluster/test-python_38-win-amd64-opt.yml | 5 +- .../test-python_38_16k-linux-amd64-opt.yml | 14 ++ ...n_38_16k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ... => test-python_38_8k-linux-amd64-opt.yml} | 9 +- ...on_38_8k-linux-amd64-prod_pbmodel-opt.yml} | 6 +- ...-python_38_tflite-linux-amd64-prod-opt.yml | 12 -- ...hon_38_tflite_16k-linux-amd64-prod-opt.yml | 12 ++ ...hon_38_tflite_8k-linux-amd64-prod-opt.yml} | 6 +- taskcluster/test-raspbian-opt-base.tyml | 2 +- ...st-training_16k-linux-amd64-py35m-opt.yml} | 6 +- ...st-training_16k-linux-amd64-py36m-opt.yml} | 6 +- ...test-training_8k-linux-amd64-py36m-opt.yml | 13 ++ taskcluster/test-win-opt-base.tyml | 2 +- taskcluster/win-opt-base.tyml | 14 +- 251 files changed, 1588 insertions(+), 549 deletions(-) create mode 100644 data/smoke_test/LDC93S1_pcms16le_1_16000.wav delete mode 100644 taskcluster/test-cpp-armbian-arm64-opt.yml delete mode 100644 taskcluster/test-cpp-raspbian-rpi3-opt.yml create mode 100644 taskcluster/test-cpp_16k-armbian-arm64-opt.yml rename taskcluster/{test-cpp-darwin-amd64-opt.yml => test-cpp_16k-darwin-amd64-opt.yml} (60%) create mode 100644 taskcluster/test-cpp_16k-linux-amd64-opt.yml create mode 100644 taskcluster/test-cpp_16k-raspbian-rpi3-opt.yml rename taskcluster/{test-cpp-win-amd64-opt.yml => test-cpp_16k-win-amd64-opt.yml} (50%) rename taskcluster/{test-cpp_tflite-darwin-amd64-opt.yml => test-cpp_16k_tflite-darwin-amd64-opt.yml} (58%) create mode 100755 taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml create mode 100644 taskcluster/test-cpp_16k_tflite-win-amd64-opt.yml rename taskcluster/{test-cpp-linux-amd64-opt.yml => test-cpp_8k-linux-amd64-opt.yml} (52%) rename taskcluster/{test-cpp_tflite-linux-amd64-opt.yml => test-cpp_8k_tflite-linux-amd64-opt.yml} (50%) delete mode 100644 taskcluster/test-cpp_tflite-win-amd64-opt.yml create mode 100644 taskcluster/test-electronjs_v3.1_16k-linux-amd64-opt.yml rename taskcluster/{test-electronjs_v4.0-linux-amd64-opt.yml => test-electronjs_v3.1_8k-linux-amd64-opt.yml} (64%) create mode 100644 taskcluster/test-electronjs_v4.0_16k-linux-amd64-opt.yml rename taskcluster/{test-electronjs_v3.1-linux-amd64-opt.yml => test-electronjs_v4.0_8k-linux-amd64-opt.yml} (65%) create mode 100644 taskcluster/test-electronjs_v4.1_16k-linux-amd64-opt.yml rename taskcluster/{test-electronjs_v4.1-linux-amd64-opt.yml => test-electronjs_v4.1_8k-linux-amd64-opt.yml} (65%) create mode 100644 taskcluster/test-electronjs_v4.2_16k-linux-amd64-opt.yml rename taskcluster/{test-electronjs_v4.2-linux-amd64-opt.yml => test-electronjs_v4.2_8k-linux-amd64-opt.yml} (65%) create mode 100644 taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml rename taskcluster/{test-electronjs_v5.0-linux-amd64-opt.yml => test-electronjs_v5.0_8k-linux-amd64-opt.yml} (65%) create mode 100644 taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml rename taskcluster/{test-electronjs_v7.1-linux-amd64-opt.yml => test-electronjs_v6.0_8k-linux-amd64-opt.yml} (64%) create mode 100644 taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml rename taskcluster/{test-electronjs_v6.0-linux-amd64-opt.yml => test-electronjs_v7.0_8k-linux-amd64-opt.yml} (65%) create mode 100644 taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml rename taskcluster/{test-electronjs_v7.0-linux-amd64-opt.yml => test-electronjs_v7.1_8k-linux-amd64-opt.yml} (65%) create mode 100644 taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_10x-linux-amd64-opt.yml => test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml} (72%) create mode 100644 taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml} (73%) rename taskcluster/{test-nodejs_10x_tflite-linux-amd64-prod-opt.yml => test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml} (72%) create mode 100644 taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_11x-linux-amd64-opt.yml => test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml} (72%) create mode 100644 taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml} (73%) rename taskcluster/{test-nodejs_11x_tflite-linux-amd64-prod-opt.yml => test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml} (72%) create mode 100644 taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_12x-linux-amd64-opt.yml => test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml} (72%) create mode 100644 taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml} (73%) rename taskcluster/{test-nodejs_12x_tflite-linux-amd64-prod-opt.yml => test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml} (72%) create mode 100644 taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_13x-linux-amd64-opt.yml => test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml} (72%) create mode 100644 taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml rename taskcluster/{test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml => test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml} (77%) create mode 100644 taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml} (73%) create mode 100644 taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml rename taskcluster/{test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml} (89%) rename taskcluster/{test-nodejs_13x_tflite-linux-amd64-prod-opt.yml => test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml} (72%) create mode 100644 taskcluster/test-nodejs_4x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_4x-linux-amd64-opt.yml => test-nodejs_4x_16k-linux-amd64-prod_pbmodel-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_4x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_4x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_4x_8k-linux-amd64-prod_pbmodel-opt.yml} (72%) rename taskcluster/{test-nodejs_4x_tflite-linux-amd64-prod-opt.yml => test-nodejs_4x_8k_tflite-linux-amd64-prod-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_5x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_5x-linux-amd64-opt.yml => test-nodejs_5x_16k-linux-amd64-prod_pbmodel-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_5x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_5x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_5x_8k-linux-amd64-prod_pbmodel-opt.yml} (72%) rename taskcluster/{test-nodejs_5x_tflite-linux-amd64-prod-opt.yml => test-nodejs_5x_8k_tflite-linux-amd64-prod-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_6x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_6x-linux-amd64-opt.yml => test-nodejs_6x_16k-linux-amd64-prod_pbmodel-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_6x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_6x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_6x_8k-linux-amd64-prod_pbmodel-opt.yml} (72%) rename taskcluster/{test-nodejs_6x_tflite-linux-amd64-prod-opt.yml => test-nodejs_6x_8k_tflite-linux-amd64-prod-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_7x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_7x-linux-amd64-opt.yml => test-nodejs_7x_16k-linux-amd64-prod_pbmodel-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_7x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_7x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_7x_8k-linux-amd64-prod_pbmodel-opt.yml} (72%) rename taskcluster/{test-nodejs_7x_tflite-linux-amd64-prod-opt.yml => test-nodejs_7x_8k_tflite-linux-amd64-prod-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_8x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_8x-linux-amd64-opt.yml => test-nodejs_8x_16k-linux-amd64-prod_pbmodel-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_8x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_8x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_8x_8k-linux-amd64-prod_pbmodel-opt.yml} (72%) rename taskcluster/{test-nodejs_8x_tflite-linux-amd64-prod-opt.yml => test-nodejs_8x_8k_tflite-linux-amd64-prod-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_9x_16k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_9x-linux-amd64-opt.yml => test-nodejs_9x_16k-linux-amd64-prod_pbmodel-opt.yml} (71%) create mode 100644 taskcluster/test-nodejs_9x_16k_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-nodejs_9x_8k-linux-amd64-opt.yml rename taskcluster/{test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml => test-nodejs_9x_8k-linux-amd64-prod_pbmodel-opt.yml} (72%) rename taskcluster/{test-nodejs_9x_tflite-linux-amd64-prod-opt.yml => test-nodejs_9x_8k_tflite-linux-amd64-prod-opt.yml} (71%) create mode 100644 taskcluster/test-python_27m_16k-linux-amd64-opt.yml create mode 100644 taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml create mode 100644 taskcluster/test-python_27m_8k-linux-amd64-opt.yml create mode 100644 taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml create mode 100644 taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml rename taskcluster/{test-python_27m_tflite-linux-amd64-prod-opt.yml => test-python_27m_tflite_8k-linux-amd64-prod-opt.yml} (77%) create mode 100644 taskcluster/test-python_27mu_16k-linux-amd64-opt.yml create mode 100644 taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml create mode 100644 taskcluster/test-python_27mu_8k-linux-amd64-opt.yml create mode 100644 taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml create mode 100644 taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml rename taskcluster/{test-python_27mu_tflite-linux-amd64-prod-opt.yml => test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml} (76%) delete mode 100644 taskcluster/test-python_35-linux-amd64-opt.yml create mode 100644 taskcluster/test-python_35_16k-linux-amd64-opt.yml create mode 100644 taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml rename taskcluster/{test-python_27mu-linux-amd64-opt.yml => test-python_35_8k-linux-amd64-opt.yml} (56%) rename taskcluster/{test-python_27m-linux-amd64-prod_pbmodel-opt.yml => test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml} (65%) create mode 100644 taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml rename taskcluster/{test-python_37_tflite-linux-amd64-prod-opt.yml => test-python_35_tflite_8k-linux-amd64-prod-opt.yml} (65%) create mode 100644 taskcluster/test-python_36_16k-linux-amd64-opt.yml rename taskcluster/{test-python_36-linux-amd64-opt.yml => test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml} (64%) create mode 100644 taskcluster/test-python_36_8k-linux-amd64-opt.yml rename taskcluster/{test-python_36-linux-amd64-prod_pbmodel-opt.yml => test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml} (66%) create mode 100644 taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml rename taskcluster/{test-python_36_tflite-linux-amd64-prod-opt.yml => test-python_36_tflite_8k-linux-amd64-prod-opt.yml} (65%) delete mode 100644 taskcluster/test-python_37-linux-amd64-opt.yml create mode 100644 taskcluster/test-python_37_16k-linux-amd64-opt.yml create mode 100644 taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml create mode 100644 taskcluster/test-python_37_8k-linux-amd64-opt.yml rename taskcluster/{test-python_37-linux-amd64-prod_pbmodel-opt.yml => test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml} (65%) create mode 100644 taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml delete mode 100644 taskcluster/test-python_38-linux-amd64-opt.yml delete mode 100644 taskcluster/test-python_38-linux-amd64-prod_pbmodel-opt.yml create mode 100644 taskcluster/test-python_38_16k-linux-amd64-opt.yml rename taskcluster/{test-python_27mu-linux-amd64-prod_pbmodel-opt.yml => test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml} (65%) rename taskcluster/{test-python_27m-linux-amd64-opt.yml => test-python_38_8k-linux-amd64-opt.yml} (56%) rename taskcluster/{test-python_35-linux-amd64-prod_pbmodel-opt.yml => test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml} (66%) delete mode 100644 taskcluster/test-python_38_tflite-linux-amd64-prod-opt.yml create mode 100644 taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml rename taskcluster/{test-python_35_tflite-linux-amd64-prod-opt.yml => test-python_38_tflite_8k-linux-amd64-prod-opt.yml} (65%) rename taskcluster/{test-training_upstream-linux-amd64-py35m-opt.yml => test-training_16k-linux-amd64-py35m-opt.yml} (76%) rename taskcluster/{test-training_upstream-linux-amd64-py36m-opt.yml => test-training_16k-linux-amd64-py36m-opt.yml} (75%) create mode 100644 taskcluster/test-training_8k-linux-amd64-py36m-opt.yml diff --git a/bin/run-tc-ldc93s1_new.sh b/bin/run-tc-ldc93s1_new.sh index 29f833d7..ff8751ed 100755 --- a/bin/run-tc-ldc93s1_new.sh +++ b/bin/run-tc-ldc93s1_new.sh @@ -6,6 +6,7 @@ ldc93s1_dir="./data/smoke_test" ldc93s1_csv="${ldc93s1_dir}/ldc93s1.csv" epoch_count=$1 +audio_sample_rate=$2 if [ ! -f "${ldc93s1_dir}/ldc93s1.csv" ]; then echo "Downloading and preprocessing LDC93S1 example data, saving in ${ldc93s1_dir}." @@ -25,4 +26,5 @@ python -u DeepSpeech.py --noshow_progressbar --noearly_stop \ --max_to_keep 1 --checkpoint_dir '/tmp/ckpt' \ --learning_rate 0.001 --dropout_rate 0.05 --export_dir '/tmp/train' \ --lm_binary_path 'data/smoke_test/vocab.pruned.lm' \ - --lm_trie_path 'data/smoke_test/vocab.trie' + --lm_trie_path 'data/smoke_test/vocab.trie' \ + --audio_sample_rate ${audio_sample_rate} diff --git a/bin/run-tc-ldc93s1_tflite.sh b/bin/run-tc-ldc93s1_tflite.sh index 6012e1c5..b5a7772c 100755 --- a/bin/run-tc-ldc93s1_tflite.sh +++ b/bin/run-tc-ldc93s1_tflite.sh @@ -5,6 +5,8 @@ set -xe ldc93s1_dir="./data/smoke_test" ldc93s1_csv="${ldc93s1_dir}/ldc93s1.csv" +audio_sample_rate=$1 + if [ ! -f "${ldc93s1_dir}/ldc93s1.csv" ]; then echo "Downloading and preprocessing LDC93S1 example data, saving in ${ldc93s1_dir}." python -u bin/import_ldc93s1.py ${ldc93s1_dir} @@ -20,6 +22,7 @@ python -u DeepSpeech.py --noshow_progressbar \ --export_dir '/tmp/train_tflite' \ --lm_binary_path 'data/smoke_test/vocab.pruned.lm' \ --lm_trie_path 'data/smoke_test/vocab.trie' \ + --audio_sample_rate ${audio_sample_rate} \ --export_tflite mkdir /tmp/train_tflite/en-us @@ -30,5 +33,6 @@ python -u DeepSpeech.py --noshow_progressbar \ --export_dir '/tmp/train_tflite/en-us' \ --lm_binary_path 'data/smoke_test/vocab.pruned.lm' \ --lm_trie_path 'data/smoke_test/vocab.trie' \ + --audio_sample_rate ${audio_sample_rate} \ --export_language 'Fake English (fk-FK)' \ --export_zip diff --git a/data/smoke_test/LDC93S1_pcms16le_1_16000.wav b/data/smoke_test/LDC93S1_pcms16le_1_16000.wav new file mode 100644 index 0000000000000000000000000000000000000000..62b65f8fc67dab9e3b46c5395daebf74654c9ce5 GIT binary patch literal 93638 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 DejC}J literal 0 HcmV?d00001 diff --git a/taskcluster/.build.yml b/taskcluster/.build.yml index 96ba300c..ab79475b 100644 --- a/taskcluster/.build.yml +++ b/taskcluster/.build.yml @@ -24,3 +24,4 @@ build: convert_graphdef: '' benchmark_model_bin: '' tensorflow_git_desc: 'TensorFlow: v1.14.0-21-ge77504a' + test_model_task: '' diff --git a/taskcluster/darwin-opt-base.tyml b/taskcluster/darwin-opt-base.tyml index ff405121..7210ed10 100644 --- a/taskcluster/darwin-opt-base.tyml +++ b/taskcluster/darwin-opt-base.tyml @@ -37,11 +37,7 @@ payload: maxRunTime: { $eval: to_int(build.maxRunTime) } env: - $let: - training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") } - in: - TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow} - DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb + TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow} # 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 e4c86ae5..4f7c5fa3 100644 --- a/taskcluster/linux-opt-base.tyml +++ b/taskcluster/linux-opt-base.tyml @@ -33,11 +33,7 @@ then: image: "ubuntu:14.04" env: - $let: - training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") } - in: - TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow} - DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb + TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow} command: - "/bin/bash" diff --git a/taskcluster/tc-android-apk-tests.sh b/taskcluster/tc-android-apk-tests.sh index c2a00afb..fec910bd 100644 --- a/taskcluster/tc-android-apk-tests.sh +++ b/taskcluster/tc-android-apk-tests.sh @@ -7,6 +7,9 @@ api_level=$2 source $(dirname "$0")/tc-tests-utils.sh +# Android test code only supports 16kHz and hard-coded filename +ldc93s1_sample_filename='LDC93S1.wav' + model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite} model_name=$(basename "${model_source}") diff --git a/taskcluster/tc-android-ds-tests.sh b/taskcluster/tc-android-ds-tests.sh index 0f5e289c..ec96dbf1 100755 --- a/taskcluster/tc-android-ds-tests.sh +++ b/taskcluster/tc-android-ds-tests.sh @@ -7,6 +7,9 @@ api_level=$2 source $(dirname "$0")/tc-tests-utils.sh +bitrate=$3 +set_ldc_sample_filename "${bitrate}" + model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite} model_name=$(basename "${model_source}") export DATA_TMP_DIR=${ANDROID_TMP_DIR}/ds diff --git a/taskcluster/tc-cpp-ds-tests-prod.sh b/taskcluster/tc-cpp-ds-tests-prod.sh index 40384849..d3e1db2e 100644 --- a/taskcluster/tc-cpp-ds-tests-prod.sh +++ b/taskcluster/tc-cpp-ds-tests-prod.sh @@ -4,6 +4,9 @@ set -xe source $(dirname "$0")/tc-tests-utils.sh +bitrate=$1 +set_ldc_sample_filename "${bitrate}" + model_source=${DEEPSPEECH_PROD_MODEL} model_name=$(basename "${model_source}") @@ -16,4 +19,4 @@ export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH check_tensorflow_version -run_prod_inference_tests +run_prod_inference_tests "${bitrate}" diff --git a/taskcluster/tc-cpp-ds-tests.sh b/taskcluster/tc-cpp-ds-tests.sh index 194abc41..cea0674c 100644 --- a/taskcluster/tc-cpp-ds-tests.sh +++ b/taskcluster/tc-cpp-ds-tests.sh @@ -4,6 +4,9 @@ set -xe source $(dirname "$0")/tc-tests-utils.sh +bitrate=$1 +set_ldc_sample_filename "${bitrate}" + download_material "${TASKCLUSTER_TMP_DIR}/ds" export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH diff --git a/taskcluster/tc-cpp_tflite-ds-tests.sh b/taskcluster/tc-cpp_tflite-ds-tests.sh index 38a65677..f442dda7 100644 --- a/taskcluster/tc-cpp_tflite-ds-tests.sh +++ b/taskcluster/tc-cpp_tflite-ds-tests.sh @@ -4,6 +4,9 @@ set -xe source $(dirname "$0")/tc-tests-utils.sh +bitrate=$1 +set_ldc_sample_filename "${bitrate}" + model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite} model_name=$(basename "${model_source}") model_name_mmap=$(basename "${model_source}") diff --git a/taskcluster/tc-cpp_tflite-tests-prod.sh b/taskcluster/tc-cpp_tflite-tests-prod.sh index 2d0b969a..4c66ae9e 100644 --- a/taskcluster/tc-cpp_tflite-tests-prod.sh +++ b/taskcluster/tc-cpp_tflite-tests-prod.sh @@ -8,6 +8,9 @@ export DEEPSPEECH_PROD_MODEL_MMAP=https://github.com/lissyx/DeepSpeech/releases/ source $(dirname "$0")/tc-tests-utils.sh +bitrate=$1 +set_ldc_sample_filename "${bitrate}" + model_source=${DEEPSPEECH_PROD_MODEL//.pb/.tflite} model_name=$(basename "${model_source}") model_name_mmap=$(basename "${model_source}") @@ -21,4 +24,4 @@ export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH check_tensorflow_version -run_prodtflite_inference_tests +run_prodtflite_inference_tests "${bitrate}" diff --git a/taskcluster/tc-cpp_tflite_basic-ds-tests.sh b/taskcluster/tc-cpp_tflite_basic-ds-tests.sh index 549befcc..be539933 100644 --- a/taskcluster/tc-cpp_tflite_basic-ds-tests.sh +++ b/taskcluster/tc-cpp_tflite_basic-ds-tests.sh @@ -4,6 +4,9 @@ set -xe source $(dirname "$0")/tc-tests-utils.sh +bitrate=$1 +set_ldc_sample_filename "${bitrate}" + model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite} model_name=$(basename "${model_source}") export DEEPSPEECH_ARTIFACTS_ROOT=${DEEPSPEECH_ARTIFACTS_TFLITE_ROOT} diff --git a/taskcluster/tc-cppwin-ds-tests.sh b/taskcluster/tc-cppwin-ds-tests.sh index 018be828..671ae3ef 100644 --- a/taskcluster/tc-cppwin-ds-tests.sh +++ b/taskcluster/tc-cppwin-ds-tests.sh @@ -4,6 +4,9 @@ set -xe source $(dirname "$0")/tc-tests-utils.sh +bitrate=$1 +set_ldc_sample_filename "${bitrate}" + download_material "${TASKCLUSTER_TMP_DIR}/ds" export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH diff --git a/taskcluster/tc-electron-tests.sh b/taskcluster/tc-electron-tests.sh index 8318a522..566775f4 100755 --- a/taskcluster/tc-electron-tests.sh +++ b/taskcluster/tc-electron-tests.sh @@ -17,6 +17,9 @@ if [ -z "${electronver}" ]; then exit 1 fi; +bitrate=$3 +set_ldc_sample_filename "${bitrate}" + download_data node --version diff --git a/taskcluster/tc-netframework-ds-tests.sh b/taskcluster/tc-netframework-ds-tests.sh index 5e56e642..3e48bf25 100644 --- a/taskcluster/tc-netframework-ds-tests.sh +++ b/taskcluster/tc-netframework-ds-tests.sh @@ -6,6 +6,9 @@ cuda=$1 source $(dirname "$0")/tc-tests-utils.sh +bitrate=$1 +set_ldc_sample_filename "${bitrate}" + if [ "${cuda}" = "--cuda" ]; then PROJECT_NAME="DeepSpeech-GPU" else diff --git a/taskcluster/tc-node-tests-prod.sh b/taskcluster/tc-node-tests-prod.sh index b03f7e91..0b812699 100644 --- a/taskcluster/tc-node-tests-prod.sh +++ b/taskcluster/tc-node-tests-prod.sh @@ -11,6 +11,9 @@ if [ -z "${nodever}" ]; then exit 1 fi; +bitrate=$2 +set_ldc_sample_filename "${bitrate}" + model_source=${DEEPSPEECH_PROD_MODEL} model_name=$(basename "${model_source}") @@ -32,4 +35,4 @@ npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url} check_runtime_nodejs -run_prod_inference_tests +run_prod_inference_tests "${bitrate}" diff --git a/taskcluster/tc-node-tests.sh b/taskcluster/tc-node-tests.sh index b53002e8..17548022 100644 --- a/taskcluster/tc-node-tests.sh +++ b/taskcluster/tc-node-tests.sh @@ -11,6 +11,9 @@ if [ -z "${nodever}" ]; then exit 1 fi; +bitrate=$2 +set_ldc_sample_filename "${bitrate}" + download_data node --version diff --git a/taskcluster/tc-node_tflite-tests-prod.sh b/taskcluster/tc-node_tflite-tests-prod.sh index aef3b48e..e813a16c 100644 --- a/taskcluster/tc-node_tflite-tests-prod.sh +++ b/taskcluster/tc-node_tflite-tests-prod.sh @@ -15,6 +15,9 @@ if [ -z "${nodever}" ]; then exit 1 fi; +bitrate=$2 +set_ldc_sample_filename "${bitrate}" + model_source=${DEEPSPEECH_PROD_MODEL//.pb/.tflite} model_name=$(basename "${model_source}") model_name_mmap=$(basename "${model_source}") @@ -36,4 +39,4 @@ npm install --prefix ${NODE_ROOT} --cache ${NODE_CACHE} ${deepspeech_npm_url} check_runtime_nodejs -run_prodtflite_inference_tests +run_prodtflite_inference_tests "${bitrate}" diff --git a/taskcluster/tc-node_tflite-tests.sh b/taskcluster/tc-node_tflite-tests.sh index c5a27c21..45907c11 100644 --- a/taskcluster/tc-node_tflite-tests.sh +++ b/taskcluster/tc-node_tflite-tests.sh @@ -11,6 +11,9 @@ if [ -z "${nodever}" ]; then exit 1 fi; +bitrate=$2 +set_ldc_sample_filename "${bitrate}" + model_source=${DEEPSPEECH_TEST_MODEL//.pb/.tflite} model_name=$(basename "${model_source}") model_name_mmap=$(basename "${model_source}") diff --git a/taskcluster/tc-python-tests-prod.sh b/taskcluster/tc-python-tests-prod.sh index 76961b52..2b5fe848 100644 --- a/taskcluster/tc-python-tests-prod.sh +++ b/taskcluster/tc-python-tests-prod.sh @@ -6,6 +6,9 @@ source $(dirname "$0")/tc-tests-utils.sh extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias" +bitrate=$2 +set_ldc_sample_filename "${bitrate}" + unset PYTHON_BIN_PATH unset PYTHONPATH @@ -43,8 +46,8 @@ 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 -run_prod_inference_tests +run_prod_inference_tests "${bitrate}" -run_prod_concurrent_stream_tests +run_prod_concurrent_stream_tests "${bitrate}" virtualenv_deactivate "${pyalias}" "${PYENV_NAME}" diff --git a/taskcluster/tc-python-tests.sh b/taskcluster/tc-python-tests.sh index 18756be8..6f101389 100644 --- a/taskcluster/tc-python-tests.sh +++ b/taskcluster/tc-python-tests.sh @@ -6,6 +6,9 @@ source $(dirname "$0")/tc-tests-utils.sh extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias" +bitrate=$2 +set_ldc_sample_filename "${bitrate}" + unset PYTHON_BIN_PATH unset PYTHONPATH diff --git a/taskcluster/tc-python_tflite-tests-prod.sh b/taskcluster/tc-python_tflite-tests-prod.sh index 6b6ae765..92b46409 100644 --- a/taskcluster/tc-python_tflite-tests-prod.sh +++ b/taskcluster/tc-python_tflite-tests-prod.sh @@ -10,6 +10,9 @@ source $(dirname "$0")/tc-tests-utils.sh extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias" +bitrate=$2 +set_ldc_sample_filename "${bitrate}" + unset PYTHON_BIN_PATH unset PYTHONPATH @@ -50,6 +53,6 @@ LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH pip install --verbose --only-bin which deepspeech deepspeech --version -run_prodtflite_inference_tests +run_prodtflite_inference_tests "${bitrate}" virtualenv_deactivate "${pyalias}" "${PYENV_NAME}" diff --git a/taskcluster/tc-python_tflite-tests.sh b/taskcluster/tc-python_tflite-tests.sh index 6a419485..b2759aa6 100644 --- a/taskcluster/tc-python_tflite-tests.sh +++ b/taskcluster/tc-python_tflite-tests.sh @@ -6,6 +6,9 @@ source $(dirname "$0")/tc-tests-utils.sh extract_python_versions "$1" "pyver" "pyver_pkg" "py_unicode_type" "pyconf" "pyalias" +bitrate=$2 +set_ldc_sample_filename "${bitrate}" + unset PYTHON_BIN_PATH unset PYTHONPATH diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh index 5cc71e0c..49ab0fb5 100755 --- a/taskcluster/tc-tests-utils.sh +++ b/taskcluster/tc-tests-utils.sh @@ -56,6 +56,8 @@ model_name="$(basename "${model_source}")" model_name_mmap="$(basename -s ".pb" "${model_source}").pbmm" model_source_mmap="$(dirname "${model_source}")/${model_name_mmap}" +ldc93s1_sample_filename='' + SUPPORTED_PYTHON_VERSIONS=${SUPPORTED_PYTHON_VERSIONS:-2.7.16:ucs2 2.7.16:ucs4 3.5.7:ucs4 3.6.8:ucs4 3.7.3:ucs4 3.8.0:ucs4} SUPPORTED_NODEJS_VERSIONS=${SUPPORTED_NODEJS_VERSIONS:-4.9.1 5.12.0 6.17.1 7.10.1 8.16.0 9.11.2 10.16.0 11.15.0 12.5.0 13.0.1} SUPPORTED_ELECTRONJS_VERSIONS=${SUPPORTED_ELECTRONJS_VERSIONS:-1.6.18 1.7.16 1.8.8 2.0.18 3.0.16 3.1.11 4.0.3 4.1.5 4.2.5 5.0.6 6.0.11 7.0.1 7.1.2} @@ -245,7 +247,7 @@ assert_working_ldc93s1_lm() assert_correct_multi_ldc93s1() { - assert_shows_something "$1" "/LDC93S1.wav%she had your dark suit in greasy wash water all year%" "$?" + assert_shows_something "$1" "/${ldc93s1_sample_filename}%she had your dark suit in greasy wash water all year%" "$?" assert_shows_something "$1" "/LDC93S1_pcms16le_2_44100.wav%she had your dark suit in greasy wash water all year%" "$?" ## 8k will output garbage anyway ... # assert_shows_something "$1" "/LDC93S1_pcms16le_1_8000.wav%she hayorasryrtl lyreasy asr watal w water all year%" @@ -253,22 +255,46 @@ assert_correct_multi_ldc93s1() assert_correct_ldc93s1_prodmodel() { - assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2" + if [ -z "$3" -o "$3" = "16k" ]; then + assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2" + fi; + + if [ -o "$3" = "8k" ]; then + assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2" + fi; } assert_correct_ldc93s1_prodtflitemodel() { - assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2" + if [ -z "$3" -o "$3" = "16k" ]; then + assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2" + fi; + + if [ -o "$3" = "8k" ]; then + assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2" + fi; } assert_correct_ldc93s1_prodmodel_stereo_44k() { - assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2" + if [ -z "$3" -o "$3" = "16k" ]; then + assert_correct_inference "$1" "she had reduce and greasy wash water all year" "$2" + fi; + + if [ -o "$3" = "8k" ]; then + assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2" + fi; } assert_correct_ldc93s1_prodtflitemodel_stereo_44k() { - assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2" + if [ -z "$3" -o "$3" = "16k" ]; then + assert_correct_inference "$1" "she had educate in greasy wash were all year" "$2" + fi; + + if [ -o "$3" = "8k" ]; then + assert_correct_inference "$1" "she had conduct suit in greasy wash water all year" "$2" + fi; } assert_correct_warning_upsampling() @@ -320,12 +346,12 @@ check_runtime_electronjs() run_tflite_basic_inference_tests() { set +e - phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$?" set +e - phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/LDC93S1.wav --extended 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(${DS_BINARY_PREFIX}deepspeech --model ${DATA_TMP_DIR}/${model_name} --audio ${DATA_TMP_DIR}/${ldc93s1_sample_filename} --extended 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$?" } @@ -333,22 +359,22 @@ run_tflite_basic_inference_tests() run_netframework_inference_tests() { set +e - phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?" set +e - phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --extended yes 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --extended yes 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?" set +e - phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?" set +e - phrase_pbmodel_withlm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_withlm=$(DeepSpeechConsole.exe --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_working_ldc93s1_lm "${phrase_pbmodel_withlm}" "$?" } @@ -356,22 +382,22 @@ run_netframework_inference_tests() run_electronjs_inference_tests() { set +e - phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?" set +e - phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --extended 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --extended 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?" set +e - phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_working_ldc93s1 "${phrase_pbmodel_nolm}" "$?" set +e - phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) set -e assert_working_ldc93s1_lm "${phrase_pbmodel_withlm}" "$?" } @@ -379,25 +405,25 @@ run_electronjs_inference_tests() run_basic_inference_tests() { set +e - phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) status=$? set -e assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$status" set +e - phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --extended 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --extended 2>${TASKCLUSTER_TMP_DIR}/stderr) status=$? set -e assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$status" set +e - phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_nolm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) status=$? set -e assert_correct_ldc93s1 "${phrase_pbmodel_nolm}" "$status" set +e - phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) status=$? set -e assert_correct_ldc93s1_lm "${phrase_pbmodel_withlm}" "$status" @@ -419,25 +445,30 @@ run_all_inference_tests() set -e assert_correct_ldc93s1_lm "${phrase_pbmodel_withlm_stereo_44k}" "$status" - set +e - phrase_pbmodel_nolm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null) - set -e - assert_correct_warning_upsampling "${phrase_pbmodel_nolm_mono_8k}" + # Run down-sampling warning test only when we actually perform downsampling + if [ "${ldc93s1_sample_filename}" != "LDC93S1_pcms16le_1_8000.wav" ]; then + set +e + phrase_pbmodel_nolm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null) + set -e + assert_correct_warning_upsampling "${phrase_pbmodel_nolm_mono_8k}" - set +e - phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null) - set -e - assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}" + set +e + phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null) + set -e + assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}" + fi; } run_prod_concurrent_stream_tests() { + local _bitrate=$1 + set +e output=$(python ${TASKCLUSTER_TMP_DIR}/test_sources/concurrent_streams.py \ --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} \ --lm ${TASKCLUSTER_TMP_DIR}/lm.binary \ --trie ${TASKCLUSTER_TMP_DIR}/trie \ - --audio1 ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav \ + --audio1 ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \ --audio2 ${TASKCLUSTER_TMP_DIR}/new-home-in-the-stars-16k.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) status=$? set -e @@ -445,60 +476,70 @@ run_prod_concurrent_stream_tests() output1=$(echo "${output}" | head -n 1) output2=$(echo "${output}" | tail -n 1) - assert_correct_ldc93s1_prodmodel "${output1}" "${status}" + assert_correct_ldc93s1_prodmodel "${output1}" "${status}" "${_bitrate}" assert_correct_inference "${output2}" "we must find a new home in the stars" "${status}" } run_prod_inference_tests() { - set +e - phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) - status=$? - set -e - assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status" + local _bitrate=$1 set +e - phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) status=$? set -e - assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status" + assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}" + + set +e + phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) + status=$? + set -e + assert_correct_ldc93s1_prodmodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}" set +e phrase_pbmodel_withlm_stereo_44k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_2_44100.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) status=$? set -e - assert_correct_ldc93s1_prodmodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status" + assert_correct_ldc93s1_prodmodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status" "${_bitrate}" - set +e - phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null) - set -e - assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}" + # Run down-sampling warning test only when we actually perform downsampling + if [ "${ldc93s1_sample_filename}" != "LDC93S1_pcms16le_1_8000.wav" ]; then + set +e + phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null) + set -e + assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}" + fi; } run_prodtflite_inference_tests() { - set +e - phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) - status=$? - set -e - assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status" + local _bitrate=$1 set +e - phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) + phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) status=$? set -e - assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status" + assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}" + + set +e + phrase_pbmodel_withlm=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} 2>${TASKCLUSTER_TMP_DIR}/stderr) + status=$? + set -e + assert_correct_ldc93s1_prodtflitemodel "${phrase_pbmodel_withlm}" "$status" "${_bitrate}" set +e phrase_pbmodel_withlm_stereo_44k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_2_44100.wav 2>${TASKCLUSTER_TMP_DIR}/stderr) status=$? set -e - assert_correct_ldc93s1_prodtflitemodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status" + assert_correct_ldc93s1_prodtflitemodel_stereo_44k "${phrase_pbmodel_withlm_stereo_44k}" "$status" "${_bitrate}" - set +e - phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null) - set -e - assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}" + # Run down-sampling warning test only when we actually perform downsampling + if [ "${ldc93s1_sample_filename}" != "LDC93S1_pcms16le_1_8000.wav" ]; then + set +e + phrase_pbmodel_withlm_mono_8k=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1_pcms16le_1_8000.wav 2>&1 1>/dev/null) + set -e + assert_correct_warning_upsampling "${phrase_pbmodel_withlm_mono_8k}" + fi; } run_multi_inference_tests() @@ -519,7 +560,7 @@ run_multi_inference_tests() run_cpp_only_inference_tests() { set +e - phrase_pbmodel_withlm_intermediate_decode=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav --stream 1280 2>${TASKCLUSTER_TMP_DIR}/stderr | tail -n 1) + phrase_pbmodel_withlm_intermediate_decode=$(deepspeech --model ${TASKCLUSTER_TMP_DIR}/${model_name_mmap} --lm ${TASKCLUSTER_TMP_DIR}/lm.binary --trie ${TASKCLUSTER_TMP_DIR}/trie --audio ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} --stream 1280 2>${TASKCLUSTER_TMP_DIR}/stderr | tail -n 1) status=$? set -e assert_correct_ldc93s1_lm "${phrase_pbmodel_withlm_intermediate_decode}" "$status" @@ -597,6 +638,25 @@ install_nuget() export PATH=${TASKCLUSTER_TMP_DIR}/ds/:$PATH } +set_ldc_sample_filename() +{ + local _bitrate=$1 + + if [ -z "${_bitrate}" ]; then + echo "Bitrate should not be empty" + exit 1 + fi; + + case "${_bitrate}" in + 8k) + ldc93s1_sample_filename='LDC93S1_pcms16le_1_8000.wav' + ;; + 16k) + ldc93s1_sample_filename='LDC93S1_pcms16le_1_16000.wav' + ;; + esac +} + download_data() { ${WGET} -P "${TASKCLUSTER_TMP_DIR}" "${model_source}" @@ -1664,7 +1724,7 @@ android_setup_ndk_data() adb push \ ${TASKCLUSTER_TMP_DIR}/${model_name} \ - ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav \ + ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \ ${ANDROID_TMP_DIR}/ds/ } @@ -1674,7 +1734,7 @@ android_setup_apk_data() adb push \ ${TASKCLUSTER_TMP_DIR}/${model_name} \ - ${TASKCLUSTER_TMP_DIR}/LDC93S1.wav \ + ${TASKCLUSTER_TMP_DIR}/${ldc93s1_sample_filename} \ ${TASKCLUSTER_TMP_DIR}/lm.binary \ ${TASKCLUSTER_TMP_DIR}/trie \ ${ANDROID_TMP_DIR}/test/ diff --git a/taskcluster/tc-train-tests.sh b/taskcluster/tc-train-tests.sh index a782fa18..4c0448fb 100644 --- a/taskcluster/tc-train-tests.sh +++ b/taskcluster/tc-train-tests.sh @@ -5,7 +5,7 @@ set -xe source $(dirname "$0")/tc-tests-utils.sh pyver_full=$1 -ds=$2 +bitrate=$2 if [ -z "${pyver_full}" ]; then echo "No python version given, aborting." @@ -56,11 +56,28 @@ decoder_pkg_url=${DECODER_ARTIFACTS_ROOT}/${decoder_pkg} LD_LIBRARY_PATH=${PY37_LDPATH}:$LD_LIBRARY_PATH pip install --verbose --only-binary :all: ${PY37_SOURCE_PACKAGE} ${decoder_pkg_url} | cat +# Prepare correct arguments for training +case "${bitrate}" in + 8k) + sample_rate=8000 + sample_name='LDC93S1_pcms16le_1_8000.wav' + ;; + 16k) + sample_rate=16000 + sample_name='LDC93S1_pcms16le_1_16000.wav' + ;; +esac + +# Easier to rename to that we can exercize the LDC93S1 importer code to +# generate the CSV file. +echo "Moving ${sample_name} to LDC93S1.wav" +mv "${DS_ROOT_TASK}/DeepSpeech/ds/data/smoke_test/${sample_name}" "${DS_ROOT_TASK}/DeepSpeech/ds/data/smoke_test/LDC93S1.wav" + pushd ${HOME}/DeepSpeech/ds/ # Run twice to test preprocessed features - time ./bin/run-tc-ldc93s1_new.sh 219 - time ./bin/run-tc-ldc93s1_new.sh 1 - time ./bin/run-tc-ldc93s1_tflite.sh + time ./bin/run-tc-ldc93s1_new.sh 219 "${sample_rate}" + time ./bin/run-tc-ldc93s1_new.sh 1 "${sample_rate}" + time ./bin/run-tc-ldc93s1_tflite.sh "${sample_rate}" popd cp /tmp/train/output_graph.pb ${TASKCLUSTER_ARTIFACTS} diff --git a/taskcluster/test-android-opt-base.tyml b/taskcluster/test-android-opt-base.tyml index 4cdf7ccd..92765ebd 100644 --- a/taskcluster/test-android-opt-base.tyml +++ b/taskcluster/test-android-opt-base.tyml @@ -31,7 +31,7 @@ then: env: $let: - training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") } + training: { $eval: as_slugid(build.test_model_task) } android_arm64_build: { $eval: as_slugid("android-arm64-cpu-opt") } android_armv7_build: { $eval: as_slugid("android-armv7-cpu-opt") } in: diff --git a/taskcluster/test-apk-android-24-x86_64-opt.yml b/taskcluster/test-apk-android-24-x86_64-opt.yml index dad056f5..9faae2e8 100644 --- a/taskcluster/test-apk-android-24-x86_64-opt.yml +++ b/taskcluster/test-apk-android-24-x86_64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-android-opt-base.tyml dependencies: - "android-x86_64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > apt-get -qq -y install curl make python && ${swig.packages.install_script} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-24" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-24 16k" metadata: name: "DeepSpeech Android 7.0 x86_64 Google Pixel APK/Java tests" description: "Testing DeepSpeech APK/Java for Android 7.0 x86_64 Google Pixel, optimized version" diff --git a/taskcluster/test-apk-android-25-x86_64-opt.yml b/taskcluster/test-apk-android-25-x86_64-opt.yml index 1864d226..6cc134f4 100644 --- a/taskcluster/test-apk-android-25-x86_64-opt.yml +++ b/taskcluster/test-apk-android-25-x86_64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-android-opt-base.tyml dependencies: - "android-x86_64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > apt-get -qq -y install curl make python && ${swig.packages.install_script} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-25" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-apk-tests.sh x86_64 android-25 16k" metadata: name: "DeepSpeech Android 7.1 x86_64 Google Pixel APK/Java tests" description: "Testing DeepSpeech APK/Java for Android 7.1 x86_64 Google Pixel, optimized version" diff --git a/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled b/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled index 24efe825..d5b399db 100644 --- a/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled +++ b/taskcluster/test-apk-android-26-x86_64-opt.yml.disabled @@ -3,7 +3,7 @@ build: template_file: test-android-opt-base.tyml dependencies: - "android-x86_64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" system_setup: > apt-get -qq -y install curl make python && ${swig.packages.install_script} diff --git a/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled b/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled index f149cb49..d50b9369 100644 --- a/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled +++ b/taskcluster/test-apk-android-28-x86_64-opt.yml.disabled @@ -3,7 +3,7 @@ build: template_file: test-android-opt-base.tyml dependencies: - "android-x86_64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" system_setup: > apt-get -qq -y install curl make python && ${swig.packages.install_script} diff --git a/taskcluster/test-armbian-opt-base.tyml b/taskcluster/test-armbian-opt-base.tyml index 76733c02..21159472 100644 --- a/taskcluster/test-armbian-opt-base.tyml +++ b/taskcluster/test-armbian-opt-base.tyml @@ -31,7 +31,7 @@ then: env: $let: - training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") } + training: { $eval: as_slugid(build.test_model_task) } linux_arm64_build: { $eval: as_slugid("linux-arm64-cpu-opt") } in: DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_arm64_build}/artifacts/public diff --git a/taskcluster/test-benchmark-linux-amd64-opt.yml b/taskcluster/test-benchmark-linux-amd64-opt.yml index 9f6e6d42..5b3f53f4 100644 --- a/taskcluster/test-benchmark-linux-amd64-opt.yml +++ b/taskcluster/test-benchmark-linux-amd64-opt.yml @@ -2,7 +2,8 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > apt-get -qq -y install ${python.packages_trusty.apt} zip diff --git a/taskcluster/test-cpp-android-24-arm64-opt.yml b/taskcluster/test-cpp-android-24-arm64-opt.yml index 1ef22210..abd21dc9 100644 --- a/taskcluster/test-cpp-android-24-arm64-opt.yml +++ b/taskcluster/test-cpp-android-24-arm64-opt.yml @@ -2,9 +2,10 @@ build: template_file: test-android-opt-base.tyml dependencies: - "android-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-24" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-24 16k" metadata: name: "DeepSpeech Android 7.0 ARM64 Google Pixel C++ tests" description: "Testing DeepSpeech C++ for Android 7.0 ARM64 Google Pixel, optimized version" diff --git a/taskcluster/test-cpp-android-24-armv7-opt.yml b/taskcluster/test-cpp-android-24-armv7-opt.yml index f3e5f3db..af5b1c6e 100644 --- a/taskcluster/test-cpp-android-24-armv7-opt.yml +++ b/taskcluster/test-cpp-android-24-armv7-opt.yml @@ -2,9 +2,10 @@ build: template_file: test-android-opt-base.tyml dependencies: - "android-armv7-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-24" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-24 16k" metadata: name: "DeepSpeech Android 7.0 ARMv7 Google Pixel C++ tests" description: "Testing DeepSpeech C++ for Android 7.0 ARMv7 Google Pixel, optimized version" diff --git a/taskcluster/test-cpp-android-25-arm64-opt.yml b/taskcluster/test-cpp-android-25-arm64-opt.yml index e90e2171..7183105e 100644 --- a/taskcluster/test-cpp-android-25-arm64-opt.yml +++ b/taskcluster/test-cpp-android-25-arm64-opt.yml @@ -2,9 +2,10 @@ build: template_file: test-android-opt-base.tyml dependencies: - "android-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-25" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh arm64-v8a android-25 16k" metadata: name: "DeepSpeech Android 7.1 ARM64 Google Pixel C++ tests" description: "Testing DeepSpeech C++ for Android 7.1 ARM64 Google Pixel, optimized version" diff --git a/taskcluster/test-cpp-android-25-armv7-opt.yml b/taskcluster/test-cpp-android-25-armv7-opt.yml index d8a32b07..8bb1c8f1 100644 --- a/taskcluster/test-cpp-android-25-armv7-opt.yml +++ b/taskcluster/test-cpp-android-25-armv7-opt.yml @@ -2,9 +2,10 @@ build: template_file: test-android-opt-base.tyml dependencies: - "android-armv7-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-25" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-android-ds-tests.sh armeabi-v7a android-25 16k" metadata: name: "DeepSpeech Android 7.1 ARMv7 Google Pixel C++ tests" description: "Testing DeepSpeech C++ for Android 7.1 ARMv7 Google Pixel, optimized version" diff --git a/taskcluster/test-cpp-armbian-arm64-opt.yml b/taskcluster/test-cpp-armbian-arm64-opt.yml deleted file mode 100644 index daa1e4c4..00000000 --- a/taskcluster/test-cpp-armbian-arm64-opt.yml +++ /dev/null @@ -1,10 +0,0 @@ -build: - template_file: test-armbian-opt-base.tyml - dependencies: - - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh" - metadata: - name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU C++ tests" - description: "Testing DeepSpeech C++ for ARMbian ARM64 Cortex-A53, CPU only, optimized version" diff --git a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml index 39fd800f..13a95924 100644 --- a/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml @@ -3,7 +3,7 @@ build: dependencies: - "linux-amd64-cpu-opt" args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests-prod.sh" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests-prod.sh 16k" metadata: name: "DeepSpeech Linux AMD64 CPU C++ prod tests" description: "Testing DeepSpeech C++ for Linux/AMD64 on prod model, CPU only, optimized version" diff --git a/taskcluster/test-cpp-raspbian-rpi3-opt.yml b/taskcluster/test-cpp-raspbian-rpi3-opt.yml deleted file mode 100644 index c90f72c1..00000000 --- a/taskcluster/test-cpp-raspbian-rpi3-opt.yml +++ /dev/null @@ -1,10 +0,0 @@ -build: - template_file: test-raspbian-opt-base.tyml - dependencies: - - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" - args: - 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_16k-armbian-arm64-opt.yml b/taskcluster/test-cpp_16k-armbian-arm64-opt.yml new file mode 100644 index 00000000..3b8246d6 --- /dev/null +++ b/taskcluster/test-cpp_16k-armbian-arm64-opt.yml @@ -0,0 +1,11 @@ +build: + template_file: test-armbian-opt-base.tyml + dependencies: + - "linux-arm64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k" + metadata: + name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU C++ tests (16kHz)" + description: "Testing DeepSpeech C++ for ARMbian ARM64 Cortex-A53, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-cpp-darwin-amd64-opt.yml b/taskcluster/test-cpp_16k-darwin-amd64-opt.yml similarity index 60% rename from taskcluster/test-cpp-darwin-amd64-opt.yml rename to taskcluster/test-cpp_16k-darwin-amd64-opt.yml index fc4af0d4..6bc20596 100644 --- a/taskcluster/test-cpp-darwin-amd64-opt.yml +++ b/taskcluster/test-cpp_16k-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k" metadata: - name: "DeepSpeech OSX AMD64 CPU C++ tests" - description: "Testing DeepSpeech C++ for OSX/AMD64, CPU only, optimized version" + name: "DeepSpeech OSX AMD64 CPU C++ tests (16kHz)" + description: "Testing DeepSpeech C++ for OSX/AMD64, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-cpp_16k-linux-amd64-opt.yml b/taskcluster/test-cpp_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..3d9f9810 --- /dev/null +++ b/taskcluster/test-cpp_16k-linux-amd64-opt.yml @@ -0,0 +1,11 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp-ds-tests.sh 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU C++ tests (16kHz)" + description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-cpp_16k-raspbian-rpi3-opt.yml b/taskcluster/test-cpp_16k-raspbian-rpi3-opt.yml new file mode 100644 index 00000000..1c0cf156 --- /dev/null +++ b/taskcluster/test-cpp_16k-raspbian-rpi3-opt.yml @@ -0,0 +1,11 @@ +build: + template_file: test-raspbian-opt-base.tyml + dependencies: + - "linux-rpi3-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-ds-tests.sh 16k" + metadata: + name: "DeepSpeech Raspbian RPi3/ARMv7 CPU C++ tests (16kHz)" + description: "Testing DeepSpeech C++ for Raspbian RPi3/ARMv7, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-cpp-win-amd64-opt.yml b/taskcluster/test-cpp_16k-win-amd64-opt.yml similarity index 50% rename from taskcluster/test-cpp-win-amd64-opt.yml rename to taskcluster/test-cpp_16k-win-amd64-opt.yml index 33629e07..7a2c89fb 100644 --- a/taskcluster/test-cpp-win-amd64-opt.yml +++ b/taskcluster/test-cpp_16k-win-amd64-opt.yml @@ -2,9 +2,10 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cppwin-ds-tests.sh" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cppwin-ds-tests.sh 16k" metadata: - name: "DeepSpeech Windows AMD64 CPU C++ tests" - description: "Testing DeepSpeech C++ for Windows/AMD64, CPU only, optimized version" + name: "DeepSpeech Windows AMD64 CPU C++ tests (16kHz)" + description: "Testing DeepSpeech C++ for Windows/AMD64, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-cpp_tflite-darwin-amd64-opt.yml b/taskcluster/test-cpp_16k_tflite-darwin-amd64-opt.yml similarity index 58% rename from taskcluster/test-cpp_tflite-darwin-amd64-opt.yml rename to taskcluster/test-cpp_16k_tflite-darwin-amd64-opt.yml index 8e27b1d6..44c362f8 100644 --- a/taskcluster/test-cpp_tflite-darwin-amd64-opt.yml +++ b/taskcluster/test-cpp_16k_tflite-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-tflite-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k" metadata: - name: "DeepSpeech OSX AMD64 TFlite C++ tests" - description: "Testing DeepSpeech C++ for OSX/AMD64, TFLite, optimized version" + name: "DeepSpeech OSX AMD64 TFlite C++ tests (16kHz)" + description: "Testing DeepSpeech C++ for OSX/AMD64, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml b/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml new file mode 100755 index 00000000..0faa46d4 --- /dev/null +++ b/taskcluster/test-cpp_16k_tflite-linux-amd64-opt.yml @@ -0,0 +1,11 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite C++ tests (16kHz)" + description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-cpp_16k_tflite-win-amd64-opt.yml b/taskcluster/test-cpp_16k_tflite-win-amd64-opt.yml new file mode 100644 index 00000000..15abcf3b --- /dev/null +++ b/taskcluster/test-cpp_16k_tflite-win-amd64-opt.yml @@ -0,0 +1,11 @@ +build: + template_file: test-win-opt-base.tyml + dependencies: + - "win-amd64-tflite-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + args: + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 16k" + metadata: + name: "DeepSpeech Windows AMD64 TFLite C++ tests (16kHz)" + description: "Testing DeepSpeech C++ for Windows/AMD64, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-cpp-linux-amd64-opt.yml b/taskcluster/test-cpp_8k-linux-amd64-opt.yml similarity index 52% rename from taskcluster/test-cpp-linux-amd64-opt.yml rename to taskcluster/test-cpp_8k-linux-amd64-opt.yml index 122c33bc..29e52fbc 100644 --- a/taskcluster/test-cpp-linux-amd64-opt.yml +++ b/taskcluster/test-cpp_8k-linux-amd64-opt.yml @@ -2,9 +2,10 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-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-ds-tests.sh 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU C++ tests" - description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU C++ tests (8kHz)" + description: "Testing DeepSpeech C++ for Linux/AMD64, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-cpp_tflite-linux-amd64-opt.yml b/taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml similarity index 50% rename from taskcluster/test-cpp_tflite-linux-amd64-opt.yml rename to taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml index 28462270..9a1acce8 100755 --- a/taskcluster/test-cpp_tflite-linux-amd64-opt.yml +++ b/taskcluster/test-cpp_8k_tflite-linux-amd64-opt.yml @@ -2,9 +2,10 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-tflite-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite_basic-ds-tests.sh 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite C++ tests" - description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite C++ tests (16kHz)" + description: "Testing DeepSpeech C++ for Linux/AMD64, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml index 3ddf7c9b..5ff4a6c6 100755 --- a/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-cpp_tflite-linux-amd64-prod-opt.yml @@ -3,7 +3,7 @@ build: dependencies: - "linux-amd64-tflite-opt" args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-tests-prod.sh" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-cpp_tflite-tests-prod.sh 16k" metadata: name: "DeepSpeech Linux AMD64 TFLite C++ prod tests" description: "Testing DeepSpeech C++ for Linux/AMD64 on prod model, TFLite, optimized version" diff --git a/taskcluster/test-cpp_tflite-win-amd64-opt.yml b/taskcluster/test-cpp_tflite-win-amd64-opt.yml deleted file mode 100644 index 02864bd3..00000000 --- a/taskcluster/test-cpp_tflite-win-amd64-opt.yml +++ /dev/null @@ -1,10 +0,0 @@ -build: - template_file: test-win-opt-base.tyml - dependencies: - - "win-amd64-tflite-opt" - - "test-training_upstream-linux-amd64-py36m-opt" - args: - 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-darwin-opt-base.tyml b/taskcluster/test-darwin-opt-base.tyml index 6206a22e..6f50fc63 100644 --- a/taskcluster/test-darwin-opt-base.tyml +++ b/taskcluster/test-darwin-opt-base.tyml @@ -34,7 +34,7 @@ then: env: $let: - training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") } + training: { $eval: as_slugid(build.test_model_task) } darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") } darwin_amd64_tflite: { $eval: as_slugid("darwin-amd64-tflite-opt") } in: diff --git a/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml index 7d7690d7..c1b020fb 100644 --- a/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml +++ b/taskcluster/test-electronjs_v3.1-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 16k" metadata: name: "DeepSpeech OSX AMD64 CPU ElectronJS v3.1 tests" description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v3.1, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml index 9b859a89..d48a245f 100644 --- a/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml +++ b/taskcluster/test-electronjs_v3.1-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_10} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 16k" metadata: name: "DeepSpeech Windows AMD64 CPU ElectronJS v3.1 tests" description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v3.1, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v3.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v3.1_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..e8b92a88 --- /dev/null +++ b/taskcluster/test-electronjs_v3.1_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v3.1 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v3.1, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v3.1_8k-linux-amd64-opt.yml similarity index 64% rename from taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml rename to taskcluster/test-electronjs_v3.1_8k-linux-amd64-opt.yml index 9f451581..a73200fd 100644 --- a/taskcluster/test-electronjs_v4.0-linux-amd64-opt.yml +++ b/taskcluster/test-electronjs_v3.1_8k-linux-amd64-opt.yml @@ -3,12 +3,13 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.0 tests" - description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.0, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU ElectronJS v3.1 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v3.1, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml index a37a2772..07195ce6 100644 --- a/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml +++ b/taskcluster/test-electronjs_v4.0-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 16k" metadata: name: "DeepSpeech OSX AMD64 CPU ElectronJS v4.0 tests" description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v4.0, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml index 6dd8d9dd..c124c031 100644 --- a/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml +++ b/taskcluster/test-electronjs_v4.0-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_10} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 16k" metadata: name: "DeepSpeech Windows AMD64 CPU ElectronJS v4.0 tests" description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v4.0, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v4.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.0_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..1e9935f3 --- /dev/null +++ b/taskcluster/test-electronjs_v4.0_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.0 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.0, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.0_8k-linux-amd64-opt.yml similarity index 65% rename from taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml rename to taskcluster/test-electronjs_v4.0_8k-linux-amd64-opt.yml index 9e64dd8c..74ae3943 100644 --- a/taskcluster/test-electronjs_v3.1-linux-amd64-opt.yml +++ b/taskcluster/test-electronjs_v4.0_8k-linux-amd64-opt.yml @@ -3,12 +3,13 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 3.1.11" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.0.3 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU ElectronJS v3.1 tests" - description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v3.1, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.0 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.0, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml index 1bef15c7..c211d146 100644 --- a/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml +++ b/taskcluster/test-electronjs_v4.1-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 16k" metadata: name: "DeepSpeech OSX AMD64 CPU ElectronJS v4.1 tests" description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v4.1, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml index 0bc4363f..0acc1f34 100644 --- a/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml +++ b/taskcluster/test-electronjs_v4.1-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_10} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 16k" metadata: name: "DeepSpeech Windows AMD64 CPU ElectronJS v4.1 tests" description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v4.1, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v4.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.1_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..8024e510 --- /dev/null +++ b/taskcluster/test-electronjs_v4.1_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.1 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.1, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.1_8k-linux-amd64-opt.yml similarity index 65% rename from taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml rename to taskcluster/test-electronjs_v4.1_8k-linux-amd64-opt.yml index ca434d92..00f6ac9a 100644 --- a/taskcluster/test-electronjs_v4.1-linux-amd64-opt.yml +++ b/taskcluster/test-electronjs_v4.1_8k-linux-amd64-opt.yml @@ -3,12 +3,13 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.1.5 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.1 tests" - description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.1, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.1 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.1, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml index 628fae3a..b58c2355 100644 --- a/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml +++ b/taskcluster/test-electronjs_v4.2-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 16k" metadata: name: "DeepSpeech OSX AMD64 CPU ElectronJS v4.2 tests" description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v4.2, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml b/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml index c668fe59..a3e15b61 100644 --- a/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml +++ b/taskcluster/test-electronjs_v4.2-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_10} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 16k" metadata: name: "DeepSpeech Windows AMD64 CPU ElectronJS v4.2 tests" description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v4.2, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v4.2_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.2_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..2f2346ea --- /dev/null +++ b/taskcluster/test-electronjs_v4.2_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.2 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.2, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml b/taskcluster/test-electronjs_v4.2_8k-linux-amd64-opt.yml similarity index 65% rename from taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml rename to taskcluster/test-electronjs_v4.2_8k-linux-amd64-opt.yml index 76a5239b..a5754dc7 100644 --- a/taskcluster/test-electronjs_v4.2-linux-amd64-opt.yml +++ b/taskcluster/test-electronjs_v4.2_8k-linux-amd64-opt.yml @@ -3,12 +3,13 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 10.x 4.2.5 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.2 tests" - description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.2, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU ElectronJS v4.2 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v4.2, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml index 48d0c0f9..911eaeaf 100644 --- a/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml +++ b/taskcluster/test-electronjs_v5.0-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k" metadata: name: "DeepSpeech OSX AMD64 CPU ElectronJS v5.0 tests" description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v5.0, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml index b8b102f5..dca60813 100644 --- a/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml +++ b/taskcluster/test-electronjs_v5.0-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_12} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k" metadata: name: "DeepSpeech Windows AMD64 CPU ElectronJS v5.0 tests" description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v5.0, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..eeee2228 --- /dev/null +++ b/taskcluster/test-electronjs_v5.0_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml similarity index 65% rename from taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml rename to taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml index 2328d041..f730719f 100644 --- a/taskcluster/test-electronjs_v5.0-linux-amd64-opt.yml +++ b/taskcluster/test-electronjs_v5.0_8k-linux-amd64-opt.yml @@ -3,12 +3,13 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 5.0.6 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests" - description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU ElectronJS v5.0 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v5.0, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml index 084280cf..02fee1c0 100644 --- a/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml +++ b/taskcluster/test-electronjs_v6.0-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 16k" metadata: name: "DeepSpeech OSX AMD64 CPU ElectronJS v6.0 tests" description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v6.0, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml index 8bc4d556..7219903e 100644 --- a/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml +++ b/taskcluster/test-electronjs_v6.0-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_12} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 16k" metadata: name: "DeepSpeech Windows AMD64 CPU ElectronJS v6.0 tests" description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v6.0, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..6638cc8e --- /dev/null +++ b/taskcluster/test-electronjs_v6.0_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml b/taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml similarity index 64% rename from taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml rename to taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml index 27a6a994..027c3fa2 100644 --- a/taskcluster/test-electronjs_v7.1-linux-amd64-opt.yml +++ b/taskcluster/test-electronjs_v6.0_8k-linux-amd64-opt.yml @@ -3,12 +3,13 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py35m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests" - description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml index 5fc12199..f28c5af1 100644 --- a/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml +++ b/taskcluster/test-electronjs_v7.0-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py35m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k" metadata: name: "DeepSpeech OSX AMD64 CPU ElectronJS v7.0 tests" description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v7.0, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml b/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml index a9fa5b7f..e0a8ccbe 100644 --- a/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml +++ b/taskcluster/test-electronjs_v7.0-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py35m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_12} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k" metadata: name: "DeepSpeech Windows AMD64 CPU ElectronJS v7.0 tests" description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v7.0, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..c058ef71 --- /dev/null +++ b/taskcluster/test-electronjs_v7.0_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml similarity index 65% rename from taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml rename to taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml index 1d1c8fad..b20971c2 100644 --- a/taskcluster/test-electronjs_v6.0-linux-amd64-opt.yml +++ b/taskcluster/test-electronjs_v7.0_8k-linux-amd64-opt.yml @@ -3,12 +3,13 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 6.0.11" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU ElectronJS v6.0 tests" - description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v6.0, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml b/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml index 1d876489..d0a29a07 100644 --- a/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml +++ b/taskcluster/test-electronjs_v7.1-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py35m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 16k" metadata: name: "DeepSpeech OSX AMD64 CPU ElectronJS v7.1 tests" description: "Testing DeepSpeech for OSX/AMD64 on ElectronJS v7.1, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml b/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml index 72e0cad0..da3c5586 100644 --- a/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml +++ b/taskcluster/test-electronjs_v7.1-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py35m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_12} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 16k" metadata: name: "DeepSpeech Windows AMD64 CPU ElectronJS v7.1 tests" description: "Testing DeepSpeech for Windows/AMD64 on ElectronJS v7.1, CPU only, optimized version" diff --git a/taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..4bd254df --- /dev/null +++ b/taskcluster/test-electronjs_v7.1_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml b/taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml similarity index 65% rename from taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml rename to taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml index f04c7f1b..da038090 100644 --- a/taskcluster/test-electronjs_v7.0-linux-amd64-opt.yml +++ b/taskcluster/test-electronjs_v7.1_8k-linux-amd64-opt.yml @@ -3,12 +3,13 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py35m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} ${electronjs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.0.1" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-electron-tests.sh 12.x 7.1.2 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.0 tests" - description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.0, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU ElectronJS v7.1 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on ElectronJS v7.1, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-linux-opt-base.tyml b/taskcluster/test-linux-opt-base.tyml index f3de6fc9..89f02c31 100644 --- a/taskcluster/test-linux-opt-base.tyml +++ b/taskcluster/test-linux-opt-base.tyml @@ -31,7 +31,7 @@ then: env: $let: - training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") } + training: { $eval: as_slugid(build.test_model_task) } linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") } linux_amd64_tflite: { $eval: as_slugid("linux-amd64-tflite-opt") } linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") } diff --git a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml index 62d7d8d5..b10337f9 100644 --- a/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml +++ b/taskcluster/test-lite_benchmark_model-linux-amd64-opt.yml @@ -1,7 +1,8 @@ build: template_file: test-linux-opt-base.tyml dependencies: - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-lite_benchmark_model-ds-tests.sh" benchmark_model_bin: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r1.14.e77504ac6b941fd2af495b49a0bcd56f25ca0e1e.cpu/artifacts/public/lite_benchmark_model" diff --git a/taskcluster/test-netframework-win-amd64-opt.yml b/taskcluster/test-netframework-win-amd64-opt.yml index 6f116ef0..df789683 100644 --- a/taskcluster/test-netframework-win-amd64-opt.yml +++ b/taskcluster/test-netframework-win-amd64-opt.yml @@ -2,9 +2,10 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-netframework-ds-tests.sh" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-netframework-ds-tests.sh 16k" metadata: name: "DeepSpeech Windows AMD64 CPU .Net Framework tests" description: "Testing DeepSpeech .Net Framework for Windows/AMD64, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml index 26f6370c..363acc98 100644 --- a/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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-tests.sh 10.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 10.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v10.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml index 9142b2b3..028655ff 100644 --- a/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_10x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_10} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 10.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v10.x, 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 105645a7..d1867591 100644 --- a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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_tflite-tests.sh 10.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 10.x 16k" 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_10x-win-amd64-opt.yml b/taskcluster/test-nodejs_10x-win-amd64-opt.yml index 9f69677b..b1b03b0d 100644 --- a/taskcluster/test-nodejs_10x-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_10x-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_10} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS 10.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v10.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..f5a6bba6 --- /dev/null +++ b/taskcluster/test-nodejs_10x_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_10x-linux-amd64-opt.yml b/taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_10x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml index 58c18ea3..b0ba032e 100644 --- a/taskcluster/test-nodejs_10x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_10x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -3,12 +3,11 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.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-tests-prod.sh 10.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..084d1a4e --- /dev/null +++ b/taskcluster/test-nodejs_10x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,13 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..d8e572a8 --- /dev/null +++ b/taskcluster/test-nodejs_10x_8k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 73% rename from taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml index 27546de4..d243a8bf 100644 --- a/taskcluster/test-nodejs_10x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_10x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 10.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 10.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_10x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml similarity index 72% rename from taskcluster/test-nodejs_10x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml index f5bddcdc..caf92571 100644 --- a/taskcluster/test-nodejs_10x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_10x_8k_tflite-linux-amd64-prod-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_xenial.prep_10} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 10.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 10.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v10.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml index 40f69c1d..0cc9a1b1 100644 --- a/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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-tests.sh 11.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 11.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v11.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml index 7be86b9e..900f9b1e 100644 --- a/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_11x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_11} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 11.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v11.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 bb539555..570f1300 100644 --- a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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_tflite-tests.sh 11.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 11.x 16k" 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_11x-win-amd64-opt.yml b/taskcluster/test-nodejs_11x-win-amd64-opt.yml index 6e0e6869..049609a9 100644 --- a/taskcluster/test-nodejs_11x-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_11x-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_11} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS 11.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v11.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..c737f973 --- /dev/null +++ b/taskcluster/test-nodejs_11x_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_11x-linux-amd64-opt.yml b/taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_11x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml index ab276400..e4aa5133 100644 --- a/taskcluster/test-nodejs_11x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_11x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -3,12 +3,11 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.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-tests-prod.sh 11.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..d3828c29 --- /dev/null +++ b/taskcluster/test-nodejs_11x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,13 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 11.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 11.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..caf87066 --- /dev/null +++ b/taskcluster/test-nodejs_11x_8k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 73% rename from taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml index 27e7fe0e..ae9a56e2 100644 --- a/taskcluster/test-nodejs_11x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_11x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 11.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 11.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 11.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_11x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml similarity index 72% rename from taskcluster/test-nodejs_11x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml index a2395458..30400533 100644 --- a/taskcluster/test-nodejs_11x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_11x_8k_tflite-linux-amd64-prod-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_xenial.prep_11} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 11.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 11.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 11.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 11.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v11.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml index 09b8e7fd..d311e82f 100644 --- a/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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-tests.sh 12.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 12.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v12.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml index a7ee6457..c00c22f1 100644 --- a/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_12x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_12} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 12.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v12.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 136ab5c2..f49dceac 100644 --- a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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_tflite-tests.sh 12.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 12.x 16k" 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_12x-win-amd64-opt.yml b/taskcluster/test-nodejs_12x-win-amd64-opt.yml index cc1b84b5..12baaa17 100644 --- a/taskcluster/test-nodejs_12x-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_12x-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_12} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS 12.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v12.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..70dccd10 --- /dev/null +++ b/taskcluster/test-nodejs_12x_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_12x-linux-amd64-opt.yml b/taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_12x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml index df7255b5..2fde9023 100644 --- a/taskcluster/test-nodejs_12x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_12x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -3,12 +3,11 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.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-tests-prod.sh 12.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..7fab7c58 --- /dev/null +++ b/taskcluster/test-nodejs_12x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,13 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 12.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 12.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..02226e4f --- /dev/null +++ b/taskcluster/test-nodejs_12x_8k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 73% rename from taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml index 97013655..cee53070 100644 --- a/taskcluster/test-nodejs_12x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_12x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 12.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 12.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 12.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_12x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml similarity index 72% rename from taskcluster/test-nodejs_12x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml index 9f9543f6..782b189a 100644 --- a/taskcluster/test-nodejs_12x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_12x_8k_tflite-linux-amd64-prod-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_xenial.prep_12} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 12.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 12.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 12.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 12.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v12.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml index 17729c25..bad38447 100644 --- a/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_13x-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_buster.prep_13} && ${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 13.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 13.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v13.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml index 5558cff1..2c675613 100644 --- a/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_13x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_13} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 13.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v13.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml index 55b47274..37a6a7ec 100644 --- a/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_13x-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_buster.prep_13} && ${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_tflite-tests.sh 13.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 13.x 16k" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 13.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v13.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_13x-win-amd64-opt.yml b/taskcluster/test-nodejs_13x-win-amd64-opt.yml index 56164dbe..b40d8904 100644 --- a/taskcluster/test-nodejs_13x-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_13x-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_13} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS 13.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v13.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..d5247f8d --- /dev/null +++ b/taskcluster/test-nodejs_13x_16k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_13x-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_13x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml index fb581065..ceb5ac8e 100644 --- a/taskcluster/test-nodejs_13x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_13x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -3,12 +3,11 @@ build: docker_image: "ubuntu:16.04" dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml new file mode 100644 index 00000000..d16b502a --- /dev/null +++ b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "node-package-cpu" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml similarity index 77% rename from taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml rename to taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml index ee1b0315..e1829499 100644 --- a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_13x_16k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml @@ -3,12 +3,11 @@ build: docker_image: "ubuntu:16.04" dependencies: - "node-package-cpu" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..761aad35 --- /dev/null +++ b/taskcluster/test-nodejs_13x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,13 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 13.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 13.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..ef2536ac --- /dev/null +++ b/taskcluster/test-nodejs_13x_8k-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 73% rename from taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml index b0b02e9c..73578a55 100644 --- a/taskcluster/test-nodejs_13x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_13x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 13.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml new file mode 100644 index 00000000..a5adcb77 --- /dev/null +++ b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-opt.yml @@ -0,0 +1,15 @@ +build: + template_file: test-linux-opt-base.tyml + docker_image: "ubuntu:16.04" + dependencies: + - "node-package-cpu" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml similarity index 89% rename from taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml index 6089b016..3f66bdaa 100644 --- a/taskcluster/test-nodejs_13x_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_13x_8k_multiarchpkg-linux-amd64-prod_pbmodel-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 13.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS MultiArch Package 13.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS MultiArch Package v13.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_13x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml similarity index 72% rename from taskcluster/test-nodejs_13x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml index d32a7f95..8689522a 100644 --- a/taskcluster/test-nodejs_13x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_13x_8k_tflite-linux-amd64-prod-opt.yml @@ -7,7 +7,7 @@ build: > ${nodejs.packages_xenial.prep_13} && ${nodejs.packages_xenial.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_xenial.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 13.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 13.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 13.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 13.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v13.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml index fdda9b79..44eb0722 100644 --- a/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_13x_multiarchpkg-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "node-package-cpu" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_buster.prep_13} && ${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 13.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS MultiArch Package 13.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS MultiArch Package v13.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml index 9f65a700..729d329d 100644 --- a/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_13x_multiarchpkg-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "node-package-cpu" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_13} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS MultiArch Package 13.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml index 5f259faa..c88bf2ac 100644 --- a/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_13x_multiarchpkg-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "node-package-cpu" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_buster.prep_13} && ${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_tflite-tests.sh 13.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 13.x 16k" metadata: name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS MultiArch Package 13.x tests" description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS MultiArch Package v13.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml b/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml index 52ed8ecb..f7822560 100644 --- a/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_13x_multiarchpkg-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "node-package-cpu" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_13} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 13.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS MultiArch Package 13.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS MultiArch Package v13.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml index c505d33f..7d9f795c 100644 --- a/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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-tests.sh 4.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 4.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v4.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml index d27cdd00..bf438e4d 100644 --- a/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_4x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_4} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 4.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v4.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 8e587ef5..ff0053ef 100644 --- a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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_tflite-tests.sh 4.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 4.x 16k" 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_4x-win-amd64-opt.yml b/taskcluster/test-nodejs_4x-win-amd64-opt.yml index ce98586f..7f03b8f9 100644 --- a/taskcluster/test-nodejs_4x-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_4x-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_4} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS 4.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v4.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_4x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..dfb7a9bf --- /dev/null +++ b/taskcluster/test-nodejs_4x_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 71% rename from taskcluster/test-nodejs_4x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_4x_16k-linux-amd64-prod_pbmodel-opt.yml index 2fb698b8..81994ca7 100644 --- a/taskcluster/test-nodejs_4x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_4x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -2,12 +2,11 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.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-tests-prod.sh 4.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_4x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_4x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..1f31ea0b --- /dev/null +++ b/taskcluster/test-nodejs_4x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 4.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 4.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_4x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_4x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..78e4f1e2 --- /dev/null +++ b/taskcluster/test-nodejs_4x_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_4x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_4x_8k-linux-amd64-prod_pbmodel-opt.yml index 96cb2a4b..29814b39 100644 --- a/taskcluster/test-nodejs_4x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_4x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 4.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 4.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 4.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_4x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_4x_8k_tflite-linux-amd64-prod-opt.yml similarity index 71% rename from taskcluster/test-nodejs_4x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_4x_8k_tflite-linux-amd64-prod-opt.yml index 34f7f323..86af2d16 100644 --- a/taskcluster/test-nodejs_4x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_4x_8k_tflite-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_4} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 4.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 4.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 4.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 4.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v4.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml index 1871888f..f1203f47 100644 --- a/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_5x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_5} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 5.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v5.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_5x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..52a247d3 --- /dev/null +++ b/taskcluster/test-nodejs_5x_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 71% rename from taskcluster/test-nodejs_5x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_5x_16k-linux-amd64-prod_pbmodel-opt.yml index 8ce05024..7f467317 100644 --- a/taskcluster/test-nodejs_5x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_5x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -2,12 +2,11 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 5.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_5x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_5x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..ae9069e1 --- /dev/null +++ b/taskcluster/test-nodejs_5x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 5.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 5.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_5x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_5x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..efb74db3 --- /dev/null +++ b/taskcluster/test-nodejs_5x_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_5x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_5x_8k-linux-amd64-prod_pbmodel-opt.yml index c6353ef9..33279c3b 100644 --- a/taskcluster/test-nodejs_5x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_5x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 5.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 5.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 5.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_5x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_5x_8k_tflite-linux-amd64-prod-opt.yml similarity index 71% rename from taskcluster/test-nodejs_5x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_5x_8k_tflite-linux-amd64-prod-opt.yml index e566f3b7..bc40ba80 100644 --- a/taskcluster/test-nodejs_5x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_5x_8k_tflite-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_5} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 5.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 5.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 5.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 5.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v5.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml index 7dede288..f55ccd87 100644 --- a/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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-tests.sh 6.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 6.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v6.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml index 3bf7a049..8ea10f73 100644 --- a/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_6x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_6} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 6.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v6.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 cd422ed4..ad1f71e9 100644 --- a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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_tflite-tests.sh 6.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 6.x 16k" 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_6x-win-amd64-opt.yml b/taskcluster/test-nodejs_6x-win-amd64-opt.yml index 20124be4..deb7d3b0 100644 --- a/taskcluster/test-nodejs_6x-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_6x-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_6} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS 6.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v6.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_6x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..35ef16a2 --- /dev/null +++ b/taskcluster/test-nodejs_6x_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 71% rename from taskcluster/test-nodejs_6x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_6x_16k-linux-amd64-prod_pbmodel-opt.yml index 6d3b5cef..c1e0c788 100644 --- a/taskcluster/test-nodejs_6x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_6x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -2,12 +2,11 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.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-tests-prod.sh 6.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_6x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_6x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..9d25816a --- /dev/null +++ b/taskcluster/test-nodejs_6x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 6.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 6.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_6x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_6x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..6d3cb252 --- /dev/null +++ b/taskcluster/test-nodejs_6x_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_6x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_6x_8k-linux-amd64-prod_pbmodel-opt.yml index 70ab2539..a81f592f 100644 --- a/taskcluster/test-nodejs_6x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_6x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 6.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 6.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 6.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_6x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_6x_8k_tflite-linux-amd64-prod-opt.yml similarity index 71% rename from taskcluster/test-nodejs_6x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_6x_8k_tflite-linux-amd64-prod-opt.yml index 45fad3ec..91f6f330 100644 --- a/taskcluster/test-nodejs_6x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_6x_8k_tflite-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_6} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 6.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 6.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 6.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 6.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v6.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml index ec565d5d..74e4d101 100644 --- a/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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-tests.sh 7.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 7.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v7.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml index e03494d2..318527ac 100644 --- a/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_7x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_7} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 7.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v7.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 0a9856bc..780e713f 100644 --- a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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_tflite-tests.sh 7.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 7.x 16k" 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_7x-win-amd64-opt.yml b/taskcluster/test-nodejs_7x-win-amd64-opt.yml index b9cf1be9..d4b57a6e 100644 --- a/taskcluster/test-nodejs_7x-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_7x-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_7} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS 7.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v7.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_7x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..cf81e4d5 --- /dev/null +++ b/taskcluster/test-nodejs_7x_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 71% rename from taskcluster/test-nodejs_7x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_7x_16k-linux-amd64-prod_pbmodel-opt.yml index c473cf80..11bb3136 100644 --- a/taskcluster/test-nodejs_7x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_7x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -2,12 +2,11 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.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-tests-prod.sh 7.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_7x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_7x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..71f65ffb --- /dev/null +++ b/taskcluster/test-nodejs_7x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 7.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 7.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_7x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_7x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..bdeb23cf --- /dev/null +++ b/taskcluster/test-nodejs_7x_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_7x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_7x_8k-linux-amd64-prod_pbmodel-opt.yml index 84cbcdf0..a57dff92 100644 --- a/taskcluster/test-nodejs_7x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_7x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 7.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 7.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 7.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_7x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_7x_8k_tflite-linux-amd64-prod-opt.yml similarity index 71% rename from taskcluster/test-nodejs_7x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_7x_8k_tflite-linux-amd64-prod-opt.yml index fde875cd..c3ec1b2b 100644 --- a/taskcluster/test-nodejs_7x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_7x_8k_tflite-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_7} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 7.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 7.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 7.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 7.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v7.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml index 446fc3c0..f94eeb85 100644 --- a/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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-tests.sh 8.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 8.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v8.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml index ccd77ef5..1fdbb011 100644 --- a/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_8x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_8} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 8.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v8.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 1d9ed4ce..ddf759c9 100644 --- a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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_tflite-tests.sh 8.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 8.x 16k" 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_8x-win-amd64-opt.yml b/taskcluster/test-nodejs_8x-win-amd64-opt.yml index 61083841..07bbe67e 100644 --- a/taskcluster/test-nodejs_8x-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_8x-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_8} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS 8.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v8.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_8x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..95bfa9bd --- /dev/null +++ b/taskcluster/test-nodejs_8x_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 71% rename from taskcluster/test-nodejs_8x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_8x_16k-linux-amd64-prod_pbmodel-opt.yml index c1b06aa3..892de8da 100644 --- a/taskcluster/test-nodejs_8x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_8x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -2,12 +2,11 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.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-tests-prod.sh 8.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_8x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_8x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..a3b45eb3 --- /dev/null +++ b/taskcluster/test-nodejs_8x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 8.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 8.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_8x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_8x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..0bb30d11 --- /dev/null +++ b/taskcluster/test-nodejs_8x_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_8x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_8x_8k-linux-amd64-prod_pbmodel-opt.yml index 72e9473e..beb8735d 100644 --- a/taskcluster/test-nodejs_8x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_8x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 8.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 8.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 8.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_8x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_8x_8k_tflite-linux-amd64-prod-opt.yml similarity index 71% rename from taskcluster/test-nodejs_8x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_8x_8k_tflite-linux-amd64-prod-opt.yml index a006ed5f..c648e1c5 100644 --- a/taskcluster/test-nodejs_8x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_8x_8k_tflite-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_8} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 8.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 8.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 8.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 8.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v8.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml index 98510059..00fa2109 100644 --- a/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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-tests.sh 9.x 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 9.x tests" description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v9.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml index 858c8aae..d7009cb5 100644 --- a/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml +++ b/taskcluster/test-nodejs_9x-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${nodejs.brew.setup} && ${nodejs.brew.prep_9} && ${nodejs.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x 16k" metadata: name: "DeepSpeech OSX AMD64 CPU NodeJS 9.x tests" description: "Testing DeepSpeech for OSX/AMD64 on NodeJS v9.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 d539fe0b..d8f9e098 100644 --- a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${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_tflite-tests.sh 9.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests.sh 9.x 16k" 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-nodejs_9x-win-amd64-opt.yml b/taskcluster/test-nodejs_9x-win-amd64-opt.yml index 872140f7..88e27352 100644 --- a/taskcluster/test-nodejs_9x-win-amd64-opt.yml +++ b/taskcluster/test-nodejs_9x-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} && ${nodejs.win.prep_9} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x 16k" metadata: name: "DeepSpeech Windows AMD64 CPU NodeJS 9.x tests" description: "Testing DeepSpeech for Windows/AMD64 on NodeJS v9.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_9x_16k-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..314147fc --- /dev/null +++ b/taskcluster/test-nodejs_9x_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 71% rename from taskcluster/test-nodejs_9x-linux-amd64-opt.yml rename to taskcluster/test-nodejs_9x_16k-linux-amd64-prod_pbmodel-opt.yml index 1a05ee2c..ad47ce14 100644 --- a/taskcluster/test-nodejs_9x-linux-amd64-opt.yml +++ b/taskcluster/test-nodejs_9x_16k-linux-amd64-prod_pbmodel-opt.yml @@ -2,12 +2,11 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.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-tests-prod.sh 9.x 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_9x_16k_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_9x_16k_tflite-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..b3c4dcc9 --- /dev/null +++ b/taskcluster/test-nodejs_9x_16k_tflite-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 9.x 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite NodeJS 9.x prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-nodejs_9x_8k-linux-amd64-opt.yml b/taskcluster/test-nodejs_9x_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..0e560338 --- /dev/null +++ b/taskcluster/test-nodejs_9x_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-nodejs_9x_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 72% rename from taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-nodejs_9x_8k-linux-amd64-prod_pbmodel-opt.yml index 5e37ed18..1ee55532 100644 --- a/taskcluster/test-nodejs_9x-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-nodejs_9x_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 9.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests-prod.sh 9.x 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU NodeJS 9.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-nodejs_9x_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-nodejs_9x_8k_tflite-linux-amd64-prod-opt.yml similarity index 71% rename from taskcluster/test-nodejs_9x_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-nodejs_9x_8k_tflite-linux-amd64-prod-opt.yml index 63479024..c8bda556 100644 --- a/taskcluster/test-nodejs_9x_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-nodejs_9x_8k_tflite-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > ${nodejs.packages_trusty.prep_9} && ${nodejs.packages_trusty.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 9.x" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node_tflite-tests-prod.sh 9.x 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite NodeJS 9.x prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite NodeJS 9.x prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on NodeJS v9.x on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-python_27m-darwin-amd64-opt.yml b/taskcluster/test-python_27m-darwin-amd64-opt.yml index 53cf9b6e..f4182aac 100644 --- a/taskcluster/test-python_27m-darwin-amd64-opt.yml +++ b/taskcluster/test-python_27m-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${python.brew.setup} && ${python.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m 16k" metadata: name: "DeepSpeech OSX AMD64 CPU Python v2.7 m tests" description: "Testing DeepSpeech for OSX/AMD64 on Python v2.7 m, CPU only, optimized version" diff --git a/taskcluster/test-python_27m_16k-linux-amd64-opt.yml b/taskcluster/test-python_27m_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..b6898e1c --- /dev/null +++ b/taskcluster/test-python_27m_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v2.7 m tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml new file mode 100644 index 00000000..94caf55e --- /dev/null +++ b/taskcluster/test-python_27m_16k-linux-amd64-prod_pbmodel-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v2.7 m prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27m_8k-linux-amd64-opt.yml b/taskcluster/test-python_27m_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..be082a27 --- /dev/null +++ b/taskcluster/test-python_27m_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v2.7 m tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml new file mode 100644 index 00000000..c49f1dd3 --- /dev/null +++ b/taskcluster/test-python_27m_8k-linux-amd64-prod_pbmodel-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:m 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v2.7 m prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..b9479703 --- /dev/null +++ b/taskcluster/test-python_27m_tflite_16k-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite Python v2.7 m prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-python_27m_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml similarity index 77% rename from taskcluster/test-python_27m_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml index eea77ff4..92c250ca 100644 --- a/taskcluster/test-python_27m_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-python_27m_tflite_8k-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:m 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v2.7 m prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite Python v2.7 m prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml b/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..dfbf991e --- /dev/null +++ b/taskcluster/test-python_27mu_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:mu 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml new file mode 100644 index 00000000..ac553668 --- /dev/null +++ b/taskcluster/test-python_27mu_16k-linux-amd64-prod_pbmodel-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:mu 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml b/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..a346c71f --- /dev/null +++ b/taskcluster/test-python_27mu_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:mu 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml new file mode 100644 index 00000000..c584fddc --- /dev/null +++ b/taskcluster/test-python_27mu_8k-linux-amd64-prod_pbmodel-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:mu 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..275e45a9 --- /dev/null +++ b/taskcluster/test-python_27mu_tflite_16k-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:mu 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite Python v2.7 mu prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-python_27mu_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml similarity index 76% rename from taskcluster/test-python_27mu_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml index 022b0650..c22dbfb7 100644 --- a/taskcluster/test-python_27mu_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-python_27mu_tflite_8k-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:mu" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 2.7.14:mu 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v2.7 mu prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite Python v2.7 mu prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-python_35-darwin-amd64-opt.yml b/taskcluster/test-python_35-darwin-amd64-opt.yml index a7350d1d..335bc732 100644 --- a/taskcluster/test-python_35-darwin-amd64-opt.yml +++ b/taskcluster/test-python_35-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${python.brew.setup} && ${python.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m 16k" metadata: name: "DeepSpeech OSX AMD64 CPU Python v3.5 tests" description: "Testing DeepSpeech for OSX/AMD64 on Python v3.5, CPU only, optimized version" diff --git a/taskcluster/test-python_35-linux-amd64-opt.yml b/taskcluster/test-python_35-linux-amd64-opt.yml deleted file mode 100644 index 088bf6f3..00000000 --- a/taskcluster/test-python_35-linux-amd64-opt.yml +++ /dev/null @@ -1,13 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v3.5 tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5, CPU only, optimized version" diff --git a/taskcluster/test-python_35-win-amd64-opt.yml b/taskcluster/test-python_35-win-amd64-opt.yml index 17f1afb7..f5a0831f 100644 --- a/taskcluster/test-python_35-win-amd64-opt.yml +++ b/taskcluster/test-python_35-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.4:m" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.4:m 16k" metadata: name: "DeepSpeech Windows AMD64 CPU Python v3.5 tests" description: "Testing DeepSpeech for Windows/AMD64 on Python v3.5, CPU only, optimized version" diff --git a/taskcluster/test-python_35_16k-linux-amd64-opt.yml b/taskcluster/test-python_35_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..80a32631 --- /dev/null +++ b/taskcluster/test-python_35_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v3.5 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml new file mode 100644 index 00000000..c77056e8 --- /dev/null +++ b/taskcluster/test-python_35_16k-linux-amd64-prod_pbmodel-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.5.5:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v3.5 prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27mu-linux-amd64-opt.yml b/taskcluster/test-python_35_8k-linux-amd64-opt.yml similarity index 56% rename from taskcluster/test-python_27mu-linux-amd64-opt.yml rename to taskcluster/test-python_35_8k-linux-amd64-opt.yml index 85ca31e0..02328919 100644 --- a/taskcluster/test-python_27mu-linux-amd64-opt.yml +++ b/taskcluster/test-python_35_8k-linux-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:mu" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU Python v3.5 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_27m-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 65% rename from taskcluster/test-python_27m-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml index a342539d..8030801f 100644 --- a/taskcluster/test-python_27m-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-python_35_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.5.5:m 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 m prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU Python v3.5 prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..c10f02fa --- /dev/null +++ b/taskcluster/test-python_35_tflite_16k-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.5.5:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite Python v3.5 prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-python_37_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml similarity index 65% rename from taskcluster/test-python_37_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml index 4c527b32..82011dab 100644 --- a/taskcluster/test-python_37_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-python_35_tflite_8k-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.7.0:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.5.5:m 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v3.7 prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite Python v3.5 prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-python_36-darwin-amd64-opt.yml b/taskcluster/test-python_36-darwin-amd64-opt.yml index eaab5d27..a59bfdfe 100644 --- a/taskcluster/test-python_36-darwin-amd64-opt.yml +++ b/taskcluster/test-python_36-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${python.brew.setup} && ${python.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m 16k" metadata: name: "DeepSpeech OSX AMD64 CPU Python v3.6 tests" description: "Testing DeepSpeech for OSX/AMD64 on Python v3.6.4:m, CPU only, optimized version" diff --git a/taskcluster/test-python_36-win-amd64-opt.yml b/taskcluster/test-python_36-win-amd64-opt.yml index 3fad9f89..15c485ca 100644 --- a/taskcluster/test-python_36-win-amd64-opt.yml +++ b/taskcluster/test-python_36-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.7:m" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.7:m 16k" metadata: name: "DeepSpeech Windows AMD64 CPU Python v3.6 tests" description: "Testing DeepSpeech for Windows/AMD64 on Python v3.6, CPU only, optimized version" diff --git a/taskcluster/test-python_36_16k-linux-amd64-opt.yml b/taskcluster/test-python_36_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..67a7f566 --- /dev/null +++ b/taskcluster/test-python_36_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_36-linux-amd64-opt.yml b/taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 64% rename from taskcluster/test-python_36-linux-amd64-opt.yml rename to taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml index 2a6c1774..44353fab 100644 --- a/taskcluster/test-python_36-linux-amd64-opt.yml +++ b/taskcluster/test-python_36_16k-linux-amd64-prod_pbmodel-opt.yml @@ -2,12 +2,11 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" system_setup: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.6.4:m 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU Python v3.6 prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_36_8k-linux-amd64-opt.yml b/taskcluster/test-python_36_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..d047a71c --- /dev/null +++ b/taskcluster/test-python_36_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.6.4:m 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v3.6 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 66% rename from taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml index 534b7831..6ea4b41b 100644 --- a/taskcluster/test-python_36-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-python_36_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.6.4:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.6.4:m 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU Python v3.6 prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU Python v3.6 prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..c002707c --- /dev/null +++ b/taskcluster/test-python_36_tflite_16k-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.6.4:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite Python v3.6 prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-python_36_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml similarity index 65% rename from taskcluster/test-python_36_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml index 55eb01c6..3f90116b 100644 --- a/taskcluster/test-python_36_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-python_36_tflite_8k-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.6.4:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.6.4:m 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v3.6 prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite Python v3.6 prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.6 on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-python_37-darwin-amd64-opt.yml b/taskcluster/test-python_37-darwin-amd64-opt.yml index 91ff9a14..d556ca69 100644 --- a/taskcluster/test-python_37-darwin-amd64-opt.yml +++ b/taskcluster/test-python_37-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${python.brew.setup} && ${python.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m 16k" metadata: name: "DeepSpeech OSX AMD64 CPU Python v3.7 tests" description: "Testing DeepSpeech for OSX/AMD64 on Python v3.7.0:m, CPU only, optimized version" diff --git a/taskcluster/test-python_37-linux-amd64-opt.yml b/taskcluster/test-python_37-linux-amd64-opt.yml deleted file mode 100644 index 3d39f2ed..00000000 --- a/taskcluster/test-python_37-linux-amd64-opt.yml +++ /dev/null @@ -1,13 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v3.7 tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7, CPU only, optimized version" diff --git a/taskcluster/test-python_37-win-amd64-opt.yml b/taskcluster/test-python_37-win-amd64-opt.yml index 527870ec..1bc23335 100644 --- a/taskcluster/test-python_37-win-amd64-opt.yml +++ b/taskcluster/test-python_37-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.1:m" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.1:m 16k" metadata: name: "DeepSpeech Windows AMD64 CPU Python v3.7 tests" description: "Testing DeepSpeech for Windows/AMD64 on Python v3.7, CPU only, optimized version" diff --git a/taskcluster/test-python_37_16k-linux-amd64-opt.yml b/taskcluster/test-python_37_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..9c3cf9c2 --- /dev/null +++ b/taskcluster/test-python_37_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v3.7 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml new file mode 100644 index 00000000..2876396b --- /dev/null +++ b/taskcluster/test-python_37_16k-linux-amd64-prod_pbmodel-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.7.0:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v3.7 prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_37_8k-linux-amd64-opt.yml b/taskcluster/test-python_37_8k-linux-amd64-opt.yml new file mode 100644 index 00000000..42afe77b --- /dev/null +++ b/taskcluster/test-python_37_8k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.0:m 8k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v3.7 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_37-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 65% rename from taskcluster/test-python_37-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml index 72f827d6..3a3971e7 100644 --- a/taskcluster/test-python_37-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-python_37_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.7.0:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.7.0:m 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU Python v3.7 prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU Python v3.7 prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..30c90339 --- /dev/null +++ b/taskcluster/test-python_37_tflite_16k-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.7.0:m 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite Python v3.7 prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml b/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..d32a8623 --- /dev/null +++ b/taskcluster/test-python_37_tflite_8k-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.7.0:m 8k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite Python v3.7 prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.7 on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-python_37m-armbian-arm64-opt.yml b/taskcluster/test-python_37m-armbian-arm64-opt.yml index da6fbf02..5b990c86 100644 --- a/taskcluster/test-python_37m-armbian-arm64-opt.yml +++ b/taskcluster/test-python_37m-armbian-arm64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-armbian-opt-base.tyml dependencies: - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > 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-tests.sh 3.7.3:m 16k" metadata: name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU Python v3.7 tests" description: "Testing DeepSpeech for ARMbian ARM64 Cortex-A53 on Python v3.7, 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 38924697..7f898627 100644 --- a/taskcluster/test-python_37m-raspbian-rpi3-opt.yml +++ b/taskcluster/test-python_37m-raspbian-rpi3-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-raspbian-opt-base.tyml dependencies: - "linux-rpi3-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > apt-get -qq -y install ${python.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests.sh 3.7.3:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests.sh 3.7.3:m 16k" 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-python_38-darwin-amd64-opt.yml b/taskcluster/test-python_38-darwin-amd64-opt.yml index b1ba8110..242e4f28 100644 --- a/taskcluster/test-python_38-darwin-amd64-opt.yml +++ b/taskcluster/test-python_38-darwin-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-darwin-opt-base.tyml dependencies: - "darwin-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${python.brew.setup} && ${python.brew.env} args: - tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0:" + tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0: 16k" metadata: name: "DeepSpeech OSX AMD64 CPU Python v3.8 tests" description: "Testing DeepSpeech for OSX/AMD64 on Python v3.8.0:m, CPU only, optimized version" diff --git a/taskcluster/test-python_38-linux-amd64-opt.yml b/taskcluster/test-python_38-linux-amd64-opt.yml deleted file mode 100644 index 6cb41e85..00000000 --- a/taskcluster/test-python_38-linux-amd64-opt.yml +++ /dev/null @@ -1,13 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0:" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v3.8 tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8, CPU only, optimized version" diff --git a/taskcluster/test-python_38-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_38-linux-amd64-prod_pbmodel-opt.yml deleted file mode 100644 index 1b767056..00000000 --- a/taskcluster/test-python_38-linux-amd64-prod_pbmodel-opt.yml +++ /dev/null @@ -1,12 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-cpu-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.8.0:" - metadata: - name: "DeepSpeech Linux AMD64 CPU Python v3.8 prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, CPU only, optimized version" diff --git a/taskcluster/test-python_38-win-amd64-opt.yml b/taskcluster/test-python_38-win-amd64-opt.yml index 5a8cc08b..1fb21922 100644 --- a/taskcluster/test-python_38-win-amd64-opt.yml +++ b/taskcluster/test-python_38-win-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-win-opt-base.tyml dependencies: - "win-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" system_setup: > ${system.sox_win} args: - tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0:" + tests_cmdline: "${system.homedir.win}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0: 16k" metadata: name: "DeepSpeech Windows AMD64 CPU Python v3.8 tests" description: "Testing DeepSpeech for Windows/AMD64 on Python v3.8, CPU only, optimized version" diff --git a/taskcluster/test-python_38_16k-linux-amd64-opt.yml b/taskcluster/test-python_38_16k-linux-amd64-opt.yml new file mode 100644 index 00000000..ebb5892d --- /dev/null +++ b/taskcluster/test-python_38_16k-linux-amd64-opt.yml @@ -0,0 +1,14 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-cpu-opt" + - "test-training_16k-linux-amd64-py36m-opt" + test_model_task: "test-training_16k-linux-amd64-py36m-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0: 16k" + metadata: + name: "DeepSpeech Linux AMD64 CPU Python v3.8 tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml similarity index 65% rename from taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml index aa4b55b6..13ec7196 100644 --- a/taskcluster/test-python_27mu-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-python_38_16k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 2.7.14:mu" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.8.0: 16k" metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 mu prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 mu on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU Python v3.8 prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, CPU only, optimized version (16kHz)" diff --git a/taskcluster/test-python_27m-linux-amd64-opt.yml b/taskcluster/test-python_38_8k-linux-amd64-opt.yml similarity index 56% rename from taskcluster/test-python_27m-linux-amd64-opt.yml rename to taskcluster/test-python_38_8k-linux-amd64-opt.yml index fdb05e7a..c147bac7 100644 --- a/taskcluster/test-python_27m-linux-amd64-opt.yml +++ b/taskcluster/test-python_38_8k-linux-amd64-opt.yml @@ -2,12 +2,13 @@ build: template_file: test-linux-opt-base.tyml dependencies: - "linux-amd64-cpu-opt" - - "test-training_upstream-linux-amd64-py36m-opt" + - "test-training_8k-linux-amd64-py36m-opt" + test_model_task: "test-training_8k-linux-amd64-py36m-opt" system_setup: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 2.7.14:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.8.0: 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU Python v2.7 m tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 m, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU Python v3.8 tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml b/taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml similarity index 66% rename from taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml rename to taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml index 9b9348dd..9f643a31 100644 --- a/taskcluster/test-python_35-linux-amd64-prod_pbmodel-opt.yml +++ b/taskcluster/test-python_38_8k-linux-amd64-prod_pbmodel-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.5.5:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests-prod.sh 3.8.0: 8k" metadata: - name: "DeepSpeech Linux AMD64 CPU Python v3.5 prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU Python v3.8 prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, CPU only, optimized version (8kHz)" diff --git a/taskcluster/test-python_38_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_38_tflite-linux-amd64-prod-opt.yml deleted file mode 100644 index 18aad46b..00000000 --- a/taskcluster/test-python_38_tflite-linux-amd64-prod-opt.yml +++ /dev/null @@ -1,12 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-tflite-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.8.0:" - metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v3.8 prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, TFLite, optimized version" diff --git a/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml b/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml new file mode 100644 index 00000000..ebddd8fb --- /dev/null +++ b/taskcluster/test-python_38_tflite_16k-linux-amd64-prod-opt.yml @@ -0,0 +1,12 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-tflite-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.8.0: 16k" + metadata: + name: "DeepSpeech Linux AMD64 TFLite Python v3.8 prod tests (16kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, TFLite, optimized version (16kHz)" diff --git a/taskcluster/test-python_35_tflite-linux-amd64-prod-opt.yml b/taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml similarity index 65% rename from taskcluster/test-python_35_tflite-linux-amd64-prod-opt.yml rename to taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml index 28bec681..0505cda8 100644 --- a/taskcluster/test-python_35_tflite-linux-amd64-prod-opt.yml +++ b/taskcluster/test-python_38_tflite_8k-linux-amd64-prod-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.5.5:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python_tflite-tests-prod.sh 3.8.0: 8k" metadata: - name: "DeepSpeech Linux AMD64 TFLite Python v3.5 prod tests" - description: "Testing DeepSpeech for Linux/AMD64 on Python v3.5 on prod model, TFLite, optimized version" + name: "DeepSpeech Linux AMD64 TFLite Python v3.8 prod tests (8kHz)" + description: "Testing DeepSpeech for Linux/AMD64 on Python v3.8 on prod model, TFLite, optimized version (8kHz)" diff --git a/taskcluster/test-raspbian-opt-base.tyml b/taskcluster/test-raspbian-opt-base.tyml index faf511a8..ef206a12 100644 --- a/taskcluster/test-raspbian-opt-base.tyml +++ b/taskcluster/test-raspbian-opt-base.tyml @@ -31,7 +31,7 @@ then: env: $let: - training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") } + training: { $eval: as_slugid(build.test_model_task) } linux_rpi3_build: { $eval: as_slugid("linux-rpi3-cpu-opt") } in: DEEPSPEECH_ARTIFACTS_ROOT: https://community-tc.services.mozilla.com/api/queue/v1/task/${linux_rpi3_build}/artifacts/public diff --git a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml b/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml similarity index 76% rename from taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml rename to taskcluster/test-training_16k-linux-amd64-py35m-opt.yml index 8d85d948..def5cc5b 100644 --- a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml +++ b/taskcluster/test-training_16k-linux-amd64-py35m-opt.yml @@ -6,8 +6,8 @@ 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" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.5.5:m 16k" convert_graphdef: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r1.14.e77504ac6b941fd2af495b49a0bcd56f25ca0e1e.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" + name: "DeepSpeech Linux AMD64 CPU 16kHz training Py3.5" + description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.5, CPU only, optimized version" diff --git a/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml b/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml similarity index 75% rename from taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml rename to taskcluster/test-training_16k-linux-amd64-py36m-opt.yml index 1c5a932a..d8cb4613 100644 --- a/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml +++ b/taskcluster/test-training_16k-linux-amd64-py36m-opt.yml @@ -6,8 +6,8 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.4:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.4:m 16k" convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/convert_graphdef_memmapped_format" metadata: - name: "DeepSpeech Linux AMD64 CPU upstream training Py3.6" - description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 3.6, CPU only, optimized version" + name: "DeepSpeech Linux AMD64 CPU 16kHz training Py3.6" + description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 16kHz Python 3.6, CPU only, optimized version" diff --git a/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml b/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml new file mode 100644 index 00000000..8d5c6de4 --- /dev/null +++ b/taskcluster/test-training_8k-linux-amd64-py36m-opt.yml @@ -0,0 +1,13 @@ +build: + template_file: test-linux-opt-base.tyml + dependencies: + - "linux-amd64-ctc-opt" + system_setup: + > + apt-get -qq -y install ${python.packages_trusty.apt} + args: + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-train-tests.sh 3.6.4:m 8k" + convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.14.351a98ab6e60c2bf257f05e515a420aba3027d8b.cpu/artifacts/public/convert_graphdef_memmapped_format" + metadata: + name: "DeepSpeech Linux AMD64 CPU 8kHz training Py3.6" + description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 8kHz Python 3.6, CPU only, optimized version" diff --git a/taskcluster/test-win-opt-base.tyml b/taskcluster/test-win-opt-base.tyml index 3ff211e6..5f9454cc 100644 --- a/taskcluster/test-win-opt-base.tyml +++ b/taskcluster/test-win-opt-base.tyml @@ -36,7 +36,7 @@ then: env: $let: - training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") } + training: { $eval: as_slugid(build.test_model_task) } win_amd64_build: { $eval: as_slugid("win-amd64-cpu-opt") } win_amd64_tflite: { $eval: as_slugid("win-amd64-tflite-opt") } in: diff --git a/taskcluster/win-opt-base.tyml b/taskcluster/win-opt-base.tyml index 081386ec..14ef60bb 100644 --- a/taskcluster/win-opt-base.tyml +++ b/taskcluster/win-opt-base.tyml @@ -36,15 +36,11 @@ payload: https://sourceforge.net/projects/msys2/files/Base/x86_64/msys2-base-x86_64-20180531.tar.xz/download env: - $let: - training: { $eval: as_slugid("test-training_upstream-linux-amd64-py36m-opt") } - in: - TC_MSYS_VERSION: 'MSYS_NT-6.3' - MSYS: 'winsymlinks:nativestrict' - TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow} - DEEPSPEECH_TEST_MODEL: https://community-tc.services.mozilla.com/api/queue/v1/task/${training}/artifacts/public/output_graph.pb - EXAMPLES_CLONE_URL: "https://github.com/mozilla/DeepSpeech-examples" - EXAMPLES_CHECKOUT_TARGET: "master" + TC_MSYS_VERSION: 'MSYS_NT-6.3' + MSYS: 'winsymlinks:nativestrict' + TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow} + EXAMPLES_CLONE_URL: "https://github.com/mozilla/DeepSpeech-examples" + EXAMPLES_CHECKOUT_TARGET: "master" command: - >-