[mkldnn-v1.0] Re-enable unit tests

tests/python/mkl/test_mkldnn_install.py

@@ -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

tests/python/mkl/test_quantization_mkldnn.py

@@ -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

tests/python/mkl/test_subgraph.py

@@ -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)
@@ -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,
@@ -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)
@@ -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)
@@ -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)
@@ -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,
@@ -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,
@@ -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'):
@@ -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'):
@@ -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)
@@ -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],
@@ -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)