Skip to content

Commit 4032e59

Browse files
committed
[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. Finally, it standadises the minimum CMake version required in CI to be 3.18.4, fixing apps/microtvm/zephyr_cmsisnn to require this version. Change-Id: If195ede669ba2d740f3251e6c93da6622b83f132
1 parent cb08a12 commit 4032e59

File tree

3 files changed

+30
-21
lines changed

3 files changed

+30
-21
lines changed

Jenkinsfile

Lines changed: 10 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ci/jenkins/Jenkinsfile.j2

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -51,16 +51,16 @@ import org.jenkinsci.plugins.pipeline.modeldefinition.Utils
5151
{% import 'ci/jenkins/macros.j2' as m with context -%}
5252

5353
// NOTE: these lines are scanned by docker/dev_common.sh. Please update the regex as needed. -->
54-
ci_lint = 'tlcpack/ci-lint:20220810-060142-fae79bbc3'
55-
ci_gpu = 'tlcpack/ci-gpu:20220810-060142-fae79bbc3'
56-
ci_cpu = 'tlcpack/ci-cpu:20220810-060142-fae79bbc3'
57-
ci_minimal = 'tlcpack/ci-minimal:20220725-133226-d3cefdaf1'
58-
ci_wasm = 'tlcpack/ci-wasm:20220810-060142-fae79bbc3'
59-
ci_i386 = 'tlcpack/ci-i386:20220810-060142-fae79bbc3'
60-
ci_cortexm = 'tlcpack/ci-cortexm:20220810-060142-fae79bbc3'
61-
ci_arm = 'tlcpack/ci-arm:20220810-060142-fae79bbc3'
62-
ci_hexagon = 'tlcpack/ci-hexagon:20220825-145056-fb7cf97f'
63-
ci_riscv = 'tlcpack/ci-riscv:20220810-060142-fae79bbc3'
54+
ci_lint = 'tlcpack/ci-lint:20220908-060034-62bdc91b1'
55+
ci_gpu = 'tlcpack/ci-gpu:20220908-060034-62bdc91b1'
56+
ci_cpu = 'tlcpack/ci-cpu:20220908-060034-62bdc91b1'
57+
ci_minimal = 'tlcpack/ci-minimal:20220908-060034-62bdc91b1'
58+
ci_wasm = 'tlcpack/ci-wasm:20220908-060034-62bdc91b1'
59+
ci_i386 = 'tlcpack/ci-i386:20220908-060034-62bdc91b1'
60+
ci_cortexm = 'tlcpack/ci-cortexm:20220909-090211-cb08a1251'
61+
ci_arm = 'tlcpack/ci-arm:20220908-060034-62bdc91b1'
62+
ci_hexagon = 'tlcpack/ci-hexagon:20220908-060034-62bdc91b1'
63+
ci_riscv = 'tlcpack/ci-riscv:20220908-060034-62bdc91b1'
6464
// <--- End of regex-scanned config.
6565

6666
// Parameters to allow overriding (in Jenkins UI), the images

tests/scripts/task_config_build_cpu.sh

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,16 @@ echo set\(CMAKE_CXX_FLAGS -Werror\) >> config.cmake
3737
echo set\(HIDE_PRIVATE_SYMBOLS ON\) >> config.cmake
3838
echo set\(USE_VTA_TSIM ON\) >> config.cmake
3939
echo set\(USE_VTA_FSIM ON\) >> config.cmake
40-
echo set\(USE_TFLITE ON\) >> config.cmake
40+
41+
# This conditional is just to support the transition to cope
42+
# with the change in the way TFLite is built. It can be
43+
# removed once we migrate to TensorFlow and TFLite > 2.9.1
44+
if [ -d "/opt/tflite" ]; then
45+
echo set\(USE_TFLITE \"/opt/tflite\"\) >> config.cmake
46+
else
47+
echo set\(USE_TFLITE ON\) >> config.cmake
48+
fi
49+
4150
echo set\(USE_TENSORFLOW_PATH \"/tensorflow\"\) >> config.cmake
4251
echo set\(USE_FLATBUFFERS_PATH \"/flatbuffers\"\) >> config.cmake
4352
echo set\(USE_ETHOSN /opt/arm/ethosn-driver\) >> config.cmake

0 commit comments

Comments
 (0)