Skip to content

Commit

Permalink
[CI] Update CPU image to install PyTorch (#14847)
Browse files Browse the repository at this point in the history
* [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
  • Loading branch information
masahi authored May 20, 2023
1 parent 8ebd598 commit 0dae360
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 17 deletions.
20 changes: 10 additions & 10 deletions ci/jenkins/docker-images.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
10 changes: 4 additions & 6 deletions tests/python/driver/tvmc/test_frontends.py
Original file line number Diff line number Diff line change
Expand Up @@ -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")


@pytest.mark.skipif(
platform.machine() == "aarch64",
reason="Currently failing on AArch64 - see https://github.com/apache/tvm/issues/10673",
@pytest.mark.skip(
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
Expand All @@ -254,9 +253,8 @@ def test_load_model__pth(pytorch_resnet18):
assert "layer1.0.conv1.weight" in tvmc_model.params.keys()


@pytest.mark.skipif(
platform.machine() == "aarch64",
reason="Currently failing on AArch64 - see https://github.com/apache/tvm/issues/10673",
@pytest.mark.skip(
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
Expand Down
2 changes: 1 addition & 1 deletion tests/scripts/task_config_build_cpu.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 0dae360

Please sign in to comment.