[NNPACK] Modernize test (apache#2868)

Laurawly · Mar 27, 2019 · 4100535 · 4100535
1 parent 6e9e344
commit 4100535
Showing 1 changed file with 12 additions and 17 deletions.
diff --git a/tests/python/contrib/test_nnpack.py b/tests/python/contrib/test_nnpack.py
@@ -2,6 +2,7 @@
 import numpy as np
 import scipy.signal
 from tvm.contrib import nnpack
+from nose import SkipTest
 
 
 def test_fully_connected_inference():
@@ -17,13 +18,11 @@ def test_fully_connected_inference():
 
     def verify(target="llvm"):
         if not tvm.module.enabled(target):
-            print("skip because %s is not enabled..." % target)
-            return
+            raise SkipTest("skip because %s is not enabled..." % target)
         if not tvm.get_global_func("tvm.contrib.nnpack.fully_connected_inference", True):
-            print("skip because extern function is not available")
-            return
+            raise SkipTest("skip because extern function is not available")
         if not nnpack.is_available():
-            return
+            raise SkipTest("skip because nnpack is not available")
 
         ctx = tvm.cpu(0)
         f = tvm.build(s, [A, B, D, bias], target)
@@ -97,13 +96,11 @@ def verify(target="llvm",
                algorithm=nnpack.ConvolutionAlgorithm.AUTO,
                with_bias=True):
         if not tvm.module.enabled(target):
-            print("skip because %s is not enabled..." % target)
-            return
-        if not tvm.get_global_func("tvm.contrib.nnpack.convolution_inference", True):
-            print("skip because extern function is not available")
-            return
+            raise SkipTest("skip because %s is not enabled..." % target)
+        if not tvm.get_global_func("tvm.contrib.nnpack.fully_connected_inference", True):
+            raise SkipTest("skip because extern function is not available")
         if not nnpack.is_available():
-            return
+            raise SkipTest("skip because nnpack is not available")
 
         ctx = tvm.cpu(0)
         output = nnpack.convolution_inference(
@@ -161,13 +158,11 @@ def verify(target="llvm",
                algorithm=nnpack.ConvolutionAlgorithm.AUTO,
                with_bias=True):
         if not tvm.module.enabled(target):
-            print("skip because %s is not enabled..." % target)
-            return
-        if not tvm.get_global_func("tvm.contrib.nnpack.convolution_inference_without_weight_transform", True):
-            print("skip because extern function is not available")
-            return
+            raise SkipTest("skip because %s is not enabled..." % target)
+        if not tvm.get_global_func("tvm.contrib.nnpack.fully_connected_inference", True):
+            raise SkipTest("skip because extern function is not available")
         if not nnpack.is_available():
-            return
+            raise SkipTest("skip because nnpack is not available")
 
         ctx = tvm.cpu(0)
         transformed_kernel = nnpack.convolution_inference_weight_transform(