This is an automated email from the ASF dual-hosted git repository. leandron pushed a commit to branch update_docker_tf291 in repository https://gitbox.apache.org/repos/asf/tvm.git
commit 1a94c9224fb51a81e269508269cbaed86b3c2795 Author: Leandro Nunes <[email protected]> AuthorDate: Thu Sep 8 16:11:30 2022 +0100 [CI] Update Docker images to tag 20220908-060034-62bdc91b1 Updates all Docker images to tag 20220908-060034-62bdc91b1, to update TensorFlow/TFLite/Keras to 2.9, and cascaded dependencies such as numpy. Updates ethos-u-vela to 3.4.0. It also brings ONNX and PyTorch to ci_arm, to enable Integration tests to be run in CI. Change-Id: If195ede669ba2d740f3251e6c93da6622b83f132 --- Jenkinsfile | 20 ++++++++++---------- ci/jenkins/Jenkinsfile.j2 | 20 ++++++++++---------- tests/scripts/task_config_build_cpu.sh | 11 ++++++++++- 3 files changed, 30 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 78071fde45..22ff267d0d 100755 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -49,16 +49,16 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> -ci_lint = 'tlcpack/ci-lint:20220810-060142-fae79bbc3' -ci_gpu = 'tlcpack/ci-gpu:20220810-060142-fae79bbc3' -ci_cpu = 'tlcpack/ci-cpu:20220810-060142-fae79bbc3' -ci_minimal = 'tlcpack/ci-minimal:20220725-133226-d3cefdaf1' -ci_wasm = 'tlcpack/ci-wasm:20220810-060142-fae79bbc3' -ci_i386 = 'tlcpack/ci-i386:20220810-060142-fae79bbc3' -ci_cortexm = 'tlcpack/ci-cortexm:20220810-060142-fae79bbc3' -ci_arm = 'tlcpack/ci-arm:20220810-060142-fae79bbc3' -ci_hexagon = 'tlcpack/ci-hexagon:20220825-145056-fb7cf97f' -ci_riscv = 'tlcpack/ci-riscv:20220810-060142-fae79bbc3' +ci_lint = 'tlcpack/ci-lint:20220908-060034-62bdc91b1' +ci_gpu = 'tlcpack/ci-gpu:20220908-060034-62bdc91b1' +ci_cpu = 'tlcpack/ci-cpu:20220908-060034-62bdc91b1' +ci_minimal = 'tlcpack/ci-minimal:20220908-060034-62bdc91b1' +ci_wasm = 'tlcpack/ci-wasm:20220908-060034-62bdc91b1' +ci_i386 = 'tlcpack/ci-i386:20220908-060034-62bdc91b1' +ci_cortexm = 'tlcpack/ci-cortexm:20220908-060034-62bdc91b1' +ci_arm = 'tlcpack/ci-arm:20220908-060034-62bdc91b1' +ci_hexagon = 'tlcpack/ci-hexagon:20220908-060034-62bdc91b1' +ci_riscv = 'tlcpack/ci-riscv:20220908-060034-62bdc91b1' // <--- End of regex-scanned config. // Parameters to allow overriding (in Jenkins UI), the images diff --git a/ci/jenkins/Jenkinsfile.j2 b/ci/jenkins/Jenkinsfile.j2 index c932431a44..580dc1dfd3 100644 --- a/ci/jenkins/Jenkinsfile.j2 +++ b/ci/jenkins/Jenkinsfile.j2 @@ -51,16 +51,16 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils {% import 'ci/jenkins/macros.j2' as m with context -%} // NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. --> -ci_lint = 'tlcpack/ci-lint:20220810-060142-fae79bbc3' -ci_gpu = 'tlcpack/ci-gpu:20220810-060142-fae79bbc3' -ci_cpu = 'tlcpack/ci-cpu:20220810-060142-fae79bbc3' -ci_minimal = 'tlcpack/ci-minimal:20220725-133226-d3cefdaf1' -ci_wasm = 'tlcpack/ci-wasm:20220810-060142-fae79bbc3' -ci_i386 = 'tlcpack/ci-i386:20220810-060142-fae79bbc3' -ci_cortexm = 'tlcpack/ci-cortexm:20220810-060142-fae79bbc3' -ci_arm = 'tlcpack/ci-arm:20220810-060142-fae79bbc3' -ci_hexagon = 'tlcpack/ci-hexagon:20220825-145056-fb7cf97f' -ci_riscv = 'tlcpack/ci-riscv:20220810-060142-fae79bbc3' +ci_lint = 'tlcpack/ci-lint:20220908-060034-62bdc91b1' +ci_gpu = 'tlcpack/ci-gpu:20220908-060034-62bdc91b1' +ci_cpu = 'tlcpack/ci-cpu:20220908-060034-62bdc91b1' +ci_minimal = 'tlcpack/ci-minimal:20220908-060034-62bdc91b1' +ci_wasm = 'tlcpack/ci-wasm:20220908-060034-62bdc91b1' +ci_i386 = 'tlcpack/ci-i386:20220908-060034-62bdc91b1' +ci_cortexm = 'tlcpack/ci-cortexm:20220908-060034-62bdc91b1' +ci_arm = 'tlcpack/ci-arm:20220908-060034-62bdc91b1' +ci_hexagon = 'tlcpack/ci-hexagon:20220908-060034-62bdc91b1' +ci_riscv = 'tlcpack/ci-riscv:20220908-060034-62bdc91b1' // <--- End of regex-scanned config. // Parameters to allow overriding (in Jenkins UI), the images diff --git a/tests/scripts/task_config_build_cpu.sh b/tests/scripts/task_config_build_cpu.sh index 9dc5c62efa..7f48839f23 100755 --- a/tests/scripts/task_config_build_cpu.sh +++ b/tests/scripts/task_config_build_cpu.sh @@ -37,7 +37,16 @@ echo set\(CMAKE_CXX_FLAGS -Werror\) >> config.cmake echo set\(HIDE_PRIVATE_SYMBOLS ON\) >> config.cmake echo set\(USE_VTA_TSIM ON\) >> config.cmake echo set\(USE_VTA_FSIM ON\) >> config.cmake -echo set\(USE_TFLITE ON\) >> config.cmake + +# This conditional is just to support the transition to cope +# with the change in the way TFLite is built. It can be +# removed once we migrate to TensorFlow and TFLite > 2.9.1 +if [ -d "/opt/tflite" ]; then + echo set\(USE_TFLITE \"/opt/tflite\"\) >> config.cmake +else + echo set\(USE_TFLITE ON\) >> config.cmake +fi + echo set\(USE_TENSORFLOW_PATH \"/tensorflow\"\) >> config.cmake echo set\(USE_FLATBUFFERS_PATH \"/flatbuffers\"\) >> config.cmake echo set\(USE_ETHOSN /opt/arm/ethosn-driver\) >> config.cmake
