From 7e68a4b996e6d35d231d0aed23c4869690d930a5 Mon Sep 17 00:00:00 2001 From: Luke Hutton Date: Thu, 6 Apr 2023 17:47:47 +0000 Subject: [PATCH] [microNPU] Fix skip tests when Vela is not present This was failing locally due to an indirect import in `infra.py`. Also ensure both tests are run by using the standard `tvm.testing.main()` function to run the tests. Change-Id: I49c77330974949e4ab0d6eca16f6c4a5eaef4e2d --- .../test_ethosu/test_pass_operations_distribution.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/python/contrib/test_ethosu/test_pass_operations_distribution.py b/tests/python/contrib/test_ethosu/test_pass_operations_distribution.py index 2a9d88e41210..17f973d8b391 100644 --- a/tests/python/contrib/test_ethosu/test_pass_operations_distribution.py +++ b/tests/python/contrib/test_ethosu/test_pass_operations_distribution.py @@ -15,8 +15,12 @@ # specific language governing permissions and limitations # under the License. import pytest + +pytest.importorskip("ethosu.vela") + import numpy as np +import tvm from tvm import relay from tests.python.contrib.test_ethosu.infra import get_tflite_graph from tvm.relay.op.contrib.ethosu import partition_for_ethosu @@ -28,7 +32,6 @@ def test_operations_distribution_ethos(): tflite = pytest.importorskip("tflite") tensorflow = pytest.importorskip("tensorflow") - pytest.importorskip("ethosu.vela") import tensorflow as tf @@ -100,7 +103,6 @@ def test_operations_distribution_generic(): tflite = pytest.importorskip("tflite") tensorflow = pytest.importorskip("tensorflow") - pytest.importorskip("ethosu.vela") import tensorflow as tf @@ -170,4 +172,4 @@ def simple_net(x): if __name__ == "__main__": - test_operations_distribution() + tvm.testing.main()