Fix

co63oc · co63oc · commit b316ff1eea88 · 2025-07-16T15:18:47.000+08:00
diff --git a/test/xpu/test_conv2d_op_xpu.py b/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,
diff --git a/test/xpu/test_conv2d_transpose_op_xpu.py b/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:
diff --git a/test/xpu/test_conv3d_op_xpu.py b/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}
diff --git a/test/xpu/test_depthwise_conv2d_transpose_op_xpu.py b/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:
diff --git a/test/xpu/test_elementwise_add_op_xpu.py b/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):
diff --git a/test/xpu/test_elementwise_add_op_xpu_kp.py b/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):
diff --git a/test/xpu/test_elementwise_floordiv_op_xpu.py b/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):
diff --git a/test/xpu/test_elementwise_mod_op_xpu.py b/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):
diff --git a/test/xpu/test_elementwise_mul_op_xpu.py b/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:
diff --git a/test/xpu/test_fill_constant_batch_size_like_xpu.py b/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):
             '''
diff --git a/test/xpu/test_flatten_contiguous_range_op_xpu.py b/test/xpu/test_flatten_contiguous_range_op_xpu.py
@@ -39,7 +39,7 @@ def setUp(self):
             self.op_type = "flatten_contiguous_range"
             self.place = paddle.XPUPlace(0)
             self.use_xpu = True
-            self.use_mkldnn = False
+            self.use_onednn = False
 
             self.start_axis = 0
             self.stop_axis = -1
diff --git a/test/xpu/test_gaussian_random_op_xpu.py b/test/xpu/test_gaussian_random_op_xpu.py
@@ -60,13 +60,13 @@ def setUp(self):
             self.python_api = paddle.normal
             self.set_attrs()
             self.inputs = {}
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.attrs = {
                 "shape": [123, 92],
                 "mean": self.mean,
                 "std": self.std,
                 "seed": 10,
-                "use_mkldnn": self.use_mkldnn,
+                "use_mkldnn": self.use_onednn,
                 "dtype": typeid_dict[self.in_type_str],
             }
             paddle.seed(10)
@@ -119,7 +119,7 @@ def setUp(self):
                 'mean': self.mean,
                 'std': self.std,
                 'seed': self.seed,
-                'use_mkldnn': self.use_mkldnn,
+                'use_mkldnn': self.use_onednn,
                 "dtype": typeid_dict[self.in_type_str],
             }
 
@@ -129,7 +129,7 @@ def setUp(self):
         def init_data(self):
             self.shape = [123, 92]
             self.infer_shape = [-1, 92]
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.mean = 1.0
             self.std = 2.0
             self.seed = 10
@@ -145,7 +145,7 @@ class TestGaussianRandomOp2_ShapeTensorList(
         def init_data(self):
             self.shape = [123, 92]
             self.infer_shape = [-1, -1]
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.mean = 1.0
             self.std = 2.0
             self.seed = 10
@@ -156,7 +156,7 @@ class TestGaussianRandomOp3_ShapeTensorList(
         def init_data(self):
             self.shape = [123, 92]
             self.infer_shape = [123, -1]
-            self.use_mkldnn = True
+            self.use_onednn = True
             self.mean = 1.0
             self.std = 2.0
             self.seed = 10
@@ -167,7 +167,7 @@ class TestGaussianRandomOp4_ShapeTensorList(
         def init_data(self):
             self.shape = [123, 92]
             self.infer_shape = [123, -1]
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.mean = 1.0
             self.std = 2.0
             self.seed = 10
@@ -178,21 +178,21 @@ def setUp(self):
             '''Test gaussian_random op with specified value'''
             self.init()
             self.init_data()
-            self.use_mkldnn = False
+            self.use_onednn = False
 
             self.inputs = {"ShapeTensor": np.array(self.shape).astype("int32")}
             self.attrs = {
                 'mean': self.mean,
                 'std': self.std,
                 'seed': self.seed,
-                'use_mkldnn': self.use_mkldnn,
+                'use_mkldnn': self.use_onednn,
                 "dtype": typeid_dict[self.in_type_str],
             }
             self.outputs = {'Out': np.zeros((123, 92), dtype=self.dtype)}
 
         def init_data(self):
             self.shape = [123, 92]
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.mean = 1.0
             self.std = 2.0
             self.seed = 10
diff --git a/test/xpu/test_pool2d_op_xpu.py b/test/xpu/test_pool2d_op_xpu.py
@@ -295,7 +295,7 @@ def setUp(self):
             self.place = paddle.XPUPlace(0)
             self.use_cudnn = False
             self.init_kernel_type()
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.init_test_case()
             self.padding_algorithm = "EXPLICIT"
             self.init_paddings()
@@ -331,7 +331,7 @@ def setUp(self):
                 'pooling_type': self.pool_type,
                 'global_pooling': self.global_pool,
                 'use_cudnn': self.use_cudnn,
-                'use_mkldnn': self.use_mkldnn,
+                'use_mkldnn': self.use_onednn,
                 'data_format': self.data_format,
                 'exclusive': self.exclusive,
                 'adaptive': self.adaptive,
diff --git a/test/xpu/test_randperm_op_xpu.py b/test/xpu/test_randperm_op_xpu.py
@@ -73,7 +73,7 @@ def setUp(self):
             self.initTestCase()
             self.dtype = self.in_type
             self.use_xpu = True
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.inputs = {}
             self.outputs = {"Out": np.zeros(self.n).astype(self.dtype)}
             self.attrs = {
@@ -83,7 +83,7 @@ def setUp(self):
 
         def init_op_type(self):
             self.op_type = "randperm"
-            self.use_mkldnn = False
+            self.use_onednn = False
 
         def initTestCase(self):
             self.n = 200
diff --git a/test/xpu/test_reduce_prod_op_xpu.py b/test/xpu/test_reduce_prod_op_xpu.py
@@ -37,7 +37,7 @@ def setUp(self):
             self.place = paddle.XPUPlace(0)
             self.init_dtype()
             self.op_type = 'reduce_prod'
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.keep_dim = False
             self.reduce_all = False
             self.initTestCase()
diff --git a/test/xpu/test_split_op_xpu.py b/test/xpu/test_split_op_xpu.py
@@ -39,7 +39,7 @@ def setUp(self):
             self.init_dtype()
             self.__class__.use_xpu = True
             self.__class__.op_type = 'split'
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.initParameters()
             self.inputs = {'X': self.x}
             self.attrs = {
diff --git a/test/xpu/test_squared_l2_norm_op_xpu.py b/test/xpu/test_squared_l2_norm_op_xpu.py
@@ -40,7 +40,7 @@ def init(self):
 
         def setUp(self):
             self.init()
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.max_relative_error = 0.05
             self.set_inputs()
 
diff --git a/test/xpu/test_squeeze2_op_xpu.py b/test/xpu/test_squeeze2_op_xpu.py
@@ -36,7 +36,7 @@ class TestSqueeze2Op(XPUOpTest):
         def setUp(self):
             self.op_type = "squeeze2"
             self.__class__.op_type = "squeeze2"
-            self.use_mkldnn = False
+            self.use_onednn = False
             self.init_dtype()
             self.init_test_case()
             self.inputs = {
diff --git a/test/xpu/test_transpose_op_xpu.py b/test/xpu/test_transpose_op_xpu.py
diff --git a/test/xpu/test_uniform_random_op_xpu.py b/test/xpu/test_uniform_random_op_xpu.py
diff --git a/test/xpu/test_unsqueeze2_op_xpu.py b/test/xpu/test_unsqueeze2_op_xpu.py

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ def setUp(self):`
`49`	`49`	`'X': OpTest.np_dtype_to_base_dtype(self.x),`
`50`	`50`	`'Y': OpTest.np_dtype_to_base_dtype(self.y),`
`51`	`51`	`}`
`52`		`- self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_mkldnn}`
	`52`	`+ self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_onednn}`
`53`	`53`	`self.outputs = {'Out': self.out}`
`54`	`54`
`55`	`55`	`def test_check_output(self):`
Original file line number	Diff line number	Diff line change
`@@ -39,7 +39,7 @@ def setUp(self):`
`39`	`39`	`'X': OpTest.np_dtype_to_base_dtype(self.x),`
`40`	`40`	`'Y': OpTest.np_dtype_to_base_dtype(self.y),`
`41`	`41`	`}`
`42`		`- self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_mkldnn}`
	`42`	`+ self.attrs = {'axis': self.axis, 'use_mkldnn': self.use_onednn}`
`43`	`43`	`self.outputs = {'Out': self.out}`
`44`	`44`
`45`	`45`	`def test_check_output(self):`