Skip to content

Commit

Permalink
[NNPACK] Modernize test (apache#2868)
Browse files Browse the repository at this point in the history
  • Loading branch information
hlu1 authored and wweic committed Mar 24, 2019
1 parent 058c467 commit 7cf05e0
Showing 1 changed file with 12 additions and 17 deletions.
29 changes: 12 additions & 17 deletions tests/python/contrib/test_nnpack.py
Original file line number Diff line number Diff line change
Expand Up @@ -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():
Expand All @@ -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)
Expand Down Expand Up @@ -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(
Expand Down Expand Up @@ -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(
Expand Down

0 comments on commit 7cf05e0

Please sign in to comment.