experiments
/
STT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3293 from lissyx/decouple-builds 

Decouple builds
This commit is contained in:
lissyx 2020-08-31 14:53:05 +02:00 committed by GitHub
parent 555a265010 4bc14acb12
commit 26f99874a6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
11 changed files with 33 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
taskcluster/tf_android-arm64-opt.yml
View File

@ -7,7 +7,7 @@ build:
> >
${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt} ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
scripts: scripts:
setup: "taskcluster/tf_tc-setup.sh --android" setup: "taskcluster/tf_tc-setup.sh --android-arm64"
build: "taskcluster/tf_tc-build.sh --android-arm64" build: "taskcluster/tf_tc-build.sh --android-arm64"
package: "taskcluster/tf_tc-package.sh" package: "taskcluster/tf_tc-package.sh"
maxRunTime: 14400 maxRunTime: 14400

2
taskcluster/tf_android-armv7-opt.yml
View File

@ -7,7 +7,7 @@ build:
> >
${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt} ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
scripts: scripts:
setup: "taskcluster/tf_tc-setup.sh --android" setup: "taskcluster/tf_tc-setup.sh --android-armv7"
build: "taskcluster/tf_tc-build.sh --android-armv7" build: "taskcluster/tf_tc-build.sh --android-armv7"
package: "taskcluster/tf_tc-package.sh" package: "taskcluster/tf_tc-package.sh"
maxRunTime: 14400 maxRunTime: 14400

2
taskcluster/tf_darwin-amd64-opt.yml
View File

@ -6,7 +6,7 @@ build:
workerType: ${macOS.tfBuild} workerType: ${macOS.tfBuild}
scripts: scripts:
setup: "taskcluster/tf_tc-setup.sh" 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" package: "taskcluster/tf_tc-package.sh"
maxRunTime: 28800 maxRunTime: 28800
metadata: metadata:

2
taskcluster/tf_linux-amd64-cpu-opt.yml
View File

@ -8,7 +8,7 @@ build:
${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt} ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
scripts: scripts:
setup: "taskcluster/tf_tc-setup.sh" 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" package: "taskcluster/tf_tc-package.sh"
maxRunTime: 14400 maxRunTime: 14400
workerType: "${docker.tfBuild}" workerType: "${docker.tfBuild}"

4
taskcluster/tf_linux-amd64-gpu-opt.yml
View File

@ -7,8 +7,8 @@ build:
> >
${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt} ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
scripts: scripts:
setup: "taskcluster/tf_tc-setup.sh --cuda" setup: "taskcluster/tf_tc-setup.sh --linux-cuda"
build: "taskcluster/tf_tc-build.sh --gpu" build: "taskcluster/tf_tc-build.sh --linux-cuda"
package: "taskcluster/tf_tc-package.sh" package: "taskcluster/tf_tc-package.sh"
maxRunTime: 14400 maxRunTime: 14400
workerType: "${docker.tfBuild}" workerType: "${docker.tfBuild}"

2
taskcluster/tf_linux-arm64-cpu-opt.yml
View File

@ -8,7 +8,7 @@ build:
${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt} ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
scripts: scripts:
setup: "taskcluster/tf_tc-setup.sh" 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" package: "taskcluster/tf_tc-package.sh"
maxRunTime: 14400 maxRunTime: 14400
workerType: "${docker.tfBuild}" workerType: "${docker.tfBuild}"

2
taskcluster/tf_linux-rpi3-cpu-opt.yml
View File

@ -8,7 +8,7 @@ build:
${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt} ${tensorflow.packages_xenial.apt} && ${java.packages_xenial.apt}
scripts: scripts:
setup: "taskcluster/tf_tc-setup.sh" 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" package: "taskcluster/tf_tc-package.sh"
maxRunTime: 14400 maxRunTime: 14400
workerType: "${docker.tfBuild}" workerType: "${docker.tfBuild}"

26
taskcluster/tf_tc-build.sh
View File

@ -14,30 +14,32 @@ pushd ${DS_ROOT_TASK}/DeepSpeech/ds/tensorflow/
# Force toolchain sync (useful on macOS ?) # Force toolchain sync (useful on macOS ?)
bazel ${BAZEL_OUTPUT_USER_ROOT} sync --configure bazel ${BAZEL_OUTPUT_USER_ROOT} sync --configure
OPT_OR_DBG=${2:-opt}
case "$1" in case "$1" in
"--cpu") "--linux-cpu"|"--darwin-cpu"|"--windows-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} 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") "--linux-cuda"|"--windows-cuda")
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} 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") "--linux-arm")
echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB} echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ARM_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
;; ;;
"--arm64") "--linux-arm64")
echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c opt ${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB} echo "" | TF_NEED_CUDA=0 ./configure && ${BAZEL_BUILD} -c ${OPT_OR_DBG} ${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS} ${BUILD_TARGET_LITE_LIB}
;; ;;
"--android-armv7") "--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") "--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") "--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") "--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 esac

16
taskcluster/tf_tc-setup.sh
View File

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

2
taskcluster/tf_win-amd64-cpu-opt.yml
View File

@ -8,7 +8,7 @@ build:
${tensorflow.packages_win.pacman} && ${tensorflow.packages_win.msys64} ${tensorflow.packages_win.pacman} && ${tensorflow.packages_win.msys64}
scripts: scripts:
setup: "taskcluster/tf_tc-setup.sh" 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" package: "taskcluster/tf_tc-package.sh"
maxRunTime: 14400 maxRunTime: 14400
metadata: metadata:

2
taskcluster/tf_win-amd64-gpu-opt.yml
View File

@ -8,7 +8,7 @@ build:
${tensorflow.packages_win.pacman} && ${tensorflow.packages_win.msys64} ${tensorflow.packages_win.pacman} && ${tensorflow.packages_win.msys64}
scripts: scripts:
setup: "taskcluster/tf_tc-setup.sh" 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" package: "taskcluster/tf_tc-package.sh"
maxRunTime: 14400 maxRunTime: 14400
metadata: metadata: