test directory modify FLAGS_use_mkldnn [fluid_ops]

test/deprecated/legacy_test/test_eager_deletion_delete_vars_deprecated.py

@@ -16,7 +16,7 @@
 
 import numpy as np
 
-os.environ['FLAGS_use_mkldnn'] = '0'
+os.environ['FLAGS_use_onednn'] = '0'
 os.environ['CPU_NUM'] = '4'
 
 import unittest

test/deprecated/quantization/CMakeLists.txt

@@ -11,7 +11,7 @@ function(_inference_analysis_python_api_int8_test target model_dir data_path
     SRCS ${filename}
          ENVS
          CPU_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
-         FLAGS_use_mkldnn=${use_mkldnn}
+         FLAGS_use_onednn=${use_mkldnn}
          ARGS
          --infer_model
          ${model_dir}/model
@@ -67,7 +67,7 @@ function(inference_quant_int8_image_classification_test target quant_model_dir
          ENVS
          FLAGS_OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
          OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
-         FLAGS_use_mkldnn=true
+         FLAGS_use_onednn=true
          ARGS
          --quant_model
          ${quant_model_dir}
@@ -91,7 +91,7 @@ function(inference_quant2_int8_image_classification_test target quant_model_dir
          ENVS
          FLAGS_OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
          OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
-         FLAGS_use_mkldnn=true
+         FLAGS_use_onednn=true
          ARGS
          --quant_model
          ${quant_model_dir}
@@ -123,7 +123,7 @@ function(
          ENVS
          FLAGS_OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
          OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
-         FLAGS_use_mkldnn=true
+         FLAGS_use_onednn=true
          ARGS
          --quant_model
          ${quant_model_dir}

test/dygraph_to_static/test_build_strategy.py

@@ -80,12 +80,12 @@ def test_resnet(self):
 
     @test_default_mode_only
     def test_in_static_mode_mkldnn(self):
-        paddle.set_flags({'FLAGS_use_mkldnn': True})
+        paddle.set_flags({'FLAGS_use_onednn': True})
         try:
             if paddle.base.core.is_compiled_with_mkldnn():
                 self.resnet_helper.train(True, self.build_strategy)
         finally:
-            paddle.set_flags({'FLAGS_use_mkldnn': False})
+            paddle.set_flags({'FLAGS_use_onednn': False})
 
 
 class TestError(Dy2StTestBase):

test/dygraph_to_static/test_mnist.py

@@ -176,11 +176,11 @@ def test_mnist_to_static(self):
     @test_default_mode_only
     def test_mnist_declarative_cpu_vs_mkldnn(self):
         dygraph_loss_cpu = self.train_dygraph()
-        paddle.set_flags({'FLAGS_use_mkldnn': True})
+        paddle.set_flags({'FLAGS_use_onednn': True})
         try:
             dygraph_loss_mkldnn = self.train_dygraph()
         finally:
-            paddle.set_flags({'FLAGS_use_mkldnn': False})
+            paddle.set_flags({'FLAGS_use_onednn': False})
         np.testing.assert_allclose(
             dygraph_loss_cpu,
             dygraph_loss_mkldnn,

test/dygraph_to_static/test_resnet.py

@@ -481,12 +481,12 @@ def test_resnet_composite(self):
 
     @test_default_mode_only
     def test_in_static_mode_mkldnn(self):
-        paddle.set_flags({'FLAGS_use_mkldnn': True})
+        paddle.set_flags({'FLAGS_use_onednn': True})
         try:
             if paddle.base.core.is_compiled_with_mkldnn():
                 self.train(to_static=True)
         finally:
-            paddle.set_flags({'FLAGS_use_mkldnn': False})
+            paddle.set_flags({'FLAGS_use_onednn': False})
 
 
 if __name__ == '__main__':

test/legacy_test/op_test.py

@@ -2165,11 +2165,11 @@ def check_inplace_output_with_place(
             else:
                 # TODO(zhiqiu): enhance inplace_grad test for ops (sum and activation) using mkldnn
                 # skip op that use_mkldnn currently
-                flags_use_mkldnn = base.core.globals()["FLAGS_use_mkldnn"]
+                flags_use_onednn = base.core.globals()["FLAGS_use_onednn"]
                 attrs_use_mkldnn = hasattr(self, 'attrs') and bool(
                     self.attrs.get('use_mkldnn', False)
                 )
-                if flags_use_mkldnn or attrs_use_mkldnn:
+                if flags_use_onednn or attrs_use_mkldnn:
                     warnings.warn(
                         "check inplace_grad for ops using mkldnn is not supported"
                     )
@@ -2205,7 +2205,7 @@ def check_output_with_place(
         core._set_prim_all_enabled(False)
         core.set_prim_eager_enabled(False)
         if not self.is_onednn_op():
-            set_flags({"FLAGS_use_mkldnn": False})
+            set_flags({"FLAGS_use_onednn": False})
 
         if hasattr(self, "use_custom_device") and self.use_custom_device:
             check_dygraph = False
@@ -3274,7 +3274,7 @@ def check_grad_with_place(
             check_dygraph = False
 
         if not self.is_onednn_op():
-            set_flags({"FLAGS_use_mkldnn": False})
+            set_flags({"FLAGS_use_onednn": False})
 
         core._set_prim_all_enabled(False)
         core.set_prim_eager_enabled(False)

test/legacy_test/test_sgd_op_bf16.py

@@ -239,7 +239,7 @@ class TestSGDOpBF16API(unittest.TestCase):
     @classmethod
     def setUpClass(cls):
         np.random.seed(12345)
-        base.set_flags({'FLAGS_use_mkldnn': True})
+        base.set_flags({'FLAGS_use_onednn': True})
 
     def setUp(self):
         self.sample_count = 20

test/mkldnn/check_flags_mkldnn_ops_on_off.py

@@ -24,12 +24,12 @@
 
 def check():
     print(
-        "check: _global_flags()['FLAGS_use_mkldnn']=",
-        _global_flags()["FLAGS_use_mkldnn"],
+        "check: _global_flags()['FLAGS_use_onednn']=",
+        _global_flags()["FLAGS_use_onednn"],
     )
     print(
-        "check: base.get_flags('FLAGS_use_mkldnn')=",
-        base.get_flags(['FLAGS_use_mkldnn']),
+        "check: base.get_flags('FLAGS_use_onednn')=",
+        base.get_flags(['FLAGS_use_onednn']),
     )
     print("check: DNNL_VERBOSE=", os.environ['DNNL_VERBOSE'])
     print(

test/mkldnn/check_flags_use_mkldnn.py

@@ -24,12 +24,12 @@
 
 def check():
     print(
-        "check: _global_flags()['FLAGS_use_mkldnn']=",
-        _global_flags()["FLAGS_use_mkldnn"],
+        "check: _global_flags()['FLAGS_use_onednn']=",
+        _global_flags()["FLAGS_use_onednn"],
     )
     print(
-        "check: base.get_flags('FLAGS_use_mkldnn')=",
-        base.get_flags(['FLAGS_use_mkldnn']),
+        "check: base.get_flags('FLAGS_use_onednn')=",
+        base.get_flags(['FLAGS_use_onednn']),
     )
     print("check: DNNL_VERBOSE=", os.environ['DNNL_VERBOSE'])
     a_np = np.random.uniform(-2, 2, (10, 20, 30)).astype(np.float32)

test/mkldnn/test_flags_mkldnn_ops_on_off.py

@@ -19,14 +19,14 @@
 import unittest
 
 
-class TestFlagsUseMkldnn(unittest.TestCase):
+class TestFlagsUseOnednn(unittest.TestCase):
     def setUp(self):
         self._python_interp = sys.executable
         self._python_interp += " check_flags_mkldnn_ops_on_off.py"
 
         self.env = os.environ.copy()
         self.env["DNNL_VERBOSE"] = "1"
-        self.env["FLAGS_use_mkldnn"] = "1"
+        self.env["FLAGS_use_onednn"] = "1"
 
         self.relu_regex = b"^onednn_verbose,exec,cpu,eltwise,.+alg:eltwise_relu alpha:0 beta:0,10x20x20"
         self.ew_add_regex = (
@@ -36,7 +36,7 @@ def setUp(self):
             b"^onednn_verbose,exec,cpu,matmul,.*10x20x30:10x30x20:10x20x20"
         )
 
-    def flags_use_mkl_dnn_common(self, e):
+    def flags_use_onednn_common(self, e):
         cmd = self._python_interp
         env = dict(self.env, **e)
         proc = subprocess.Popen(
@@ -66,46 +66,46 @@ def not_found(self, regex, out, err):
         _not_found = not re.search(regex, out, re.MULTILINE)
         return self._print_when_false(_not_found, out, err)
 
-    def test_flags_use_mkl_dnn_on_empty_off_empty(self):
-        out, err = self.flags_use_mkl_dnn_common({})
+    def test_flags_use_onednn_on_empty_off_empty(self):
+        out, err = self.flags_use_onednn_common({})
         assert self.found(self.relu_regex, out, err)
         assert self.found(self.ew_add_regex, out, err)
         assert self.found(self.matmul_regex, out, err)
 
-    def test_flags_use_mkl_dnn_on(self):
+    def test_flags_use_onednn_on(self):
         env = {"FLAGS_tracer_onednn_ops_on": "relu"}
-        out, err = self.flags_use_mkl_dnn_common(env)
+        out, err = self.flags_use_onednn_common(env)
         assert self.found(self.relu_regex, out, err)
         assert self.not_found(self.ew_add_regex, out, err)
         assert self.not_found(self.matmul_regex, out, err)
 
-    def test_flags_use_mkl_dnn_on_multiple(self):
+    def test_flags_use_onednn_on_multiple(self):
         env = {"FLAGS_tracer_onednn_ops_on": "relu,elementwise_add"}
-        out, err = self.flags_use_mkl_dnn_common(env)
+        out, err = self.flags_use_onednn_common(env)
         assert self.found(self.relu_regex, out, err)
         assert self.found(self.ew_add_regex, out, err)
         assert self.not_found(self.matmul_regex, out, err)
 
-    def test_flags_use_mkl_dnn_off(self):
+    def test_flags_use_onednn_off(self):
         env = {"FLAGS_tracer_onednn_ops_off": "matmul_v2"}
-        out, err = self.flags_use_mkl_dnn_common(env)
+        out, err = self.flags_use_onednn_common(env)
         assert self.found(self.relu_regex, out, err)
         assert self.found(self.ew_add_regex, out, err)
         assert self.not_found(self.matmul_regex, out, err)
 
-    def test_flags_use_mkl_dnn_off_multiple(self):
+    def test_flags_use_onednn_off_multiple(self):
         env = {"FLAGS_tracer_onednn_ops_off": "matmul_v2,relu"}
-        out, err = self.flags_use_mkl_dnn_common(env)
+        out, err = self.flags_use_onednn_common(env)
         assert self.not_found(self.relu_regex, out, err)
         assert self.found(self.ew_add_regex, out, err)
         assert self.not_found(self.matmul_regex, out, err)
 
-    def test_flags_use_mkl_dnn_on_off(self):
+    def test_flags_use_onednn_on_off(self):
         env = {
             "FLAGS_tracer_onednn_ops_on": "elementwise_add",
             "FLAGS_tracer_onednn_ops_off": "matmul_v2",
         }
-        out, err = self.flags_use_mkl_dnn_common(env)
+        out, err = self.flags_use_onednn_common(env)
         assert self.not_found(self.relu_regex, out, err)
         assert self.found(self.ew_add_regex, out, err)
         assert self.not_found(self.matmul_regex, out, err)

test/mkldnn/test_flags_use_mkldnn.py

@@ -19,15 +19,15 @@
 import unittest
 
 
-class TestFlagsUseMkldnn(unittest.TestCase):
+class TestFlagsUseOnednn(unittest.TestCase):
     def setUp(self):
         self._python_interp = sys.executable
         self._python_interp += " check_flags_use_mkldnn.py"
 
         self.env = os.environ.copy()
         self.env["GLOG_v"] = "1"
         self.env["DNNL_VERBOSE"] = "1"
-        self.env["FLAGS_use_mkldnn"] = "1"
+        self.env["FLAGS_use_onednn"] = "1"
 
         self.relu_regex = b"^onednn_verbose,primitive,exec,cpu,eltwise,.+alg:eltwise_relu alpha:0 beta:0,10x20x30"
 
@@ -41,7 +41,7 @@ def found(self, regex, out, err):
         _found = re.search(regex, out, re.MULTILINE)
         return self._print_when_false(_found, out, err)
 
-    def test_flags_use_mkl_dnn(self):
+    def test_flags_use_onednn(self):
         cmd = self._python_interp
 
         proc = subprocess.Popen(

test/quantization/CMakeLists.txt

@@ -12,7 +12,7 @@ function(_inference_analysis_python_api_int8_test target model_dir data_path
     SRCS ${filename}
          ENVS
          CPU_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
-         FLAGS_use_mkldnn=${use_mkldnn}
+         FLAGS_use_onednn=${use_mkldnn}
          ARGS
          --infer_model
          ${model_dir}/model
@@ -89,7 +89,7 @@ function(inference_quant_int8_image_classification_test target quant_model_dir
          ENVS
          FLAGS_OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
          OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
-         FLAGS_use_mkldnn=true
+         FLAGS_use_onednn=true
          ARGS
          --quant_model
          ${quant_model_dir}
@@ -113,7 +113,7 @@ function(inference_quant2_int8_image_classification_test target quant_model_dir
          ENVS
          FLAGS_OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
          OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
-         FLAGS_use_mkldnn=true
+         FLAGS_use_onednn=true
          ARGS
          --quant_model
          ${quant_model_dir}
@@ -145,7 +145,7 @@ function(
          ENVS
          FLAGS_OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
          OMP_NUM_THREADS=${CPU_NUM_THREADS_ON_CI}
-         FLAGS_use_mkldnn=true
+         FLAGS_use_onednn=true
          ARGS
          --quant_model
          ${quant_model_dir}