[tvm] branch main updated: [Docker] Migrate arm docker image to use llvm packages (#15067)

[lukhut]

This is an automated email from the ASF dual-hosted git repository.

lukhut 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 7842de3aab [Docker] Migrate arm docker image to use llvm packages 
(#15067)
7842de3aab is described below

commit 7842de3aaba2d180a9bdae9df49af968e951d639
Author: neildhickey <neil.hic...@arm.com>
AuthorDate: Wed Jun 14 13:57:13 2023 +0100

    [Docker] Migrate arm docker image to use llvm packages (#15067)
    
    ci_arm was building llvm from source but this should no longer be required 
now we've update to Ubuntu 20.04
    
    This also updates arm llvm package to 16
---
 docker/Dockerfile.ci_arm               | 4 ++--
 tests/scripts/task_config_build_arm.sh | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker/Dockerfile.ci_arm b/docker/Dockerfile.ci_arm
index 8c6c83d5e8..f18d95daac 100644
--- a/docker/Dockerfile.ci_arm
+++ b/docker/Dockerfile.ci_arm
@@ -50,8 +50,8 @@ COPY install/ubuntu_install_sccache.sh 
/install/ubuntu_install_sccache.sh
 RUN bash /install/ubuntu_install_sccache.sh
 ENV PATH /opt/sccache:$PATH
 
-COPY install/ubuntu_install_llvm_from_source.sh 
/install/ubuntu_install_llvm_from_source.sh
-RUN bash /install/ubuntu_install_llvm_from_source.sh 15.0.7 
8b5fcb24b4128cf04df1b0b9410ce8b1a729cb3c544e6da885d234280dedeac6
+COPY install/ubuntu2204_install_llvm.sh /install/ubuntu2204_install_llvm.sh
+RUN bash /install/ubuntu2204_install_llvm.sh
 
 ENV TVM_VENV /venv/apache-tvm-py3.8
 COPY python/bootstrap/lockfiles /install/python/bootstrap/lockfiles
diff --git a/tests/scripts/task_config_build_arm.sh 
b/tests/scripts/task_config_build_arm.sh
index 9c1c9bb8d8..81813e0398 100755
--- a/tests/scripts/task_config_build_arm.sh
+++ b/tests/scripts/task_config_build_arm.sh
@@ -28,7 +28,7 @@ echo set\(USE_RPC ON\) >> config.cmake
 echo set\(USE_MICRO ON\) >> config.cmake
 echo set\(USE_MICRO_STANDALONE_RUNTIME ON\) >> config.cmake
 echo set\(USE_PROFILER ON\) >> config.cmake
-echo -e 'find_program(LLVM_CONFIG "llvm-config")\nif (LLVM_CONFIG) 
\n\tset(USE_LLVM llvm-config) \nelse() \n\tset(USE_LLVM 
llvm-config-15)\nendif()' >> config.cmake
+echo -e 'find_program(LLVM_CONFIG "llvm-config")\nif (LLVM_CONFIG) 
\n\tset(USE_LLVM llvm-config) \nelse() \n\tset(USE_LLVM 
llvm-config-16)\nendif()' >> config.cmake
 echo set\(CMAKE_CXX_FLAGS -Werror\) >> config.cmake
 echo set\(USE_VTA_FSIM ON\) >> config.cmake
 echo set\(USE_ARM_COMPUTE_LIB ON\) >> config.cmake