Skip to content

Commit

Permalink
Add Python2.7 ucs2+ucs4 variants
Browse files Browse the repository at this point in the history
  • Loading branch information
Alexandre Lissy committed Mar 1, 2018
1 parent 93393dd commit a14a518
Show file tree
Hide file tree
Showing 75 changed files with 221 additions and 105 deletions.
2 changes: 1 addition & 1 deletion taskcluster/darwin-opt-base.tyml
Expand Up @@ -36,7 +36,7 @@ payload:

env:
$let:
training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
in:
TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/linux-amd64-cpu-aot_test-opt.yml
Expand Up @@ -5,7 +5,7 @@ build:
- "pull_request.reopened"
template_file: linux-opt-base.tyml
dependencies:
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
tensorflow: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.5.ad8f785459e80823a2ff4456eeb9d7220c33b9c6.cpu/artifacts/public/home.tar.xz"
summarize_graph: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.5.ad8f785459e80823a2ff4456eeb9d7220c33b9c6.cpu/artifacts/public/summarize_graph"
system_setup:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/linux-opt-base.tyml
Expand Up @@ -33,7 +33,7 @@ then:

env:
$let:
training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
in:
TENSORFLOW_BUILD_ARTIFACT: ${build.tensorflow}
SUMMARIZE_GRAPH_BINARY: ${build.summarize_graph}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/rpi3-build.sh
Expand Up @@ -31,7 +31,7 @@ do_bazel_build

do_deepspeech_binary_build

export SUPPORTED_PYTHON_VERSIONS="2.7.13 3.4.6"
export SUPPORTED_PYTHON_VERSIONS="2.7.14:'ucs2' 3.4.8:'ucs4'"
do_deepspeech_python_build

do_deepspeech_nodejs_build
2 changes: 1 addition & 1 deletion taskcluster/test-benchmark-linux-amd64-aot_test-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-aot_test-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
apt-get -qq -y install ${python.packages.apt} zip
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-benchmark-linux-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
apt-get -qq -y install ${python.packages.apt} zip
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-cpp-darwin-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-darwin-opt-base.tyml
dependencies:
- "darwin-amd64-cpu-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${cpp.brew.setup} && ${cpp.brew.packages} && ${cpp.brew.env}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-cpp-linux-amd64-aot_test-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-aot_test-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh --aot"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-cpp-linux-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests.sh"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-cpp-linux-amd64-prod_pbmodel-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-cpp-ds-tests-prod.sh"
metadata:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-darwin-opt-base.tyml
Expand Up @@ -30,7 +30,7 @@ then:

env:
$let:
training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
darwin_amd64_build: { $eval: as_slugid("darwin-amd64-cpu-opt") }
node_package: { $eval: as_slugid("node-package") }
in:
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-linux-opt-base.tyml
Expand Up @@ -31,7 +31,7 @@ then:

env:
$let:
training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27-opt") }
training: { $eval: as_slugid("test-training_upstream-linux-amd64-py27mu-opt") }
linux_amd64_aot_test: { $eval: as_slugid("linux-amd64-cpu-aot_test-opt") }
linux_amd64_build: { $eval: as_slugid("linux-amd64-cpu-opt") }
linux_amd64_ctc: { $eval: as_slugid("linux-amd64-ctc-opt") }
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_4x-darwin-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-darwin-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.brew.setup} && ${nodejs.brew.prep_4} && ${nodejs.brew.env}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_4x-linux-amd64-aot_test-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-aot_test-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_4x-linux-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_4} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_5x-darwin-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-darwin-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.brew.setup} && ${nodejs.brew.prep_5} && ${nodejs.brew.env}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_5x-linux-amd64-aot_test-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-aot_test-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_5x-linux-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_5} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_6x-darwin-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-darwin-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.brew.setup} && ${nodejs.brew.prep_6} && ${nodejs.brew.env}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_6x-linux-amd64-aot_test-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-aot_test-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_6x-linux-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_6} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_7x-darwin-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-darwin-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.brew.setup} && ${nodejs.brew.prep_7} && ${nodejs.brew.env}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_7x-linux-amd64-aot_test-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-aot_test-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_7x-linux-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_7} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_8x-darwin-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-darwin-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.brew.setup} && ${nodejs.brew.prep_8} && ${nodejs.brew.env}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_8x-linux-amd64-aot_test-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-aot_test-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_8x-linux-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_8} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_9x-darwin-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-darwin-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.brew.setup} && ${nodejs.brew.prep_9} && ${nodejs.brew.env}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_9x-linux-amd64-aot_test-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-aot_test-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
2 changes: 1 addition & 1 deletion taskcluster/test-nodejs_9x-linux-amd64-opt.yml
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
Expand Up @@ -2,7 +2,7 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "node-package"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${nodejs.packages.prep_9} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages.apt}
Expand Down
Expand Up @@ -2,12 +2,12 @@ build:
template_file: test-darwin-opt-base.tyml
dependencies:
- "darwin-amd64-cpu-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${python.brew.setup} && ${python.brew.env}
args:
tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 2.7.13"
tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 2.7.14:m"
metadata:
name: "DeepSpeech OSX AMD64 CPU Python v2.7 tests"
description: "Testing DeepSpeech for OSX/AMD64 on Python v2.7, CPU only, optimized version"
Expand Up @@ -2,12 +2,12 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-aot_test-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
apt-get -qq -y install ${python.packages.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.13 --aot"
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.14:m --aot"
metadata:
name: "DeepSpeech Linux AMD64 CPU Python v2.7 tests AOT (test)"
description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7, AOT Model (test), CPU only, optimized version"
Expand Up @@ -2,12 +2,12 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
apt-get -qq -y install ${python.packages.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.13"
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests.sh 2.7.14:m"
metadata:
name: "DeepSpeech Linux AMD64 CPU Python v2.7 tests"
description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7, CPU only, optimized version"
Expand Up @@ -2,12 +2,12 @@ build:
template_file: test-linux-opt-base.tyml
dependencies:
- "linux-amd64-cpu-opt"
- "test-training_upstream-linux-amd64-py27-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
apt-get -qq -y install ${python.packages.apt}
args:
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 2.7.13"
tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-python-tests-prod.sh 2.7.14:m"
metadata:
name: "DeepSpeech Linux AMD64 CPU Python v2.7 prod tests"
description: "Testing DeepSpeech for Linux/AMD64 on Python v2.7 on prod model, CPU only, optimized version"
13 changes: 13 additions & 0 deletions taskcluster/test-python_27mu-darwin-amd64-opt.yml
@@ -0,0 +1,13 @@
build:
template_file: test-darwin-opt-base.tyml
dependencies:
- "darwin-amd64-cpu-opt"
- "test-training_upstream-linux-amd64-py27mu-opt"
system_setup:
>
${python.brew.setup} && ${python.brew.env}
args:
tests_cmdline: "$TASKCLUSTER_TASK_DIR/DeepSpeech/ds/tc-python-tests.sh 2.7.14:mu"
metadata:
name: "DeepSpeech OSX AMD64 CPU Python v2.7 tests"
description: "Testing DeepSpeech for OSX/AMD64 on Python v2.7, CPU only, optimized version"

0 comments on commit a14a518

Please sign in to comment.