Decouple builds and add debug

Fixes mozilla#3170 Fixes mozilla#3292
lissyx · Aug 31, 2020 · 0bdc27b · 0bdc27b
1 parent 555a265
commit 0bdc27b
Show file tree

Hide file tree

Showing 23 changed files with 241 additions and 27 deletions.
diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml
@@ -172,6 +172,40 @@ system:
     ios_x86_64:
       url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_x86_64/artifacts/public/home.tar.xz"
       namespace: "project.deepspeech.tensorflow.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_x86_64"
+  tensorflow_dbg:
+    linux_amd64_cpu:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.cpu/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.cpu"
+    linux_amd64_cuda:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.cuda/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.cuda"
+    linux_armv7:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.arm/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.arm"
+    linux_arm64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.arm64"
+    darwin_amd64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.osx/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.osx"
+    android_arm64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.android-arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.android-arm64"
+    android_armv7:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.android-armv7/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.android-armv7"
+    win_amd64_cpu:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.win/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.win"
+    win_amd64_cuda:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.win-cuda/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.win-cuda"
+    ios_arm64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_arm64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_arm64"
+    ios_x86_64:
+      url: "https://community-tc.services.mozilla.com/api/index/v1/task/project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_x86_64/artifacts/public/home.tar.xz"
+      namespace: "project.deepspeech.tensorflow_dbg.pip.r2.3.23ad988fcde60fb01f9533e95004bbc4877a9143.0.ios_x86_64"
   username: 'build-user'
   homedir:
     linux: '/home/build-user'

diff --git a/taskcluster/tf_android-arm64-dbg.yml b/taskcluster/tf_android-arm64-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.android_arm64.url}
+    artifact_namespace: ${system.tensorflow_dbg.android_arm64.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh --android-arm64"
+    build: "taskcluster/tf_tc-build.sh --android-arm64 dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Android ARM64 debug"
+    description: "Building TensorFlow for Android ARM64, debug version"
diff --git a/taskcluster/tf_android-arm64-opt.yml b/taskcluster/tf_android-arm64-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
   scripts:
-    setup: "taskcluster/tf_tc-setup.sh --android"
+    setup: "taskcluster/tf_tc-setup.sh --android-arm64"
     build: "taskcluster/tf_tc-build.sh --android-arm64"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400

diff --git a/taskcluster/tf_android-armv7-dbg.yml b/taskcluster/tf_android-armv7-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.android_armv7.url}
+    artifact_namespace: ${system.tensorflow_dbg.android_armv7.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh --android-armv7"
+    build: "taskcluster/tf_tc-build.sh --android-armv7 dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Android ARMv7 debug"
+    description: "Building TensorFlow for Android ARMv7, debug version"
diff --git a/taskcluster/tf_android-armv7-opt.yml b/taskcluster/tf_android-armv7-opt.yml
@@ -7,7 +7,7 @@ build:
     >
       ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
   scripts:
-    setup: "taskcluster/tf_tc-setup.sh --android"
+    setup: "taskcluster/tf_tc-setup.sh --android-armv7"
     build: "taskcluster/tf_tc-build.sh --android-armv7"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400

diff --git a/taskcluster/tf_darwin-amd64-dbg.yml b/taskcluster/tf_darwin-amd64-dbg.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: generic_tc_caching-darwin-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.darwin_amd64.url}
+    artifact_namespace: ${system.tensorflow_dbg.darwin_amd64.namespace}
+  workerType: ${macOS.tfBuild}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --darwin-cpu dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 28800
+  metadata:
+    name: "TensorFlow OSX AMD64 CPU debug"
+    description: "Building TensorFlow for OSX AMD64, CPU only, debug version"
diff --git a/taskcluster/tf_darwin-amd64-opt.yml b/taskcluster/tf_darwin-amd64-opt.yml
@@ -6,7 +6,7 @@ build:
   workerType: ${macOS.tfBuild}
   scripts:
     setup: "taskcluster/tf_tc-setup.sh"
-    build: "taskcluster/tf_tc-build.sh --cpu"
+    build: "taskcluster/tf_tc-build.sh --darwin-cpu"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 28800
   metadata:

