From dfe8be30b43d3a4f2157dd7c61db676c435ddbbe Mon Sep 17 00:00:00 2001 From: Alexandre Lissy Date: Wed, 21 Aug 2019 09:36:45 +0200 Subject: [PATCH] Move to ARMbian Buster Fixes #2310 --- ...ml-DISABLED_ENABLE_ME_TO_REBUILD_DURING_PR | 0 native_client/Makefile | 6 ++--- native_client/README.md | 4 ++-- native_client/definitions.mk | 7 +++--- ....conf => multistrap_armbian64_buster.conf} | 4 ++-- .../multistrap_raspbian_stretch.conf | 14 ----------- taskcluster/.shared.yml | 24 +++++++++---------- taskcluster/arm64-build.sh | 4 ++-- taskcluster/build-python-wheel.tyml | 4 ++-- taskcluster/linux-arm64-cpu-opt.yml | 2 +- taskcluster/tc-tests-utils.sh | 2 +- taskcluster/test-armbian-opt-base.tyml | 4 ++-- .../test-nodejs_10x-armbian-arm64-opt.yml | 2 +- .../test-nodejs_10x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_11x-armbian-arm64-opt.yml | 2 +- .../test-nodejs_11x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_12x-armbian-arm64-opt.yml | 2 +- .../test-nodejs_12x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_4x-armbian-arm64-opt.yml | 2 +- .../test-nodejs_4x-raspbian-rpi3-opt.yml | 2 +- ...t-nodejs_5x-armbian-arm64-opt.yml-disabled | 13 ---------- ...t-nodejs_5x-raspbian-rpi3-opt.yml-disabled | 13 ---------- .../test-nodejs_6x-armbian-arm64-opt.yml | 2 +- .../test-nodejs_6x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_7x-armbian-arm64-opt.yml | 2 +- .../test-nodejs_7x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_8x-armbian-arm64-opt.yml | 2 +- .../test-nodejs_8x-raspbian-rpi3-opt.yml | 2 +- .../test-nodejs_9x-armbian-arm64-opt.yml | 2 +- .../test-nodejs_9x-raspbian-rpi3-opt.yml | 2 +- .../test-python_35m-armbian-arm64-opt.yml | 13 ---------- ... => test-python_37m-armbian-arm64-opt.yml} | 8 +++---- taskcluster/test-raspbian-opt-base.tyml | 2 +- 33 files changed, 51 insertions(+), 105 deletions(-) rename taskcluster/build-python-wheel.yml-DISABLED_ENABLE_ME_TO_REBUILD_DURING_PR => build-python-wheel.yml-DISABLED_ENABLE_ME_TO_REBUILD_DURING_PR (100%) rename native_client/{multistrap_armbian64_stretch.conf => multistrap_armbian64_buster.conf} (57%) delete mode 100644 native_client/multistrap_raspbian_stretch.conf delete mode 100644 taskcluster/test-nodejs_5x-armbian-arm64-opt.yml-disabled delete mode 100644 taskcluster/test-nodejs_5x-raspbian-rpi3-opt.yml-disabled delete mode 100644 taskcluster/test-python_35m-armbian-arm64-opt.yml rename taskcluster/{test-python_34m-armbian-arm64-opt.yml-disabled => test-python_37m-armbian-arm64-opt.yml} (61%) diff --git a/taskcluster/build-python-wheel.yml-DISABLED_ENABLE_ME_TO_REBUILD_DURING_PR b/build-python-wheel.yml-DISABLED_ENABLE_ME_TO_REBUILD_DURING_PR similarity index 100% rename from taskcluster/build-python-wheel.yml-DISABLED_ENABLE_ME_TO_REBUILD_DURING_PR rename to build-python-wheel.yml-DISABLED_ENABLE_ME_TO_REBUILD_DURING_PR diff --git a/native_client/Makefile b/native_client/Makefile index 626e91a5..06d339f7 100644 --- a/native_client/Makefile +++ b/native_client/Makefile @@ -1,9 +1,9 @@ ### -### From topdir, first use multistrap to prepare a raspbian stretch armhf root -### $ sudo multistrap -d multistrap-raspbian-stretch -f native_client/multistrap_raspbian_stretch.conf +### From topdir, first use multistrap to prepare a raspbian buster armhf root +### $ multistrap -d multistrap-raspbian-buster -f native_client/multistrap_raspbian_buster.conf ### ### You can make a tarball after: -### $ touch multistrap-raspbian-stretch.tar && sudo tar cf multistrap-raspbian-stretch.tar multistrap-raspbian-stretch/ && xz multistrap-raspbian-stretch.tar +### $ touch multistrap-raspbian-buster.tar && sudo tar cf multistrap-raspbian-buster.tar multistrap-raspbian-buster/ && xz multistrap-raspbian-buster.tar ### ### Then cross-build: ### $ make -C native_client/ TARGET=rpi3 TFDIR=../../tensorflow/tensorflow/ diff --git a/native_client/README.md b/native_client/README.md index 7e819761..afa8d3d7 100644 --- a/native_client/README.md +++ b/native_client/README.md @@ -137,9 +137,9 @@ And your command line for `LePotato` and `ARM64` should look like: bazel build --workspace_status_command="bash native_client/bazel_workspace_status_cmd.sh" --config=monolithic --config=rpi3-armv8 --config=rpi3-armv8_opt -c opt --copt=-O3 --copt=-fvisibility=hidden //native_client:libdeepspeech.so //native_client:generate_trie ``` -While we test only on RPi3 Raspbian Stretch and LePotato ARMBian stretch, anything compatible with `armv7-a cortex-a53` or `armv8-a cortex-a53` should be fine. +While we test only on RPi3 Raspbian Buster and LePotato ARMBian Buster, anything compatible with `armv7-a cortex-a53` or `armv8-a cortex-a53` should be fine. -The `deepspeech` binary can also be cross-built, with `TARGET=rpi3` or `TARGET=rpi3-armv8`. This might require you to setup a system tree using the tool `multistrap` and the multitrap configuration files: `native_client/multistrap_armbian64_stretch.conf` and `native_client/multistrap_raspbian_stretch.conf`. +The `deepspeech` binary can also be cross-built, with `TARGET=rpi3` or `TARGET=rpi3-armv8`. This might require you to setup a system tree using the tool `multistrap` and the multitrap configuration files: `native_client/multistrap_armbian64_buster.conf` and `native_client/multistrap_raspbian_buster.conf`. The path of the system tree can be overridden from the default values defined in `definitions.mk` through the `RASPBIAN` `make` variable. ``` diff --git a/native_client/definitions.mk b/native_client/definitions.mk index eb0d6611..04e6d0c5 100644 --- a/native_client/definitions.mk +++ b/native_client/definitions.mk @@ -70,7 +70,7 @@ endif # ($(TARGET),rpi3) ifeq ($(TARGET),rpi3-armv8) TOOLCHAIN ?= ${TFDIR}/bazel-$(shell basename "${TFDIR}")/external/LinaroAarch64Gcc72/bin/aarch64-linux-gnu- -RASPBIAN ?= $(abspath $(NC_DIR)/../multistrap-raspbian64-stretch) +RASPBIAN ?= $(abspath $(NC_DIR)/../multistrap-raspbian64-buster) CFLAGS := -march=armv8-a -mtune=cortex-a53 -D_GLIBCXX_USE_CXX11_ABI=0 --sysroot $(RASPBIAN) CXXFLAGS := $(CFLAGS) LDFLAGS := -Wl,-rpath-link,$(RASPBIAN)/lib/aarch64-linux-gnu/ -Wl,-rpath-link,$(RASPBIAN)/usr/lib/aarch64-linux-gnu/ @@ -80,8 +80,9 @@ SOX_LDFLAGS := $(RASPBIAN)/usr/lib/aarch64-linux-gnu/libsox.so PYVER := $(shell python -c "import platform; maj, min, _ = platform.python_version_tuple(); print(maj+'.'+min);") PYTHON_PACKAGES := -PYTHON_PATH := PYTHONPATH=$(RASPBIAN)/usr/lib/python$(PYVER)/:$(RASPBIAN)/usr/lib/python$(PYVER)/plat-aarch64-linux-gnu/:$(RASPBIAN)/usr/lib/python3/dist-packages/ -NUMPY_INCLUDE := NUMPY_INCLUDE=$(RASPBIAN)/usr/include/python3.5/ +PYTHON_PATH := PYTHONPATH=$(RASPBIAN)/usr/lib/python$(PYVER)/:$(RASPBIAN)/usr/lib/python3/dist-packages/ +PYTHON_SYSCONFIGDATA := _PYTHON_SYSCONFIGDATA_NAME=_sysconfigdata_m_linux_aarch64-linux-gnu +NUMPY_INCLUDE := NUMPY_INCLUDE=$(RASPBIAN)/usr/include/python3.7/ PYTHON_PLATFORM_NAME := --plat-name linux_aarch64 NODE_PLATFORM_TARGET := --target_arch=arm64 --target_platform=linux TOOLCHAIN_LDD_OPTS := --root $(RASPBIAN)/ diff --git a/native_client/multistrap_armbian64_stretch.conf b/native_client/multistrap_armbian64_buster.conf similarity index 57% rename from native_client/multistrap_armbian64_stretch.conf rename to native_client/multistrap_armbian64_buster.conf index 9c7f5f34..a03b95a9 100644 --- a/native_client/multistrap_armbian64_stretch.conf +++ b/native_client/multistrap_armbian64_buster.conf @@ -7,8 +7,8 @@ aptsources=Debian cleanup=true [Debian] -packages=libc6 libc6-dev libstdc++-6-dev linux-libc-dev libpython2.7-dev libpython3.5-dev libsox-dev python-numpy +packages=libc6 libc6-dev libstdc++-7-dev linux-libc-dev libffi-dev libpython3.7-dev libsox-dev python3-numpy python3-setuptools source=http://deb.debian.org/debian keyring=debian-archive-keyring components=main -suite=stretch +suite=buster diff --git a/native_client/multistrap_raspbian_stretch.conf b/native_client/multistrap_raspbian_stretch.conf deleted file mode 100644 index d8f8ffb5..00000000 --- a/native_client/multistrap_raspbian_stretch.conf +++ /dev/null @@ -1,14 +0,0 @@ -[General] -arch=armhf -noauth=true -unpack=true -debootstrap=Raspbian -aptsources=Raspbian -cleanup=true - -[Raspbian] -packages=libc6 libc6-dev libstdc++-6-dev linux-libc-dev libpython3.4-dev libpython3.5-dev libsox-dev python3-numpy python3-setuptools -source=http://raspbian.raspberrypi.org/raspbian/ -keyring=raspbian-archive-keyring -components=main -suite=stretch diff --git a/taskcluster/.shared.yml b/taskcluster/.shared.yml index d8d5c662..5881974e 100644 --- a/taskcluster/.shared.yml +++ b/taskcluster/.shared.yml @@ -1,10 +1,8 @@ python: packages_trusty: apt: 'make build-essential libssl-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev liblzma-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev libpng-dev libsox-dev libmagic-dev libgsm1-dev libltdl-dev' - packages_stretch: - apt: 'make build-essential libssl1.0-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev' packages_buster: - apt: 'make build-essential libssl1.0-dev libffi-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev' + apt: 'make build-essential libssl-dev libffi-dev zlib1g-dev libbz2-dev libreadline-dev libsqlite3-dev curl llvm libncurses5-dev libncursesw5-dev xz-utils tk-dev' brew: setup: 'install_local_homebrew "python-ds-test" && install_pkg_local_homebrew "sox" && install_pkg_local_homebrew "readline" && install_pkg_local_homebrew "openssl" && install_pkg_local_homebrew "pkg-config"' env: 'export EXTRA_ENV="PATH=$TASKCLUSTER_TASK_DIR/python-ds-test.brew/bin/:$PATH"' @@ -27,18 +25,18 @@ nodejs: prep_10: 'echo "deb http://deb.nodesource.com/node_10.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' prep_11: 'echo "deb http://deb.nodesource.com/node_11.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' prep_12: 'echo "deb http://deb.nodesource.com/node_12.x xenial main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' - packages_stretch: + packages_buster: apt: 'nodejs sox' apt_pinning: '(echo "Package: nodejs" && echo "Pin: origin deb.nodesource.com" && echo "Pin-Priority: 999") > /etc/apt/preferences' - prep_4: 'echo "deb http://deb.nodesource.com/node_4.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' - prep_5: 'echo "deb http://deb.nodesource.com/node_5.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' - prep_6: 'echo "deb http://deb.nodesource.com/node_6.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' - prep_7: 'echo "deb http://deb.nodesource.com/node_7.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' - prep_8: 'echo "deb http://deb.nodesource.com/node_8.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' - prep_9: 'echo "deb http://deb.nodesource.com/node_9.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' - prep_10: 'echo "deb http://deb.nodesource.com/node_10.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' - prep_11: 'echo "deb http://deb.nodesource.com/node_11.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' - prep_12: 'echo "deb http://deb.nodesource.com/node_12.x stretch main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' + prep_4: 'echo "deb http://deb.nodesource.com/node_4.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' + prep_5: 'echo "deb http://deb.nodesource.com/node_5.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' + prep_6: 'echo "deb http://deb.nodesource.com/node_6.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' + prep_7: 'echo "deb http://deb.nodesource.com/node_7.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' + prep_8: 'echo "deb http://deb.nodesource.com/node_8.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' + prep_9: 'echo "deb http://deb.nodesource.com/node_9.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' + prep_10: 'echo "deb http://deb.nodesource.com/node_10.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' + prep_11: 'echo "deb http://deb.nodesource.com/node_11.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' + prep_12: 'echo "deb http://deb.nodesource.com/node_12.x buster main" > /etc/apt/sources.list.d/nodesource.list && wget -qO- https://deb.nodesource.com/gpgkey/nodesource.gpg.key | apt-key add -' brew: # Using 'nvm' from homebrew results in installing v0.33.6 which seems to # suffer from a bug making it unable to work as of now: diff --git a/taskcluster/arm64-build.sh b/taskcluster/arm64-build.sh index 0a751d20..4f0f7d8c 100644 --- a/taskcluster/arm64-build.sh +++ b/taskcluster/arm64-build.sh @@ -14,7 +14,7 @@ BAZEL_TARGETS=" BAZEL_BUILD_FLAGS="${BAZEL_ARM64_FLAGS} ${BAZEL_EXTRA_FLAGS}" BAZEL_ENV_FLAGS="TF_NEED_CUDA=0" SYSTEM_TARGET=rpi3-armv8 -SYSTEM_RASPBIAN=/tmp/multistrap-armbian64-stretch +SYSTEM_RASPBIAN=/tmp/multistrap-armbian64-buster maybe_install_xldd @@ -22,7 +22,7 @@ do_bazel_build do_deepspeech_binary_build -export SUPPORTED_PYTHON_VERSIONS="3.5.3:ucs4" +export SUPPORTED_PYTHON_VERSIONS="3.7.3:ucs4" do_deepspeech_python_build do_deepspeech_nodejs_build diff --git a/taskcluster/build-python-wheel.tyml b/taskcluster/build-python-wheel.tyml index 6b5ff1c5..9a0c4972 100644 --- a/taskcluster/build-python-wheel.tyml +++ b/taskcluster/build-python-wheel.tyml @@ -27,14 +27,14 @@ then: payload: maxRunTime: 14400 - image: "arm64v8/debian:stretch-20180312" + image: "arm64v8/debian:buster-20190812" command: - "/bin/bash" - "--login" - "-cxe" - > - apt-get -qq update && apt-get -qq -y install libopenblas-dev liblapack-dev gnupg pixz sudo wget python3.5-minimal python3-pip python3-wheel python3-setuptools && + apt-get -qq update && apt-get -qq -y install libopenblas-dev liblapack-dev gnupg pixz sudo wget python3.7-minimal python3-pip python3-wheel python3-setuptools && mkdir -p /opt/wheels /tmp/artifacts && cd /opt/wheels && pip3 wheel --verbose --wheel-dir /tmp/artifacts/ --build $(pwd)/ --no-binary :all: numpy && diff --git a/taskcluster/linux-arm64-cpu-opt.yml b/taskcluster/linux-arm64-cpu-opt.yml index ae7da4ae..a63774e3 100644 --- a/taskcluster/linux-arm64-cpu-opt.yml +++ b/taskcluster/linux-arm64-cpu-opt.yml @@ -16,7 +16,7 @@ build: apt-get -qq -y install ${python.packages_trusty.apt} && ${swig.packages.install_script} system_config: > - multistrap -d /tmp/multistrap-armbian64-stretch/ -f ${system.homedir.linux}/DeepSpeech/ds/native_client/multistrap_armbian64_stretch.conf && + multistrap -d /tmp/multistrap-armbian64-buster/ -f ${system.homedir.linux}/DeepSpeech/ds/native_client/multistrap_armbian64_buster.conf && ${swig.patch_nodejs.linux} scripts: build: "taskcluster/arm64-build.sh" diff --git a/taskcluster/tc-tests-utils.sh b/taskcluster/tc-tests-utils.sh index 8c158d36..a2b4bcd2 100755 --- a/taskcluster/tc-tests-utils.sh +++ b/taskcluster/tc-tests-utils.sh @@ -1037,7 +1037,7 @@ maybe_numpy_min_version_winamd64() ;; 3.7*) export NUMPY_BUILD_VERSION="==1.14.5" - export NUMPY_DEP_VERSION=">=1.14.5,<1.16.0" + export NUMPY_DEP_VERSION=">=1.14.5,<=1.17.0" ;; esac } diff --git a/taskcluster/test-armbian-opt-base.tyml b/taskcluster/test-armbian-opt-base.tyml index 3cf9e437..1e9ce923 100644 --- a/taskcluster/test-armbian-opt-base.tyml +++ b/taskcluster/test-armbian-opt-base.tyml @@ -27,7 +27,7 @@ then: payload: maxRunTime: { $eval: to_int(build.maxRunTime) } - image: "arm64v8/debian:stretch-20180312" + image: "arm64v8/debian:buster-20190812" env: $let: @@ -42,7 +42,7 @@ then: DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.4/output_graph.pbmm PIP_DEFAULT_TIMEOUT: "60" PIP_EXTRA_INDEX_URL: "https://lissyx.github.io/deepspeech-python-wheels/" - EXTRA_PYTHON_CONFIGURE_OPTS: "--with-fpectl" # Required by Debian Stretch + EXTRA_PYTHON_CONFIGURE_OPTS: "" # Required by Debian Buster EXPECTED_TENSORFLOW_VERSION: "${build.tensorflow_git_desc}" command: diff --git a/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml index 1abe1991..156d7ff8 100644 --- a/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_10x-armbian-arm64-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_10} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_10} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x" metadata: diff --git a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml index 9fb93e3b..a08662fc 100644 --- a/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_10x-raspbian-rpi3-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_10} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_10} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 10.x" metadata: diff --git a/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml index 2bff9341..9ae12b33 100644 --- a/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_11x-armbian-arm64-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_11} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_11} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x" metadata: diff --git a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml index b574080e..76f2c76e 100644 --- a/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_11x-raspbian-rpi3-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_11} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_11} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 11.x" metadata: diff --git a/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml index f5fdb63b..75966fa2 100644 --- a/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_12x-armbian-arm64-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_12} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_12} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x" metadata: diff --git a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml index 2eee08a9..25d5621d 100644 --- a/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_12x-raspbian-rpi3-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_12} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_12} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 12.x" metadata: diff --git a/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml index 41869ef4..7939f793 100644 --- a/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_4x-armbian-arm64-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_4} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_4} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x" metadata: diff --git a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml index 877db974..640f8830 100644 --- a/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_4x-raspbian-rpi3-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_4} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_4} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 4.x" metadata: diff --git a/taskcluster/test-nodejs_5x-armbian-arm64-opt.yml-disabled b/taskcluster/test-nodejs_5x-armbian-arm64-opt.yml-disabled deleted file mode 100644 index c874be68..00000000 --- a/taskcluster/test-nodejs_5x-armbian-arm64-opt.yml-disabled +++ /dev/null @@ -1,13 +0,0 @@ -build: - template_file: test-armbian-opt-base.tyml - dependencies: - - "node-package-cpu" - - "test-training_upstream-linux-amd64-py35m-opt" - system_setup: - > - ${nodejs.packages_stretch.prep_5} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x" - metadata: - name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU NodeJS 5.x tests" - description: "Testing DeepSpeech forARMbian ARM64 Cortex-A53 on NodeJS v5.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_5x-raspbian-rpi3-opt.yml-disabled b/taskcluster/test-nodejs_5x-raspbian-rpi3-opt.yml-disabled deleted file mode 100644 index d49a18ea..00000000 --- a/taskcluster/test-nodejs_5x-raspbian-rpi3-opt.yml-disabled +++ /dev/null @@ -1,13 +0,0 @@ -build: - template_file: test-raspbian-opt-base.tyml - dependencies: - - "node-package-cpu" - - "test-training_upstream-linux-amd64-py35m-opt" - system_setup: - > - ${nodejs.packages_stretch.prep_5} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 5.x" - metadata: - name: "DeepSpeech Raspbian RPi3/ARMv7 CPU NodeJS 5.x tests" - description: "Testing DeepSpeech for Raspbian RPi3/ARMv7 on NodeJS v5.x, CPU only, optimized version" diff --git a/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml index b8c14d01..81d2fe19 100644 --- a/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_6x-armbian-arm64-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_6} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_6} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x" metadata: diff --git a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml index 1775d20b..18fefd48 100644 --- a/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_6x-raspbian-rpi3-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_6} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_6} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 6.x" metadata: diff --git a/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml index a0390e78..f1488399 100644 --- a/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_7x-armbian-arm64-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_7} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_7} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x" metadata: diff --git a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml index 94152b17..1c547533 100644 --- a/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_7x-raspbian-rpi3-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_7} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_7} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 7.x" metadata: diff --git a/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml index b239f8c4..52394f9c 100644 --- a/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_8x-armbian-arm64-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_8} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_8} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x" metadata: diff --git a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml index c7e88e40..92375870 100644 --- a/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_8x-raspbian-rpi3-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_8} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_8} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 8.x" metadata: diff --git a/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml b/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml index afae0786..73e5052e 100644 --- a/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml +++ b/taskcluster/test-nodejs_9x-armbian-arm64-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_9} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_9} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x" metadata: diff --git a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml index 4fb7919a..05b16277 100644 --- a/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml +++ b/taskcluster/test-nodejs_9x-raspbian-rpi3-opt.yml @@ -5,7 +5,7 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - ${nodejs.packages_stretch.prep_9} && ${nodejs.packages_stretch.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_stretch.apt} + ${nodejs.packages_buster.prep_9} && ${nodejs.packages_buster.apt_pinning} && apt-get -qq update && apt-get -qq -y install ${nodejs.packages_buster.apt} args: tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-node-tests.sh 9.x" metadata: diff --git a/taskcluster/test-python_35m-armbian-arm64-opt.yml b/taskcluster/test-python_35m-armbian-arm64-opt.yml deleted file mode 100644 index 9a434c39..00000000 --- a/taskcluster/test-python_35m-armbian-arm64-opt.yml +++ /dev/null @@ -1,13 +0,0 @@ -build: - template_file: test-armbian-opt-base.tyml - dependencies: - - "linux-arm64-cpu-opt" - - "test-training_upstream-linux-amd64-py35m-opt" - system_setup: - > - apt-get -qq -y install ${python.packages_stretch.apt} - args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.5.5:m" - metadata: - name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU Python v3.5 tests" - description: "Testing DeepSpeech for ARMbian ARM64 Cortex-A53 on Python v3.5, CPU only, optimized version" diff --git a/taskcluster/test-python_34m-armbian-arm64-opt.yml-disabled b/taskcluster/test-python_37m-armbian-arm64-opt.yml similarity index 61% rename from taskcluster/test-python_34m-armbian-arm64-opt.yml-disabled rename to taskcluster/test-python_37m-armbian-arm64-opt.yml index 3017956a..71facc57 100644 --- a/taskcluster/test-python_34m-armbian-arm64-opt.yml-disabled +++ b/taskcluster/test-python_37m-armbian-arm64-opt.yml @@ -5,9 +5,9 @@ build: - "test-training_upstream-linux-amd64-py35m-opt" system_setup: > - apt-get -qq -y install ${python.packages_stretch.apt} + apt-get -qq -y install ${python.packages_buster.apt} args: - tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.4.8:m" + tests_cmdline: "${system.homedir.linux}/DeepSpeech/ds/taskcluster/tc-python-tests.sh 3.7.3:m" metadata: - name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU Python v3.4 tests" - description: "Testing DeepSpeech for ARMbian ARM64 Cortex-A53 on Python v3.4, CPU only, optimized version" + name: "DeepSpeech ARMbian ARM64 Cortex-A53 CPU Python v3.7 tests" + description: "Testing DeepSpeech for ARMbian ARM64 Cortex-A53 on Python v3.7, CPU only, optimized version" diff --git a/taskcluster/test-raspbian-opt-base.tyml b/taskcluster/test-raspbian-opt-base.tyml index 5abdda6e..555f8751 100644 --- a/taskcluster/test-raspbian-opt-base.tyml +++ b/taskcluster/test-raspbian-opt-base.tyml @@ -42,7 +42,7 @@ then: DEEPSPEECH_PROD_MODEL_MMAP: https://github.com/reuben/DeepSpeech/releases/download/v0.6.0-alpha.4/output_graph.pbmm PIP_DEFAULT_TIMEOUT: "60" PIP_EXTRA_INDEX_URL: "https://www.piwheels.org/simple" - EXTRA_PYTHON_CONFIGURE_OPTS: "--with-fpectl" # Required by Raspbian Stretch / PiWheels + EXTRA_PYTHON_CONFIGURE_OPTS: "" # Required by Raspbian Buster / PiWheels EXPECTED_TENSORFLOW_VERSION: "${build.tensorflow_git_desc}" command: