Skip to content

Commit 63b9c6c

Browse files
hlu1wweic
authored andcommitted
[NNPACK] Modernize test (apache#2868)
1 parent 2d40110 commit 63b9c6c

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

tests/python/contrib/test_nnpack.py

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
import numpy as np
33
import scipy.signal
44
from tvm.contrib import nnpack
5+
from nose import SkipTest
56

67

78
def test_fully_connected_inference():
@@ -17,13 +18,11 @@ def test_fully_connected_inference():
1718

1819
def verify(target="llvm"):
1920
if not tvm.module.enabled(target):
20-
print("skip because %s is not enabled..." % target)
21-
return
21+
raise SkipTest("skip because %s is not enabled..." % target)
2222
if not tvm.get_global_func("tvm.contrib.nnpack.fully_connected_inference", True):
23-
print("skip because extern function is not available")
24-
return
23+
raise SkipTest("skip because extern function is not available")
2524
if not nnpack.is_available():
26-
return
25+
raise SkipTest("skip because nnpack is not available")
2726

2827
ctx = tvm.cpu(0)
2928
f = tvm.build(s, [A, B, D, bias], target)
@@ -97,13 +96,11 @@ def verify(target="llvm",
9796
algorithm=nnpack.ConvolutionAlgorithm.AUTO,
9897
with_bias=True):
9998
if not tvm.module.enabled(target):
100-
print("skip because %s is not enabled..." % target)
101-
return
102-
if not tvm.get_global_func("tvm.contrib.nnpack.convolution_inference", True):
103-
print("skip because extern function is not available")
104-
return
99+
raise SkipTest("skip because %s is not enabled..." % target)
100+
if not tvm.get_global_func("tvm.contrib.nnpack.fully_connected_inference", True):
101+
raise SkipTest("skip because extern function is not available")
105102
if not nnpack.is_available():
106-
return
103+
raise SkipTest("skip because nnpack is not available")
107104

108105
ctx = tvm.cpu(0)
109106
output = nnpack.convolution_inference(
@@ -161,13 +158,11 @@ def verify(target="llvm",
161158
algorithm=nnpack.ConvolutionAlgorithm.AUTO,
162159
with_bias=True):
163160
if not tvm.module.enabled(target):
164-
print("skip because %s is not enabled..." % target)
165-
return
166-
if not tvm.get_global_func("tvm.contrib.nnpack.convolution_inference_without_weight_transform", True):
167-
print("skip because extern function is not available")
168-
return
161+
raise SkipTest("skip because %s is not enabled..." % target)
162+
if not tvm.get_global_func("tvm.contrib.nnpack.fully_connected_inference", True):
163+
raise SkipTest("skip because extern function is not available")
169164
if not nnpack.is_available():
170-
return
165+
raise SkipTest("skip because nnpack is not available")
171166

172167
ctx = tvm.cpu(0)
173168
transformed_kernel = nnpack.convolution_inference_weight_transform(

0 commit comments

Comments
 (0)