Skip to content
This repository has been archived by the owner on Nov 17, 2023. It is now read-only.

Commit

Permalink
re-enable unit tests (#16565)
Browse files Browse the repository at this point in the history
  • Loading branch information
@TaoLv @pengzhao-intel
TaoLv authored and pengzhao-intel committed Oct 22, 2019
1 parent 2bdfca9 commit d109033
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 28 deletions.
7 changes: 0 additions & 7 deletions tests/python/mkl/test_mkldnn_install.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,8 @@
import sys
import os
import logging
import unittest

curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
sys.path.append(os.path.join(curr_path, '../unittest/'))
from common import with_seed


@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_mkldnn_install():
"""
This test will verify that MXNet is built/installed correctly when
Expand Down
4 changes: 1 addition & 3 deletions tests/python/mkl/test_quantization_mkldnn.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,9 +22,7 @@
os.environ['MXNET_SUBGRAPH_BACKEND'] = 'NONE'
curr_path = os.path.dirname(os.path.abspath(os.path.expanduser(__file__)))
sys.path.insert(0, os.path.join(curr_path, '../quantization'))

# TODO(Tao): skip these unit tests before MKL-DNN v1.0 integration is done. https://github.com/apache/incubator-mxnet/projects/16
# from test_quantization import *
from test_quantization import *

if __name__ == '__main__':
import nose
Expand Down
18 changes: 0 additions & 18 deletions tests/python/mkl/test_subgraph.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -688,7 +688,6 @@ def neg_fc_relu(no_bias, data_shape, flatten=True):
return syms, attrs, excluded_attrs

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_pos_single_conv():
for data_shape in DATA_SHAPE:
net, attrs = single_conv(False, data_shape)
Expand All @@ -697,7 +696,6 @@ def test_pos_single_conv():
check_fusion(net, data_shape, attrs)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_pos_conv_act():
act_list = {"relu": True,
"sigmoid": True,
Expand All @@ -713,7 +711,6 @@ def test_pos_conv_act():
check_fusion(net, data_shape, attrs, check_quantization=quantize)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_pos_conv_bn():
for data_shape in DATA_SHAPE:
net, attrs = conv_bn(False, data_shape)
Expand All @@ -722,7 +719,6 @@ def test_pos_conv_bn():
check_fusion(net, data_shape, attrs)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_pos_conv_add():
for data_shape in DATA_SHAPE:
net, attrs = conv_add(False, data_shape)
Expand All @@ -731,7 +727,6 @@ def test_pos_conv_add():
check_fusion(net, data_shape, attrs)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_pos_conv_add2():
for data_shape in DATA_SHAPE:
net, attrs = conv_add2(False, data_shape)
Expand All @@ -740,7 +735,6 @@ def test_pos_conv_add2():
check_fusion(net, data_shape, attrs)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_pos_conv_bn_act():
act_list = {"relu": True,
"sigmoid": True,
Expand All @@ -756,7 +750,6 @@ def test_pos_conv_bn_act():
check_fusion(net, data_shape, attrs, check_quantization=quantize)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_pos_conv_bn_sum_act():
act_list = {"relu": True,
"sigmoid": True,
Expand All @@ -772,7 +765,6 @@ def test_pos_conv_bn_sum_act():
check_fusion(net, data_shape, attrs, check_quantization=quantize)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_pos_single_concat():
for data_shape in DATA_SHAPE:
for out_type in ('int8', 'auto'):
Expand All @@ -792,7 +784,6 @@ def test_pos_single_concat():
check_quantize(net, data_shape, out_type, name='', check_calibration=False)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_pos_concat_scale_align():
for data_shape in DATA_SHAPE:
for out_type in ('int8', 'auto'):
Expand All @@ -801,49 +792,42 @@ def test_pos_concat_scale_align():
check_quantize(net, data_shape, out_type, check_calibration=True, check_scale_align=True, gluon_forward=True)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_mobilenetv2_struct():
for data_shape in DATA_SHAPE:
net, attrs = mobilenetv2_struct(data_shape)
check_fusion(net, data_shape, attrs, out_types=['int8', 'auto'])

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_neg_conv_bn():
for data_shape in DATA_SHAPE:
syms, attrs, excluded_attrs = neg_conv_bn(data_shape)
check_neg_fusion(syms, attrs, excluded_attrs, data_shape)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_neg_conv_relu():
for data_shape in DATA_SHAPE:
syms, attrs, excluded_attrs = neg_conv_relu(data_shape)
check_neg_fusion(syms, attrs, excluded_attrs, data_shape)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_neg_conv_add():
for data_shape in DATA_SHAPE:
syms, attrs, excluded_attrs = neg_conv_add(data_shape)
check_neg_fusion(syms, attrs, excluded_attrs, data_shape)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_neg_conv_bn_relu():
for data_shape in DATA_SHAPE:
syms, attrs, excluded_attrs = neg_conv_bn_relu(data_shape)
check_neg_fusion(syms, attrs, excluded_attrs, data_shape)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_neg_conv_bn_add_relu():
for data_shape in DATA_SHAPE:
syms, attrs, excluded_attrs = neg_conv_bn_add_relu(data_shape)
check_neg_fusion(syms, attrs, excluded_attrs, data_shape)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_single_fc():
for dshape, no_bias, flatten in itertools.product(DATA_SHAPE, [True, False], [True, False]):
syms, attrs = single_fc(no_bias, dshape, flatten)
Expand All @@ -854,7 +838,6 @@ def test_single_fc():


@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_fc_eltwise():
for dshape, no_bias, flatten, alg in itertools.product(DATA_SHAPE,
[True, False],
Expand All @@ -867,7 +850,6 @@ def test_fc_eltwise():
check_fusion(syms, dshape, attrs, check_quantization=False)

@with_seed()
@unittest.skip('skip for MKL-DNN 1.0 integration: https://github.com/apache/incubator-mxnet/projects/16')
def test_neg_fc_relu():
for dshape, no_bias, flatten in itertools.product(DATA_SHAPE, [True, False], [True, False]):
syms, attrs, excluded_attrs = neg_fc_relu(no_bias, dshape, flatten)
Expand Down

0 comments on commit d109033

Please sign in to comment.