diff --git a/taskcluster/tf_ios-arm64-dbg.yml b/taskcluster/tf_ios-arm64-dbg.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: generic_tc_caching-darwin-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.ios_arm64.url}
+    artifact_namespace: ${system.tensorflow_dbg.ios_arm64.namespace}
+  workerType: ${macOS.tfBuild}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --ios-arm64 dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 28800
+  metadata:
+    name: "TensorFlow iOS ARM64 TFLite debug"
+    description: "Building TensorFlow for iOS ARM64, TFLite, debug version"
diff --git a/taskcluster/tf_ios-x86_64-dbg.yml b/taskcluster/tf_ios-x86_64-dbg.yml
@@ -0,0 +1,14 @@
+build:
+  template_file: generic_tc_caching-darwin-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.ios_x86_64.url}
+    artifact_namespace: ${system.tensorflow_dbg.ios_x86_64.namespace}
+  workerType: ${macOS.tfBuild}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --ios-x86_64 dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 28800
+  metadata:
+    name: "TensorFlow iOS x86_64 TFLite debug"
+    description: "Building TensorFlow for iOS x86_64, TFLite, debug version"
diff --git a/taskcluster/tf_linux-amd64-cpu-dbg.yml b/taskcluster/tf_linux-amd64-cpu-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.linux_amd64_cpu.url}
+    artifact_namespace: ${system.tensorflow_dbg.linux_amd64_cpu.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --linux-cpu dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Linux AMD64 CPU debug"
+    description: "Building TensorFlow for Linux/AMD64, CPU only, debug version"
diff --git a/taskcluster/tf_linux-amd64-cpu-opt.yml b/taskcluster/tf_linux-amd64-cpu-opt.yml
@@ -8,7 +8,7 @@ build:
       ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
   scripts:
     setup: "taskcluster/tf_tc-setup.sh"
-    build: "taskcluster/tf_tc-build.sh --cpu"
+    build: "taskcluster/tf_tc-build.sh --linux-cpu"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
   workerType: "${docker.tfBuild}"

diff --git a/taskcluster/tf_linux-amd64-gpu-dbg.yml b/taskcluster/tf_linux-amd64-gpu-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.linux_amd64_cuda.url}
+    artifact_namespace: ${system.tensorflow_dbg.linux_amd64_cuda.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh --linux-cuda"
+    build: "taskcluster/tf_tc-build.sh --linux-cuda dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Linux AMD64 CUDA debug"
+    description: "Building TensorFlow for Linux/AMD64, CUDA-enabled, debug version"
diff --git a/taskcluster/tf_linux-amd64-gpu-opt.yml b/taskcluster/tf_linux-amd64-gpu-opt.yml
@@ -7,8 +7,8 @@ build:
     >
       ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
   scripts:
-    setup: "taskcluster/tf_tc-setup.sh --cuda"
-    build: "taskcluster/tf_tc-build.sh --gpu"
+    setup: "taskcluster/tf_tc-setup.sh --linux-cuda"
+    build: "taskcluster/tf_tc-build.sh --linux-cuda"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
   workerType: "${docker.tfBuild}"

diff --git a/taskcluster/tf_linux-arm64-cpu-dbg.yml b/taskcluster/tf_linux-arm64-cpu-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.linux_arm64.url}
+    artifact_namespace: ${system.tensorflow_dbg.linux_arm64.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --linux-arm64 dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Linux ARM64 Cortex-A53 CPU debug"
+    description: "Building TensorFlow for Linux ARM64 Cortex-A53, CPU only, debug version"
diff --git a/taskcluster/tf_linux-arm64-cpu-opt.yml b/taskcluster/tf_linux-arm64-cpu-opt.yml
@@ -8,7 +8,7 @@ build:
       ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
   scripts:
     setup: "taskcluster/tf_tc-setup.sh"
-    build: "taskcluster/tf_tc-build.sh --arm64"
+    build: "taskcluster/tf_tc-build.sh --linux-arm64"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
   workerType: "${docker.tfBuild}"

diff --git a/taskcluster/tf_linux-rpi3-cpu-dbg.yml b/taskcluster/tf_linux-rpi3-cpu-dbg.yml
@@ -0,0 +1,17 @@
+build:
+  template_file: generic_tc_caching-linux-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.linux_armv7.url}
+    artifact_namespace: ${system.tensorflow_dbg.linux_armv7.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --linux-arm dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  workerType: "${docker.tfBuild}"
+  metadata:
+    name: "TensorFlow Linux RPi3/ARMv7 CPU debug"
+    description: "Building TensorFlow for Linux RPi3 ARMv7, CPU only, debug version"
diff --git a/taskcluster/tf_linux-rpi3-cpu-opt.yml b/taskcluster/tf_linux-rpi3-cpu-opt.yml
@@ -8,7 +8,7 @@ build:
       ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
   scripts:
     setup: "taskcluster/tf_tc-setup.sh"
-    build: "taskcluster/tf_tc-build.sh --arm"
+    build: "taskcluster/tf_tc-build.sh --linux-arm"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
   workerType: "${docker.tfBuild}"

diff --git a/taskcluster/tf_tc-build.sh b/taskcluster/tf_tc-build.sh
@@ -14,30 +14,32 @@ pushd ${DS_ROOT_TASK}/DeepSpeech/ds/tensorflow/
     # Force toolchain sync (useful on macOS ?)
     bazel ${BAZEL_OUTPUT_USER_ROOT} sync --configure
 
+    OPT_OR_DBG=${2:-opt}
+
     case "$1" in
-    "--cpu")
-        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_OPT_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LITE_LIB}
+    "--linux-cpu"|"--darwin-cpu"|"--windows-cpu")
+        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_OPT_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LIB_CPP_API} ${BUILD_TARGET_LITE_LIB}
         ;;
