PaddlePaddle
diff --git a/‎test/deprecated/CMakeLists.txt
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions b/‎test/deprecated/CMakeLists.txt
Copy file name to clipboard
+3Lines changed: 3 additions & 0 deletions
diff --git a/‎test/deprecated/mkldnn/CMakeLists.txt
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions b/‎test/deprecated/mkldnn/CMakeLists.txt
Copy file name to clipboard
+14Lines changed: 14 additions & 0 deletions
diff --git a/‎test/deprecated/mkldnn/__init__.py
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions b/‎test/deprecated/mkldnn/__init__.py
Copy file name to clipboard
+13Lines changed: 13 additions & 0 deletions
diff --git a/‎test/mkldnn/test_activation_mkldnn_op.py renamed to ‎test/deprecated/mkldnn/test_activation_mkldnn_op_deprecated.py
Copy file name to clipboard
+39-36Lines changed: 39 additions & 36 deletions b/‎test/mkldnn/test_activation_mkldnn_op.py renamed to ‎test/deprecated/mkldnn/test_activation_mkldnn_op_deprecated.py
Copy file name to clipboard
+39-36Lines changed: 39 additions & 36 deletions
diff --git a/‎test/mkldnn/test_clip_mkldnn_op.py renamed to ‎test/deprecated/mkldnn/test_clip_mkldnn_op_deprecated.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion b/‎test/mkldnn/test_clip_mkldnn_op.py renamed to ‎test/deprecated/mkldnn/test_clip_mkldnn_op_deprecated.py
Copy file name to clipboard
+1-1Lines changed: 1 addition & 1 deletion
@@ -162,6 +162,9 @@ if(WITH_TESTING)
     add_subdirectory(collective)
     add_subdirectory(distributed_passes)
   endif()
+  if(WITH_ONEDNN)
+    add_subdirectory(mkldnn)
+  endif()
 
 endif()
 
 
@@ -0,0 +1,14 @@
+file(
+  GLOB TEST_MKLDNN_LISTS
+  RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}"
+  "test_*.py")
+string(REPLACE ".py" "" TEST_MKLDNN_LISTS "${TEST_MKLDNN_LISTS}")
+if(WIN32)
+  message(STATUS "Skip tests unrelated to onednn/mkldnn")
+elseif(WITH_ONEDNN)
+  foreach(target ${TEST_MKLDNN_LISTS})
+    py_test_modules(${target} MODULES ${target})
+    set_tests_properties(${target} PROPERTIES LABELS "RUN_TYPE=INFER" TIMEOUT
+                                              120)
+  endforeach()
+endif()
@@ -0,0 +1,13 @@
+#   Copyright (c) 2024 PaddlePaddle Authors. All Rights Reserve.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
@@ -12,9 +12,12 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import sys
 import unittest
 
 import numpy as np
