This is an automated email from the ASF dual-hosted git repository.
mehrdadh 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 1f97f1fbd5 [microTVM][ARM] Keep microtvm testing only in QEMU Image
(#11809)
1f97f1fbd5 is described below
commit 1f97f1fbd55ff223dc73dbe62ae1c9b7aa16337a
Author: Mehrdad Hessar <[email protected]>
AuthorDate: Fri Aug 5 15:39:33 2022 -0700
[microTVM][ARM] Keep microtvm testing only in QEMU Image (#11809)
* Move scripts
* Address comments
* move ethosu tests
* move cmsisnn tests to qemu
---
docker/Dockerfile.ci_cpu | 9 ---------
tests/scripts/task_python_integration.sh | 8 +-------
tests/scripts/task_python_microtvm.sh | 3 +++
3 files changed, 4 insertions(+), 16 deletions(-)
diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu
index 2dc075d29b..013ebfb59e 100644
--- a/docker/Dockerfile.ci_cpu
+++ b/docker/Dockerfile.ci_cpu
@@ -124,15 +124,6 @@ RUN bash /install/ubuntu_install_androidsdk.sh
ENV ANDROID_HOME=/opt/android-sdk-linux/
ENV ANDROID_NDK_HOME=/opt/android-sdk-linux/ndk/21.3.6528147/
-# Install CMSIS_NN
-COPY install/ubuntu_install_cmsis.sh /install/ubuntu_install_cmsis.sh
-RUN bash /install/ubuntu_install_cmsis.sh /opt/arm/ethosu/cmsis
-ENV CMSIS_PATH=/opt/arm/ethosu/cmsis/
-
-# Arm(R) Ethos(TM)-U NPU driver
-COPY install/ubuntu_install_ethosu_driver_stack.sh
/install/ubuntu_install_ethosu_driver_stack.sh
-RUN bash /install/ubuntu_install_ethosu_driver_stack.sh
-
# Install Vela compiler
COPY install/ubuntu_install_vela.sh /install/ubuntu_install_vela.sh
RUN bash /install/ubuntu_install_vela.sh
diff --git a/tests/scripts/task_python_integration.sh
b/tests/scripts/task_python_integration.sh
index d831481ace..fc7cbf3a88 100755
--- a/tests/scripts/task_python_integration.sh
+++ b/tests/scripts/task_python_integration.sh
@@ -61,8 +61,7 @@ run_pytest cython
${TVM_INTEGRATION_TESTSUITE_NAME}-dso_plugin_module-1 apps/dso
run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-integration
tests/python/integration
# Ignoring Arm(R) Ethos(TM)-U NPU tests in the collective to run to run them
in parallel in the next step.
-run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-contrib
tests/python/contrib --ignore=tests/python/contrib/test_ethosu
-run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-contrib-test_ethosu
tests/python/contrib/test_ethosu -n auto
+run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-contrib
tests/python/contrib --ignore=tests/python/contrib/test_ethosu
--ignore=tests/python/contrib/test_cmsisnn
# forked is needed because the global registry gets contaminated
TVM_TEST_TARGETS="${TVM_RELAY_TEST_TARGETS:-llvm;cuda}" \
@@ -76,8 +75,3 @@ run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-target
tests/python/target
# Do not enable OpenGL
# run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-webgl tests/webgl
-
-
-if [ -z "${TVM_INTEGRATION_GPU_ONLY:-}" ] && [ -z
"${TVM_INTEGRATION_I386_ONLY:-}" ] ; then
- run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-m7-simd
tests/python/integration/test_arm_mprofile_dsp.py --enable-corstone300-tests
-fi
diff --git a/tests/scripts/task_python_microtvm.sh
b/tests/scripts/task_python_microtvm.sh
index 0bac8021b0..a9dcd9bab0 100755
--- a/tests/scripts/task_python_microtvm.sh
+++ b/tests/scripts/task_python_microtvm.sh
@@ -55,3 +55,6 @@ python3 gallery/how_to/work_with_microtvm/micro_autotune.py
python3 gallery/how_to/work_with_microtvm/micro_aot.py
run_pytest ctypes python-relay-strategy-arm_cpu
tests/python/relay/strategy/arm_cpu --enable-corstone300-tests
+run_pytest ctypes python-integration-m7-simd
tests/python/integration/test_arm_mprofile_dsp.py --enable-corstone300-tests
+run_pytest ctypes python-integration-contrib-test_cmsisnn
tests/python/contrib/test_cmsisnn
+run_pytest ctypes python-integration-contrib-test_ethosu
tests/python/contrib/test_ethosu -n auto
