From c52d8a60248f67db1100590d57dd5c91219bea62 Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Tue, 21 Jun 2022 15:33:52 -0700 Subject: [PATCH 1/4] Move scripts --- docker/Dockerfile.ci_cpu | 13 ------------- docker/Dockerfile.ci_qemu | 4 ++++ tests/scripts/task_python_integration.sh | 5 ----- tests/scripts/task_python_microtvm.sh | 1 + 4 files changed, 5 insertions(+), 18 deletions(-) diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu index 2dc075d29b13..30f9ad0f6e12 100644 --- a/docker/Dockerfile.ci_cpu +++ b/docker/Dockerfile.ci_cpu @@ -110,10 +110,6 @@ RUN bash /install/ubuntu_install_boost.sh COPY install/ubuntu_install_caffe.sh /install/ubuntu_install_caffe.sh RUN bash /install/ubuntu_install_caffe.sh -# Github Arm(R) Ethos(TM)-N NPU driver -COPY install/ubuntu_install_ethosn_driver_stack.sh /install/ubuntu_install_ethosn_driver_stack.sh -RUN bash /install/ubuntu_install_ethosn_driver_stack.sh - # Vitis-AI PyXIR CI deps COPY install/ubuntu_install_vitis_ai_packages_ci.sh /install/ubuntu_install_vitis_ai_packages_ci.sh RUN bash /install/ubuntu_install_vitis_ai_packages_ci.sh @@ -124,15 +120,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/docker/Dockerfile.ci_qemu b/docker/Dockerfile.ci_qemu index 63089f3d65f2..b9bc038af334 100644 --- a/docker/Dockerfile.ci_qemu +++ b/docker/Dockerfile.ci_qemu @@ -97,6 +97,10 @@ RUN bash /install/ubuntu_install_arduino.sh COPY install/ubuntu_install_onnx.sh /install/ubuntu_install_onnx.sh RUN bash /install/ubuntu_install_onnx.sh +# Github Arm(R) Ethos(TM)-N NPU driver +COPY install/ubuntu_install_ethosn_driver_stack.sh /install/ubuntu_install_ethosn_driver_stack.sh +RUN bash /install/ubuntu_install_ethosn_driver_stack.sh + # 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 diff --git a/tests/scripts/task_python_integration.sh b/tests/scripts/task_python_integration.sh index d831481acea6..6da4b47dda0b 100755 --- a/tests/scripts/task_python_integration.sh +++ b/tests/scripts/task_python_integration.sh @@ -76,8 +76,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 13a910eb2b20..480eb3e7479a 100755 --- a/tests/scripts/task_python_microtvm.sh +++ b/tests/scripts/task_python_microtvm.sh @@ -55,3 +55,4 @@ 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 From ed38a13fafac043e299f25b648f3d5abc191b59c Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Thu, 23 Jun 2022 14:03:34 -0700 Subject: [PATCH 2/4] Address comments --- docker/Dockerfile.ci_cpu | 4 ++++ docker/Dockerfile.ci_qemu | 4 ---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docker/Dockerfile.ci_cpu b/docker/Dockerfile.ci_cpu index 30f9ad0f6e12..013ebfb59e88 100644 --- a/docker/Dockerfile.ci_cpu +++ b/docker/Dockerfile.ci_cpu @@ -110,6 +110,10 @@ RUN bash /install/ubuntu_install_boost.sh COPY install/ubuntu_install_caffe.sh /install/ubuntu_install_caffe.sh RUN bash /install/ubuntu_install_caffe.sh +# Github Arm(R) Ethos(TM)-N NPU driver +COPY install/ubuntu_install_ethosn_driver_stack.sh /install/ubuntu_install_ethosn_driver_stack.sh +RUN bash /install/ubuntu_install_ethosn_driver_stack.sh + # Vitis-AI PyXIR CI deps COPY install/ubuntu_install_vitis_ai_packages_ci.sh /install/ubuntu_install_vitis_ai_packages_ci.sh RUN bash /install/ubuntu_install_vitis_ai_packages_ci.sh diff --git a/docker/Dockerfile.ci_qemu b/docker/Dockerfile.ci_qemu index b9bc038af334..63089f3d65f2 100644 --- a/docker/Dockerfile.ci_qemu +++ b/docker/Dockerfile.ci_qemu @@ -97,10 +97,6 @@ RUN bash /install/ubuntu_install_arduino.sh COPY install/ubuntu_install_onnx.sh /install/ubuntu_install_onnx.sh RUN bash /install/ubuntu_install_onnx.sh -# Github Arm(R) Ethos(TM)-N NPU driver -COPY install/ubuntu_install_ethosn_driver_stack.sh /install/ubuntu_install_ethosn_driver_stack.sh -RUN bash /install/ubuntu_install_ethosn_driver_stack.sh - # 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 From fe99139a56e96c34280f18533defbba97f710118 Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Tue, 19 Jul 2022 12:01:46 -0700 Subject: [PATCH 3/4] move ethosu tests --- tests/scripts/task_python_integration.sh | 1 - tests/scripts/task_python_microtvm.sh | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/scripts/task_python_integration.sh b/tests/scripts/task_python_integration.sh index 6da4b47dda0b..422382e10adc 100755 --- a/tests/scripts/task_python_integration.sh +++ b/tests/scripts/task_python_integration.sh @@ -62,7 +62,6 @@ run_pytest ctypes ${TVM_INTEGRATION_TESTSUITE_NAME}-integration tests/python/int # 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 # forked is needed because the global registry gets contaminated TVM_TEST_TARGETS="${TVM_RELAY_TEST_TARGETS:-llvm;cuda}" \ diff --git a/tests/scripts/task_python_microtvm.sh b/tests/scripts/task_python_microtvm.sh index 480eb3e7479a..bea8e8478e0d 100755 --- a/tests/scripts/task_python_microtvm.sh +++ b/tests/scripts/task_python_microtvm.sh @@ -56,3 +56,4 @@ 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_ethosu tests/python/contrib/test_ethosu -n auto From 74de2803f071683096c40f69528fe71c9dca3916 Mon Sep 17 00:00:00 2001 From: Mehrdad Hessar Date: Mon, 25 Jul 2022 09:11:08 -0700 Subject: [PATCH 4/4] move cmsisnn tests to qemu --- tests/scripts/task_python_integration.sh | 2 +- tests/scripts/task_python_microtvm.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/tests/scripts/task_python_integration.sh b/tests/scripts/task_python_integration.sh index 422382e10adc..fc7cbf3a88e7 100755 --- a/tests/scripts/task_python_integration.sh +++ b/tests/scripts/task_python_integration.sh @@ -61,7 +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 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}" \ diff --git a/tests/scripts/task_python_microtvm.sh b/tests/scripts/task_python_microtvm.sh index bea8e8478e0d..9c854fe91cec 100755 --- a/tests/scripts/task_python_microtvm.sh +++ b/tests/scripts/task_python_microtvm.sh @@ -56,4 +56,5 @@ 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