+
+sys.path.append("../../mkldnn")
 from mkldnn_op_test import check_if_mkldnn_primitives_exist_in_bwd
 from op_test import OpTest, convert_float_to_uint16
 from test_activation_op import (
@@ -73,7 +76,7 @@ class TestMKLDNNRelu6Dim2(TestRelu6):
     def setUp(self):
         super().setUp()
         self.attrs.update({"use_mkldnn": True})
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -83,7 +86,7 @@ class TestMKLDNNRelu6_ZeroDim(TestRelu6_ZeroDim):
     def setUp(self):
         super().setUp()
         self.attrs.update({"use_mkldnn": True})
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -94,7 +97,7 @@ def setUp(self):
         super().setUp()
 
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -106,7 +109,7 @@ def test_check_grad(self):
         if self.dtype == np.float16:
             return
         self.check_grad(
-            ['X'], 'Out', check_dygraph=False, check_pir_onednn=True
+            ['X'], 'Out', check_dygraph=False, check_pir_onednn=False
         )
 
 
@@ -115,7 +118,7 @@ def setUp(self):
         super().setUp()
 
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -133,7 +136,7 @@ def setUp(self):
         self.inputs = {'X': OpTest.np_dtype_to_base_dtype(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNGelu_ZeroDim(TestActivation_ZeroDim):
@@ -148,7 +151,7 @@ def setUp(self):
         self.inputs = {'X': OpTest.np_dtype_to_base_dtype(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNGeluDim2Approx(TestActivation):
@@ -163,15 +166,15 @@ def setUp(self):
         self.inputs = {'X': OpTest.np_dtype_to_base_dtype(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True, "approximate": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNTanhDim2(TestTanh):
     def setUp(self):
         super().setUp()
 
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -182,7 +185,7 @@ def setUp(self):
         super().setUp()
 
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -193,7 +196,7 @@ def setUp(self):
         super().setUp()
 
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -204,7 +207,7 @@ def setUp(self):
         super().setUp()
 
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -233,7 +236,7 @@ def setUp(self):
         super().setUp()
 
         self.attrs["use_mkldnn"] = True
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -245,7 +248,7 @@ def setUp(self):
 
         self.attrs["use_mkldnn"] = True
         self.check_eager = False
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -255,14 +258,14 @@ class TestMKLDNNHardSwishDim2(TestHardSwish):
     def setUp(self):
         super().setUp()
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNHardSwish_ZeroDim(TestHardSwish_ZeroDim):
     def setUp(self):
         super().setUp()
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNSigmoidDim2(TestSigmoid):
@@ -306,7 +309,7 @@ def setUp(self):
         self.inputs = {'X': OpTest.np_dtype_to_base_dtype(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -318,7 +321,7 @@ def test_check_grad(self):
         if self.dtype == np.float16:
             return
         self.check_grad(
-            ['X'], 'Out', check_dygraph=False, check_pir_onednn=True
+            ['X'], 'Out', check_dygraph=False, check_pir_onednn=False
         )
 
 
@@ -334,7 +337,7 @@ def setUp(self):
         self.inputs = {'X': OpTest.np_dtype_to_base_dtype(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNGeluDim4Approx(TestActivation):
@@ -349,7 +352,7 @@ def setUp(self):
         self.inputs = {'X': OpTest.np_dtype_to_base_dtype(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True, "approximate": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 @unittest.skipIf(
@@ -367,7 +370,7 @@ def setUp(self):
         self.inputs = {'X': convert_float_to_uint16(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def test_check_output(self):
         self.check_output_with_place(core.CPUPlace(), check_pir_onednn=True)
@@ -391,7 +394,7 @@ def setUp(self):
         self.inputs = {'X': convert_float_to_uint16(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True, "approximate": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def test_check_output(self):
         self.check_output_with_place(core.CPUPlace(), check_pir_onednn=True)
@@ -409,7 +412,7 @@ def setUp(self):
         }
         self.outputs = {'Out': np.tanh(self.inputs['X'])}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNSqrtDim4(TestSqrt):
@@ -421,7 +424,7 @@ def setUp(self):
         }
         self.outputs = {'Out': np.sqrt(self.inputs['X'])}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNAbsDim4(TestAbs):
@@ -465,7 +468,7 @@ def setUp(self):
         self.inputs = {'X': OpTest.np_dtype_to_base_dtype(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
@@ -483,7 +486,7 @@ def setUp(self):
         self.inputs = {'X': OpTest.np_dtype_to_base_dtype(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNMish_ZeroDim(TestActivation_ZeroDim):
@@ -498,7 +501,7 @@ def setUp(self):
         self.inputs = {'X': OpTest.np_dtype_to_base_dtype(x)}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNRound(TestActivation):
@@ -511,15 +514,15 @@ def setUp(self):
         self.inputs = {'X': x}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def test_check_output(self):
         self.check_output(check_pir=True, check_pir_onednn=True)
 
     def test_check_grad(self):
         if self.dtype == np.float16:
             return
-        self.check_grad(['X'], 'Out', check_pir=True, check_pir_onednn=True)
+        self.check_grad(['X'], 'Out', check_pir=True, check_pir_onednn=False)
 
 
 class TestMKLDNNRound_ZeroDim(TestActivation_ZeroDim):
@@ -532,15 +535,15 @@ def setUp(self):
         self.inputs = {'X': x}
         self.outputs = {'Out': out}
         self.attrs = {"use_mkldnn": True}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def test_check_output(self):
         self.check_output(check_pir=True, check_pir_onednn=True)
 
     def test_check_grad(self):
         if self.dtype == np.float16:
             return
-        self.check_grad(['X'], 'Out', check_pir=True, check_pir_onednn=True)
+        self.check_grad(['X'], 'Out', check_pir=True, check_pir_onednn=False)
 
 
 class TestMKLDNNSigmoidDim4(TestSigmoid):
@@ -568,7 +571,7 @@ def setUp(self):
             'Out': np.maximum(0, x)
             + np.minimum(0, self.alpha * (np.exp(x) - 1))
         }
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def set_alpha(self):
         self.alpha = 1.0
@@ -588,7 +591,7 @@ def setUp(self):
             'Out': np.maximum(0, x)
             + np.minimum(0, self.alpha * (np.exp(x) - 1))
         }
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def set_alpha(self):
         self.alpha = 1.0
@@ -608,7 +611,7 @@ def setUp(self):
         self.inputs = {'X': x}
         self.attrs = {'use_mkldnn': True}
         self.outputs = {'Out': np.exp(x)}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 class TestMKLDNNExpOp_ZeroDim(TestActivation_ZeroDim):
@@ -620,7 +623,7 @@ def setUp(self):
         self.inputs = {'X': x}
         self.attrs = {'use_mkldnn': True}
         self.outputs = {'Out': np.exp(x)}
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
 
 # Check if primitives already exist in backward
@@ -652,7 +655,7 @@ class TestMKLDNNSoftplusDim2(TestSoftplus):
     def setUp(self):
         super().setUp()
         self.attrs.update({"use_mkldnn": True})
-        self.check_pir_onednn = True
+        self.check_pir_onednn = False
 
     def init_dtype(self):
         self.dtype = np.float32
 
@@ -66,7 +66,7 @@ def test_check_output(self):
 
     def test_check_grad(self):
         self.check_grad(
-            ['X'], 'Out', check_dygraph=False, check_pir_onednn=True
+            ['X'], 'Out', check_dygraph=False, check_pir_onednn=False
         )
Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ def test_check_output(self):`
`66`	`66`
`67`	`67`	`def test_check_grad(self):`
`68`	`68`	`self.check_grad(`
`69`		`- ['X'], 'Out', check_dygraph=False, check_pir_onednn=True`
	`69`	`+ ['X'], 'Out', check_dygraph=False, check_pir_onednn=False`
`70`	`70`	`)`
`71`	`71`
`72`	`72`