-    "--gpu")
-        eval "export ${TF_CUDA_FLAGS}" && (echo "" | TF_NEED_CUDA=1 ./configure) && ${BAZEL_BUILD} -c opt ${BAZEL_CUDA_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BAZEL_OPT_FLAGS} ${BUILD_TARGET_LIB_CPP_API}
+    "--linux-cuda"|"--windows-cuda")
+        eval "export ${TF_CUDA_FLAGS}" && (echo "" | TF_NEED_CUDA=1 ./configure) && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_CUDA_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BAZEL_OPT_FLAGS} ${BUILD_TARGET_LIB_CPP_API}
         ;;
-    "--arm")
-        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
+    "--linux-arm")
+        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
-    "--arm64")
-        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
+    "--linux-arm64")
+        echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--android-armv7")
-        echo "" | TF_SET_ANDROID_WORKSPACE=1 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_ANDROID_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_SET_ANDROID_WORKSPACE=1 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ANDROID_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--android-arm64")
-        echo "" | TF_SET_ANDROID_WORKSPACE=1 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_ANDROID_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_SET_ANDROID_WORKSPACE=1 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ANDROID_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--ios-arm64")
-        echo "" | TF_NEED_CUDA=0 TF_CONFIGURE_IOS=1 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_IOS_ARM64_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_NEED_CUDA=0 TF_CONFIGURE_IOS=1 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_IOS_ARM64_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     "--ios-x86_64")
-        echo "" | TF_NEED_CUDA=0 TF_CONFIGURE_IOS=1 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_IOS_X86_64_FLAGS} ${BUILD_TARGET_LITE_LIB}
+        echo "" | TF_NEED_CUDA=0 TF_CONFIGURE_IOS=1 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_IOS_X86_64_FLAGS} ${BUILD_TARGET_LITE_LIB}
         ;;
     esac
 

diff --git a/taskcluster/tf_tc-setup.sh b/taskcluster/tf_tc-setup.sh
@@ -4,15 +4,17 @@ set -ex
 
 source $(dirname $0)/tf_tc-vars.sh
 
+install_android=
 install_cuda=
-if [ "$1" = "--cuda" ]; then
+case "$1" in
+    "--linux-cuda"|"--windows-cuda")
     install_cuda=yes
-fi
+    ;;
 
-install_android=
-if [ "$1" = "--android" ]; then
+    "--android-armv7"|"--android-arm64")
     install_android=yes
-fi
+    ;;
+esac
 
 # $1 url
 # $2 sha256

diff --git a/taskcluster/tf_win-amd64-cpu-dbg.yml b/taskcluster/tf_win-amd64-cpu-dbg.yml
@@ -0,0 +1,16 @@
+build:
+  template_file: generic_tc_caching-win-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.win_amd64_cpu.url}
+    artifact_namespace: ${system.tensorflow_dbg.win_amd64_cpu.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_win.pacman} && ${tensorflow.packages_win.msys64}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --windows-cpu dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  metadata:
+    name: "TensorFlow Windows AMD64 CPU debug"
+    description: "Building TensorFlow for Windows AMD64, CPU only, debug version"
diff --git a/taskcluster/tf_win-amd64-cpu-opt.yml b/taskcluster/tf_win-amd64-cpu-opt.yml
@@ -8,7 +8,7 @@ build:
       ${tensorflow.packages_win.pacman} && ${tensorflow.packages_win.msys64}
   scripts:
     setup: "taskcluster/tf_tc-setup.sh"
-    build: "taskcluster/tf_tc-build.sh --cpu"
+    build: "taskcluster/tf_tc-build.sh --windows-cpu"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
   metadata:

diff --git a/taskcluster/tf_win-amd64-gpu-dbg.yml b/taskcluster/tf_win-amd64-gpu-dbg.yml
@@ -0,0 +1,16 @@
+build:
+  template_file: generic_tc_caching-win-opt-base.tyml
+  cache:
+    artifact_url: ${system.tensorflow_dbg.win_amd64_cuda.url}
+    artifact_namespace: ${system.tensorflow_dbg.win_amd64_cuda.namespace}
+  system_config:
+    >
+      ${tensorflow.packages_win.pacman} && ${tensorflow.packages_win.msys64}
+  scripts:
+    setup: "taskcluster/tf_tc-setup.sh"
+    build: "taskcluster/tf_tc-build.sh --windows-cuda dbg"
+    package: "taskcluster/tf_tc-package.sh"
+  maxRunTime: 14400
+  metadata:
+    name: "TensorFlow Windows AMD64 CUDA debug"
+    description: "Building TensorFlow for Windows AMD64, CUDA, debug version"
diff --git a/taskcluster/tf_win-amd64-gpu-opt.yml b/taskcluster/tf_win-amd64-gpu-opt.yml
@@ -8,7 +8,7 @@ build:
       ${tensorflow.packages_win.pacman} && ${tensorflow.packages_win.msys64}
   scripts:
     setup: "taskcluster/tf_tc-setup.sh"
-    build: "taskcluster/tf_tc-build.sh --gpu"
+    build: "taskcluster/tf_tc-build.sh --windows-cuda"
     package: "taskcluster/tf_tc-package.sh"
   maxRunTime: 14400
   metadata: