From e809e4746a192ea567fa1ac9d0053f3a497908c6 Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Thu, 26 Jul 2018 09:36:07 +0200 Subject: [PATCH] Remove deprecated tests We are now only relying on upstream TensorFlow packages and aiming at being compatible. Makes no sense to continue supporting those, especially since they are disabled. --- ...speech-linux-amd64-py27mu-opt.yml-disabled | 13 ------------- ...pspeech-linux-amd64-py36m-opt.yml-disabled | 13 ------------- ...aining-linux-amd64-py27mu-opt.yml-disabled | 12 ------------ ...raining-linux-amd64-py34m-opt.yml-disabled | 12 ------------ ...raining-linux-amd64-py35m-opt.yml-disabled | 12 ------------ ...raining-linux-amd64-py36m-opt.yml-disabled | 12 ------------ ...ream+deepspeech-linux-amd64-py27mu-opt.yml | 2 +- ...tream+deepspeech-linux-amd64-py36m-opt.yml | 2 +- ...aining_upstream-linux-amd64-py27mu-opt.yml | 2 +- ...raining_upstream-linux-amd64-py34m-opt.yml | 2 +- ...raining_upstream-linux-amd64-py35m-opt.yml | 2 +- ...raining_upstream-linux-amd64-py36m-opt.yml | 2 +- ..._upstream_frozen-linux-amd64-py36m-opt.yml | 2 +- tc-train-tests.sh | 19 +++---------------- 14 files changed, 10 insertions(+), 97 deletions(-) delete mode 100644 taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled delete mode 100644 taskcluster/test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled delete mode 100644 taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled delete mode 100644 taskcluster/test-training-linux-amd64-py34m-opt.yml-disabled delete mode 100644 taskcluster/test-training-linux-amd64-py35m-opt.yml-disabled delete mode 100644 taskcluster/test-training-linux-amd64-py36m-opt.yml-disabled diff --git a/taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled b/taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled deleted file mode 100644 index e299aabd..00000000 --- a/taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled +++ /dev/null @@ -1,13 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-ctc-opt" - - "linux-amd64-cpu-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu mozilla deepspeech" - metadata: - name: "DeepSpeech Linux AMD64 CPU training Py2.7 mu (DS)" - description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 2.7 mu with DeepSpeech package installed, CPU only, optimized version" diff --git a/taskcluster/test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled b/taskcluster/test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled deleted file mode 100644 index 3014de93..00000000 --- a/taskcluster/test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled +++ /dev/null @@ -1,13 +0,0 @@ -build: - template_file: test-linux-opt-base.tyml - dependencies: - - "linux-amd64-ctc-opt" - - "linux-amd64-cpu-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_trusty.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m mozilla deepspeech" - metadata: - name: "DeepSpeech Linux AMD64 CPU training Py3.6 (DS)" - description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.6 with DeepSpeech package installed, CPU only, optimized version" diff --git a/taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled deleted file mode 100644 index 18681640..00000000 --- a/taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled +++ /dev/null @@ -1,12 +0,0 @@ -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/tc-train-tests.sh 2.7.14:mu mozilla" - metadata: - name: "DeepSpeech Linux AMD64 CPU training Py2.7 mu" - description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 2.7 mu, CPU only, optimized version" diff --git a/taskcluster/test-training-linux-amd64-py34m-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py34m-opt.yml-disabled deleted file mode 100644 index 8a83077f..00000000 --- a/taskcluster/test-training-linux-amd64-py34m-opt.yml-disabled +++ /dev/null @@ -1,12 +0,0 @@ -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/tc-train-tests.sh 3.4.8:m mozilla" - metadata: - name: "DeepSpeech Linux AMD64 CPU training Py3.4" - description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.4, CPU only, optimized version" diff --git a/taskcluster/test-training-linux-amd64-py35m-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py35m-opt.yml-disabled deleted file mode 100644 index adc52709..00000000 --- a/taskcluster/test-training-linux-amd64-py35m-opt.yml-disabled +++ /dev/null @@ -1,12 +0,0 @@ -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/tc-train-tests.sh 3.5.5:m mozilla" - metadata: - name: "DeepSpeech Linux AMD64 CPU training Py3.5" - description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.5, CPU only, optimized version" diff --git a/taskcluster/test-training-linux-amd64-py36m-opt.yml-disabled b/taskcluster/test-training-linux-amd64-py36m-opt.yml-disabled deleted file mode 100644 index 5153a6a7..00000000 --- a/taskcluster/test-training-linux-amd64-py36m-opt.yml-disabled +++ /dev/null @@ -1,12 +0,0 @@ -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/tc-train-tests.sh 3.6.4:m mozilla" - metadata: - name: "DeepSpeech Linux AMD64 CPU training Py3.6" - description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 Python 3.6, CPU only, optimized version" diff --git a/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27mu-opt.yml b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27mu-opt.yml index b5a8c5a7..12c9f631 100644 --- a/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27mu-opt.yml +++ b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py27mu-opt.yml @@ -7,7 +7,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu upstream deepspeech" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu deepspeech" metadata: name: "DeepSpeech Linux AMD64 CPU upstream training Py2.7 mu (DS)" description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 2.7 mu with DeepSpeech package installed, CPU only, optimized version" diff --git a/taskcluster/test-training_upstream+deepspeech-linux-amd64-py36m-opt.yml b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py36m-opt.yml index 2ef38a83..f666a77b 100644 --- a/taskcluster/test-training_upstream+deepspeech-linux-amd64-py36m-opt.yml +++ b/taskcluster/test-training_upstream+deepspeech-linux-amd64-py36m-opt.yml @@ -7,7 +7,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m upstream deepspeech" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m deepspeech" metadata: name: "DeepSpeech Linux AMD64 CPU upstream training Py3.6 (DS)" description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 3.6 with DeepSpeech package installed, CPU only, optimized version" diff --git a/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml index 025de5ec..9ae33797 100644 --- a/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml +++ b/taskcluster/test-training_upstream-linux-amd64-py27mu-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu upstream" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 2.7.14:mu" convert_graphdef: "https://index.taskcluster.net/v1/task/project.deepspeech.tensorflow.pip.r1.6.c346f2c8fdedbbfdc1a551e193552d26cf30eb9c.cpu/artifacts/public/convert_graphdef_memmapped_format" metadata: name: "DeepSpeech Linux AMD64 CPU upstream training Py2.7 mu" diff --git a/taskcluster/test-training_upstream-linux-amd64-py34m-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py34m-opt.yml index 154c2846..6f65f902 100644 --- a/taskcluster/test-training_upstream-linux-amd64-py34m-opt.yml +++ b/taskcluster/test-training_upstream-linux-amd64-py34m-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.4.8:m upstream" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.4.8:m" metadata: name: "DeepSpeech Linux AMD64 CPU upstream training Py3.4" description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 3.4, CPU only, optimized version" diff --git a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml index 19636f54..763621d0 100644 --- a/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml +++ b/taskcluster/test-training_upstream-linux-amd64-py35m-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.5.5:m upstream" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.5.5:m" metadata: name: "DeepSpeech Linux AMD64 CPU upstream training Py3.5" description: "Training a DeepSpeech LDC93S1 model for Linux/AMD64 using upstream TensorFlow Python 3.5, CPU only, optimized version" diff --git a/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml b/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml index 6f39cf16..1af20b4c 100644 --- a/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml +++ b/taskcluster/test-training_upstream-linux-amd64-py36m-opt.yml @@ -6,7 +6,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m upstream" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m" 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" diff --git a/taskcluster/test-training_upstream_frozen-linux-amd64-py36m-opt.yml b/taskcluster/test-training_upstream_frozen-linux-amd64-py36m-opt.yml index ec67c2c8..ae81cc3d 100644 --- a/taskcluster/test-training_upstream_frozen-linux-amd64-py36m-opt.yml +++ b/taskcluster/test-training_upstream_frozen-linux-amd64-py36m-opt.yml @@ -7,7 +7,7 @@ build: > apt-get -qq -y install ${python.packages_trusty.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m upstream frozen" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/tc-train-tests.sh 3.6.4:m frozen" metadata: name: "DeepSpeech Linux AMD64 CPU upstream training frozen Py3.6" description: "Training a DeepSpeech LDC93S1 model from frozen model file for Linux/AMD64 using upstream TensorFlow Python 3.6, CPU only, optimized version" diff --git a/tc-train-tests.sh b/tc-train-tests.sh index c848e05a..dccd5c2d 100644 --- a/tc-train-tests.sh +++ b/tc-train-tests.sh @@ -5,14 +5,8 @@ set -xe source $(dirname "$0")/tc-tests-utils.sh pyver_full=$1 -tf=$2 -ds=$3 - -if [ "$#" -eq 3 ]; then - frozen=$3 -else - frozen=$4 -fi; +ds=$2 +frozen=$2 if [ -z "${pyver_full}" ]; then echo "No python version given, aborting." @@ -48,14 +42,7 @@ PYTHON_CONFIGURE_OPTS="--enable-unicode=${pyconf}" pyenv install ${pyver} pyenv virtualenv ${pyver} ${PYENV_NAME} source ${PYENV_ROOT}/versions/${pyver}/envs/${PYENV_NAME}/bin/activate -if [ "${tf}" = "mozilla" ]; then - pip install --upgrade ${TENSORFLOW_WHEEL} | cat - grep -v "tensorflow" ${HOME}/DeepSpeech/ds/requirements.txt | pip install --upgrade -r /dev/stdin | cat -fi; - -if [ "${tf}" = "upstream" ]; then - pip install --upgrade -r ${HOME}/DeepSpeech/ds/requirements.txt | cat -fi; +pip install --upgrade -r ${HOME}/DeepSpeech/ds/requirements.txt | cat platform=$(python -c 'import sys; import platform; plat = platform.system().lower(); arch = platform.machine().lower(); plat = "manylinux1" if plat == "linux" and arch == "x86_64" else plat; plat = "macosx_10_10" if plat == "darwin" else plat; sys.stdout.write("%s_%s" % (plat, platform.machine()));') whl_ds_version="$(python -c 'from pkg_resources import parse_version; print(parse_version("'${DS_VERSION}'"))')"