This is an automated email from the ASF dual-hosted git repository.
masahi pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/tvm.git
The following commit(s) were added to refs/heads/main by this push:
new 0dae36048e [CI] Update CPU image to install PyTorch (#14847)
0dae36048e is described below
commit 0dae36048e2415bce05405124666d3be954da8e4
Author: masahi <[email protected]>
AuthorDate: Sat May 20 18:09:41 2023 +0900
[CI] Update CPU image to install PyTorch (#14847)
* [CI] Update CPU image to install PyTorch
* use link-static to prevent symbol conflict problem
* tlcpackstaging -> tlcpack
* disable tvmc pth tests for now
* fixed skip marker
---
ci/jenkins/docker-images.ini | 20 ++++++++++----------
tests/python/driver/tvmc/test_frontends.py | 10 ++++------
tests/scripts/task_config_build_cpu.sh | 2 +-
3 files changed, 15 insertions(+), 17 deletions(-)
diff --git a/ci/jenkins/docker-images.ini b/ci/jenkins/docker-images.ini
index 6174aef8a4..5de69a5c61 100644
--- a/ci/jenkins/docker-images.ini
+++ b/ci/jenkins/docker-images.ini
@@ -17,13 +17,13 @@
# This data file is read during when Jenkins runs job to determine docker
images.
[jenkins]
-ci_arm: tlcpackstaging/ci_arm:20230504-142417-4d37a0a0
-ci_cortexm: tlcpackstaging/ci_cortexm:20230504-142417-4d37a0a0
-ci_cpu: tlcpackstaging/ci_cpu:20230504-142417-4d37a0a0
-ci_gpu: tlcpackstaging/ci_gpu:20230504-142417-4d37a0a0
-ci_hexagon: tlcpackstaging/ci_hexagon:20230504-142417-4d37a0a0
-ci_i386: tlcpackstaging/ci_i386:20230504-142417-4d37a0a0
-ci_lint: tlcpackstaging/ci_lint:20230504-142417-4d37a0a0
-ci_minimal: tlcpackstaging/ci_minimal:20230504-142417-4d37a0a0
-ci_riscv: tlcpackstaging/ci_riscv:20230504-142417-4d37a0a0
-ci_wasm: tlcpackstaging/ci_wasm:20230504-142417-4d37a0a0
+ci_arm: tlcpack/ci-arm:20230504-142417-4d37a0a0
+ci_cortexm: tlcpack/ci-cortexm:20230504-142417-4d37a0a0
+ci_cpu: tlcpack/ci-cpu:20230513-200357-e54bbc73
+ci_gpu: tlcpack/ci-gpu:20230504-142417-4d37a0a0
+ci_hexagon: tlcpack/ci-hexagon:20230504-142417-4d37a0a0
+ci_i386: tlcpack/ci-i386:20230504-142417-4d37a0a0
+ci_lint: tlcpack/ci-lint:20230504-142417-4d37a0a0
+ci_minimal: tlcpack/ci-minimal:20230504-142417-4d37a0a0
+ci_riscv: tlcpack/ci-riscv:20230504-142417-4d37a0a0
+ci_wasm: tlcpack/ci-wasm:20230504-142417-4d37a0a0
diff --git a/tests/python/driver/tvmc/test_frontends.py
b/tests/python/driver/tvmc/test_frontends.py
index 718babd15c..e7d0a1d4df 100644
--- a/tests/python/driver/tvmc/test_frontends.py
+++ b/tests/python/driver/tvmc/test_frontends.py
@@ -237,9 +237,8 @@ def
test_load_model___wrong_language__to_onnx(tflite_mobilenet_v1_1_quant):
tvmc.load(tflite_mobilenet_v1_1_quant, model_format="onnx")
[email protected](
- platform.machine() == "aarch64",
- reason="Currently failing on AArch64 - see
https://github.com/apache/tvm/issues/10673";,
[email protected](
+ reason="free(): invalid pointer error despite using llvm-config
--link-static and -DHIDE_PRIVATE_SYMBOLS=ON",
)
def test_load_model__pth(pytorch_resnet18):
# some CI environments wont offer torch, so skip in case it is not present
@@ -254,9 +253,8 @@ def test_load_model__pth(pytorch_resnet18):
assert "layer1.0.conv1.weight" in tvmc_model.params.keys()
[email protected](
- platform.machine() == "aarch64",
- reason="Currently failing on AArch64 - see
https://github.com/apache/tvm/issues/10673";,
[email protected](
+ reason="free(): invalid pointer error despite using llvm-config
--link-static and -DHIDE_PRIVATE_SYMBOLS=ON",
)
def test_load_quantized_model__pth(pytorch_mobilenetv2_quantized):
# some CI environments wont offer torch, so skip in case it is not present
diff --git a/tests/scripts/task_config_build_cpu.sh
b/tests/scripts/task_config_build_cpu.sh
index 7f7438bcca..899c27d673 100755
--- a/tests/scripts/task_config_build_cpu.sh
+++ b/tests/scripts/task_config_build_cpu.sh
@@ -29,7 +29,7 @@ echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
echo set\(USE_PROFILER ON\) >> config.cmake
echo set\(USE_DNNL ON\) >> config.cmake
echo set\(USE_ARM_COMPUTE_LIB ON\) >> config.cmake
-echo set\(USE_LLVM llvm-config-15\) >> config.cmake
+echo set\(USE_LLVM \"/usr/bin/llvm-config-15 --link-static\"\) >> config.cmake
echo set\(USE_NNPACK ON\) >> config.cmake
echo set\(NNPACK_PATH /NNPACK/build/\) >> config.cmake
echo set\(USE_ANTLR ON\) >> config.cmake
