Merge pull request #1476 from lissyx/cleanup_training

Remove deprecated tests
2025-10-26 11:19:39 +00:00 · 2018-07-26 23:17:22 -07:00 · 2018-07-26 23:17:22 -07:00 · 24ac47019f
commit 24ac47019f
parent c09e1b4558 e809e4746a
14 changed files with 10 additions and 97 deletions
--- a/taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled
+++ b/taskcluster/test-training+deepspeech-linux-amd64-py27mu-opt.yml-disabled
@ -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"
--- a/taskcluster/test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled
+++ b/taskcluster/test-training+deepspeech-linux-amd64-py36m-opt.yml-disabled
@ -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"
--- a/taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled
+++ b/taskcluster/test-training-linux-amd64-py27mu-opt.yml-disabled
@ -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"
--- a/taskcluster/test-training-linux-amd64-py34m-opt.yml-disabled
+++ b/taskcluster/test-training-linux-amd64-py34m-opt.yml-disabled
@ -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"
--- a/taskcluster/test-training-linux-amd64-py35m-opt.yml-disabled
+++ b/taskcluster/test-training-linux-amd64-py35m-opt.yml-disabled
@ -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"
--- a/taskcluster/test-training-linux-amd64-py36m-opt.yml-disabled
+++ b/taskcluster/test-training-linux-amd64-py36m-opt.yml-disabled
@ -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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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}'"))')"