Fix

Author: co63oc

test/xpu/test_conv2d_op_xpu.py

@@ -196,7 +196,7 @@ def setUp(self):
  self.use_cudnn = False
  self.exhaustive_search = False
  self.use_cuda = False
- self.use_mkldnn = False
+ self.use_onednn = False
  self.fuse_relu_before_depthwise_conv = False
  self.data_format = "AnyLayout"
  self.init_kernel_type()
@@ -241,7 +241,7 @@ def setUp(self):
  'groups': self.groups,
  'dilations': self.dilations,
  'use_cudnn': self.use_cudnn,
- 'use_mkldnn': self.use_mkldnn,
+ 'use_mkldnn': self.use_onednn,
  'data_format': self.data_format,
  'fuse_relu_before_depthwise_conv': self.fuse_relu_before_depthwise_conv,
  'exhaustive_search': self.exhaustive_search,
@@ -350,7 +350,7 @@ def setUp(self):
  self.use_cudnn = False
  self.exhaustive_search = False
  self.use_cuda = False
- self.use_mkldnn = False
+ self.use_onednn = False
  self.fuse_relu_before_depthwise_conv = False
  self.init_kernel_type()
  self.init_group()
@@ -402,7 +402,7 @@ def setUp(self):
  'groups': self.groups,
  'dilations': self.dilations,
  'use_cudnn': self.use_cudnn,
- 'use_mkldnn': self.use_mkldnn,
+ 'use_mkldnn': self.use_onednn,
  'data_format': self.data_format,
  'fuse_relu_before_depthwise_conv': self.fuse_relu_before_depthwise_conv,
  'exhaustive_search': self.exhaustive_search,

test/xpu/test_conv2d_transpose_op_xpu.py

@@ -146,7 +146,7 @@ def setUp(self):
  self.need_check_grad = True
  self.is_test = False
  self.use_cudnn = False
- self.use_mkldnn = False
+ self.use_onednn = False
  self.output_size = None
  self.output_padding = []
  self.data_format = "NCHW"
@@ -168,7 +168,7 @@ def setUp(self):
  'dilations': self.dilations,
  'use_cudnn': self.use_cudnn,
  'is_test': self.is_test,
- 'use_mkldnn': self.use_mkldnn,
+ 'use_mkldnn': self.use_onednn,
  'data_format': self.data_format,
  }
  if self.output_size is not None:

test/xpu/test_conv3d_op_xpu.py

@@ -211,7 +211,7 @@ def setUp(self):
  self.dtype = self.in_type
  self.op_type = "conv3d"
  self.use_cudnn = False
- self.use_mkldnn = False
+ self.use_onednn = False
  self.data_format = "AnyLayout"
  self.init_kernel_type()
  self.init_group()
@@ -244,7 +244,7 @@ def setUp(self):
  'groups': self.groups,
  'dilations': self.dilations,
  'use_cudnn': self.use_cudnn,
- 'use_mkldnn': self.use_mkldnn,
+ 'use_mkldnn': self.use_onednn,
  'data_format': self.data_format,
  }
  self.outputs = {'Output': output}
@@ -379,7 +379,7 @@ def setUp(self):
  self.dtype = self.in_type
  self.op_type = "conv3d"
  self.use_cudnn = False
- self.use_mkldnn = False
+ self.use_onednn = False
  self.data_format = "NCDHW"
  self.init_kernel_type()
  self.init_group()
@@ -419,7 +419,7 @@ def setUp(self):
  'groups': self.groups,
  'dilations': self.dilations,
  'use_cudnn': self.use_cudnn,
- 'use_mkldnn': self.use_mkldnn,
+ 'use_mkldnn': self.use_onednn,
  'data_format': self.data_format,
  }
  self.outputs = {'Output': output}

test/xpu/test_depthwise_conv2d_transpose_op_xpu.py

@@ -146,7 +146,7 @@ def setUp(self):
  self.need_check_grad = True
  self.is_test = False
  self.use_cudnn = False
- self.use_mkldnn = False
+ self.use_onednn = False
  self.output_size = None
  self.output_padding = []
  self.data_format = "NCHW"
@@ -168,7 +168,7 @@ def setUp(self):
  'dilations': self.dilations,
  'use_cudnn': self.use_cudnn,
  'is_test': self.is_test,
- 'use_mkldnn': self.use_mkldnn,
+ 'use_mkldnn': self.use_onednn,
  'data_format': self.data_format,
  }
  if self.output_size is not None:

test/xpu/test_elementwise_add_op_xpu.py

@@ -49,7 +49,7 @@ def setUp(self):
  'X': OpTest.np_dtype_to_base_dtype(self.x),
  'Y': OpTest.np_dtype_to_base_dtype(self.y),
  }
- self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_mkldnn}
+ self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_onednn}
  self.outputs = {'Out': self.out}
 
  def test_check_output(self):

test/xpu/test_elementwise_add_op_xpu_kp.py

@@ -39,7 +39,7 @@ def setUp(self):
  'X': OpTest.np_dtype_to_base_dtype(self.x),
  'Y': OpTest.np_dtype_to_base_dtype(self.y),
  }
- self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_mkldnn}
+ self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_onednn}
  self.outputs = {'Out': self.out}
 
  def test_check_output(self):

test/xpu/test_elementwise_floordiv_op_xpu.py

@@ -36,7 +36,7 @@ def __init__(self):
 
  class TestElementwiseModOp(XPUOpTest):
  def init_kernel_type(self):
- self.use_mkldnn = False
+ self.use_onednn = False
 
  def setUp(self):
  self.op_type = "elementwise_floordiv"
@@ -50,7 +50,7 @@ def setUp(self):
  'X': OpTest.np_dtype_to_base_dtype(self.x),
  'Y': OpTest.np_dtype_to_base_dtype(self.y),
  }
- self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_mkldnn}
+ self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_onednn}
  self.outputs = {'Out': self.out}
 
  def test_check_output(self):

test/xpu/test_elementwise_mod_op_xpu.py

@@ -37,7 +37,7 @@ def __init__(self) -> None:
 
  class ElementwiseModOp(XPUOpTest):
  def init_kernel_type(self):
- self.use_mkldnn = False
+ self.use_onednn = False
 
  def init_input_output(self):
  self.x = np.random.uniform(0, 10000, [10, 10]).astype(self.dtype)
@@ -48,7 +48,7 @@ def init_input_output(self):
  'Y': OpTest.np_dtype_to_base_dtype(self.y),
  }
  self.outputs = {'Out': self.out}
- self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_mkldnn}
+ self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_onednn}
 
  def init_dtype(self):
  pass
@@ -81,7 +81,7 @@ def init_input_output(self):
  'Y': OpTest.np_dtype_to_base_dtype(self.y),
  }
  self.outputs = {'Out': self.out}
- self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_mkldnn}
+ self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_onednn}
 
  class TestRemainderOp(unittest.TestCase):
  def test_dygraph(self):

test/xpu/test_elementwise_mul_op_xpu.py

@@ -39,7 +39,7 @@ def __init__(self):
 
  class ElementwiseMulOp(XPUOpTest):
  def init_kernel_type(self):
- self.use_mkldnn = False
+ self.use_onednn = False
 
  def setUp(self):
  self.op_type = 'elementwise_mul'
@@ -126,7 +126,7 @@ def init_input_output(self):
  'Y': self.y,
  }
  self.outputs = {'Out': self.out}
- self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_mkldnn}
+ self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_onednn}
 
  def init_axis(self):
  pass
@@ -257,7 +257,7 @@ def init_data(self):
 
  class ElementwiseMulComplexOp(XPUTestElementwiseMulOp.ElementwiseMulOp):
  def init_kernel_type(self):
- self.use_mkldnn = False
+ self.use_onednn = False
 
  def setUp(self):
  self.op_type = 'elementwise_mul'
@@ -281,7 +281,7 @@ def init_input_output(self):
  'Y': self.y,
  }
  self.outputs = {'Out': self.out}
- self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_mkldnn}
+ self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_onednn}
 
  def gen_output(self):
  if self.cal_x is None:

test/xpu/test_fill_constant_batch_size_like_xpu.py

@@ -36,7 +36,7 @@ def setUp(self):
  self.init_op_type()
  self.initTestCase()
  self.use_xpu = True
- self.use_mkldnn = False
+ self.use_onednn = False
  self.no_need_check_grad = True
  self.dtype = self.in_type
  self.input_dim_idx = 0
@@ -58,7 +58,7 @@ def setUp(self):
 
  def init_op_type(self):
  self.op_type = "fill_constant_batch_size_like"
- self.use_mkldnn = False
+ self.use_onednn = False
 
  def convert_dtype2index(self):
  '''