From 71823c4362a8b9b52275d6b29c87decb2c5738ca Mon Sep 17 00:00:00 2001 From: Luis Vega Date: Thu, 20 May 2021 15:28:51 +0000 Subject: [PATCH 1/3] skip mobilenet test when verilator is not available --- tests/python/contrib/test_verilator/test_mobilenet.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/python/contrib/test_verilator/test_mobilenet.py b/tests/python/contrib/test_verilator/test_mobilenet.py index 8447f19141ce..4470fbb466aa 100644 --- a/tests/python/contrib/test_verilator/test_mobilenet.py +++ b/tests/python/contrib/test_verilator/test_mobilenet.py @@ -25,6 +25,7 @@ import numpy as np from test_verilator.infrastructure import ( + skip_test, compile_hardware, compiler_opts, offload, @@ -220,6 +221,8 @@ def tmobilenet(lanes): lanes : Int The number of vector lanes. """ + if skip_test(): + return if not is_tflite_available(): return model = get_mobilenet_model() From e28cfaf6f4204763b5c3291d37b9520f8adf89c3 Mon Sep 17 00:00:00 2001 From: Luis Vega Date: Thu, 20 May 2021 17:49:13 +0000 Subject: [PATCH 2/3] add skipped to pytest --- tests/python/contrib/test_verilator/test_mobilenet.py | 1 + tests/python/contrib/test_verilator/test_verilator_ops.py | 2 ++ 2 files changed, 3 insertions(+) diff --git a/tests/python/contrib/test_verilator/test_mobilenet.py b/tests/python/contrib/test_verilator/test_mobilenet.py index 4470fbb466aa..3b2a3d938c25 100644 --- a/tests/python/contrib/test_verilator/test_mobilenet.py +++ b/tests/python/contrib/test_verilator/test_mobilenet.py @@ -214,6 +214,7 @@ def is_tflite_available(): return False +@pytest.mark.skipif(skip_test(), reason="Skip because Verilator codegen is not available") def tmobilenet(lanes): """Mobilenet test template. Paramters diff --git a/tests/python/contrib/test_verilator/test_verilator_ops.py b/tests/python/contrib/test_verilator/test_verilator_ops.py index 19ed1f067fed..8176c68956b2 100644 --- a/tests/python/contrib/test_verilator/test_verilator_ops.py +++ b/tests/python/contrib/test_verilator/test_verilator_ops.py @@ -138,6 +138,7 @@ def print_test_info(test, lanes, cycles): print("test:{} vector-lanes:{} number of cycles:{}".format(test, lanes, cycles)) +@pytest.mark.skipif(skip_test(), reason="Skip because Verilator codegen is not available") def tadd(lanes): """Print counter @@ -158,6 +159,7 @@ def tadd(lanes): print_test_info("add", lanes, cycles) +@pytest.mark.skipif(skip_test(), reason="Skip because Verilator codegen is not available") def tbias(lanes): """Print counter From 67a54b22a39ae3a5c6ae27268cef1ddb8746b3a0 Mon Sep 17 00:00:00 2001 From: Luis Vega Date: Thu, 20 May 2021 19:17:39 +0000 Subject: [PATCH 3/3] add pytest --- tests/python/contrib/test_verilator/test_mobilenet.py | 1 + tests/python/contrib/test_verilator/test_verilator_ops.py | 1 + 2 files changed, 2 insertions(+) diff --git a/tests/python/contrib/test_verilator/test_mobilenet.py b/tests/python/contrib/test_verilator/test_mobilenet.py index 3b2a3d938c25..983c5d983d47 100644 --- a/tests/python/contrib/test_verilator/test_mobilenet.py +++ b/tests/python/contrib/test_verilator/test_mobilenet.py @@ -21,6 +21,7 @@ from tvm.contrib import graph_executor as runtime import os +import pytest from PIL import Image import numpy as np diff --git a/tests/python/contrib/test_verilator/test_verilator_ops.py b/tests/python/contrib/test_verilator/test_verilator_ops.py index 8176c68956b2..3b0eb3130c2e 100644 --- a/tests/python/contrib/test_verilator/test_verilator_ops.py +++ b/tests/python/contrib/test_verilator/test_verilator_ops.py @@ -20,6 +20,7 @@ import tvm from tvm import relay +import pytest from test_verilator.infrastructure import ( skip_test,