[CodeStyle][UP031] Use f-string instead of percent format in some uts (#64857)

Author: SigureMo

cmake/make_resource.py

@@ -24,7 +24,7 @@
     "const unsigned char "
     + var
     + "[] = {"
-    + ",".join(["0x%02x" % ord(c) for c in open(res).read()])
+    + ",".join([f"0x{ord(c):02x}" for c in open(res).read()])
     + ",0};\n"
     + "const unsigned "
     + var

test/ir/inference/quant_dequant_test.py

@@ -22,9 +22,10 @@
 
 import paddle
 from paddle import base
-from paddle.base import Program, Variable, core
+from paddle.base import core
 from paddle.base.core import AnalysisConfig, create_paddle_predictor
 from paddle.base.framework import IrGraph
+from paddle.static import Variable
 from paddle.static.io import append_fetch_ops, prepend_feed_ops
 from paddle.static.quantization import (
     AddQuantDequantPass,
@@ -39,10 +40,10 @@ class QuantDequantTest(unittest.TestCase):
     def __init__(self, methodName='runTest'):
         super().__init__(methodName)
         paddle.enable_static()
-        self.main_program = base.Program()
-        self.startup_program = base.Program()
-        self.test_main_program = base.Program()
-        self.test_startup_program = base.Program()
+        self.main_program = paddle.static.Program()
+        self.startup_program = paddle.static.Program()
+        self.test_main_program = paddle.static.Program()
+        self.test_startup_program = paddle.static.Program()
         self.feeds = None
         self.fetch_list = None
         self.enable_mkldnn = False
@@ -62,10 +63,9 @@ def __init__(self, methodName='runTest'):
 
     # from Paddle release2.1
     def _normalize_program(self, program, feed_vars, fetch_vars):
-        if not isinstance(program, Program):
+        if not isinstance(program, paddle.static.Program):
             raise TypeError(
-                "program type must be `base.Program`, but received `%s`"
-                % type(program)
+                f"program type must be `paddle.static.Program`, but received `{type(program)}`"
             )
         if not isinstance(feed_vars, list):
             feed_vars = [feed_vars]
@@ -127,7 +127,7 @@ def _save_models(
             if var.name in feeded_var_names:
                 feeded_vars.append(var)
 
-        with base.scope_guard(scope):
+        with paddle.static.scope_guard(scope):
             paddle.static.io.save_inference_model(
                 dirname,
                 feeded_vars,
@@ -155,7 +155,7 @@ def _get_paddle_outs(self, feed, fetch_list, executor, program, scope):
         '''
         Return PaddlePaddle outputs.
         '''
-        with base.scope_guard(scope):
+        with paddle.static.scope_guard(scope):
             outs = executor.run(
                 program=program,
                 feed=feed,
@@ -245,12 +245,12 @@ def check_output_with_option(
         or disable TensorRT, enable MKLDNN or disable MKLDNN
         are all the same.
         '''
-        place = base.CUDAPlace(0) if use_gpu else base.CPUPlace()
-        executor = base.Executor(place)
-        scope = base.Scope()
+        place = paddle.CUDAPlace(0) if use_gpu else paddle.CPUPlace()
+        executor = paddle.static.Executor(place)
+        scope = paddle.static.Scope()
         device = "GPU" if use_gpu else "CPU"
 
-        with base.scope_guard(scope):
+        with paddle.static.scope_guard(scope):
             executor.run(self.startup_program)
             executor.run(self.test_startup_program)
         main_graph = IrGraph(core.Graph(self.main_program.desc), for_test=False)
@@ -274,11 +274,11 @@ def check_output_with_option(
         scale_training_pass = OutScaleForTrainingPass(scope=scope, place=place)
         scale_training_pass.apply(main_graph)
 
-        build_strategy = base.BuildStrategy()
+        build_strategy = paddle.static.BuildStrategy()
         build_strategy.memory_optimize = False
         build_strategy.enable_inplace = False
         build_strategy.fuse_all_reduce_ops = False
-        binary = base.CompiledProgram(main_graph.graph)
+        binary = paddle.static.CompiledProgram(main_graph.graph)
 
         iters = 10
         batch_size = 1
@@ -287,7 +287,7 @@ def check_output_with_option(
             batch_size=batch_size,
         )
         feeder = base.DataFeeder(feed_list=[self.data, self.label], place=place)
-        with base.scope_guard(scope):
+        with paddle.static.scope_guard(scope):
             for _ in range(iters):
                 data = next(train_reader())
                 loss_v = executor.run(
@@ -307,7 +307,7 @@ def check_output_with_option(
 
         self.main_program = test_graph.to_program()
 
-        with base.scope_guard(scope):
+        with paddle.static.scope_guard(scope):
             self.main_program = self._normalize_program(
                 self.main_program, self.data, self.fetch_list
             )
@@ -450,6 +450,6 @@ def __init__(
             self.disable_trt_plugin_fp16 = disable_trt_plugin_fp16
 
     def quant_dequant(self):
-        place = base.CPUPlace()
-        exe = base.Executor(place)
-        scope = base.Scope()
+        place = paddle.CPUPlace()
+        exe = paddle.static.Executor(place)
+        scope = paddle.static.Scope()

test/ir/test_ir_fusion_group_pass.py

@@ -72,7 +72,7 @@ def _feed_random_data(self, feed_vars):
             elif var.dtype == paddle.float16:
                 dtype = "float16"
             else:
-                raise ValueError("Unsupported dtype %s" % var.dtype)
+                raise ValueError(f"Unsupported dtype {var.dtype}")
             feeds[var.name] = np.random.random(shape).astype(dtype)
         return feeds
 

test/quantization/test_imperative_qat_lsq.py

@@ -213,7 +213,7 @@ def func_qat(self):
             print('eval_acc_top1', eval_acc_top1)
         self.assertTrue(
             eval_acc_top1 > 0.9,
-            msg="The test acc {%f} is less than 0.9." % eval_acc_top1,
+            msg=f"The test acc {{{eval_acc_top1:f}}} is less than 0.9.",
         )
 
     def test_qat(self):

test/standalone_executor/test_standalone_measure_real_op_cost.py

@@ -112,7 +112,7 @@ def _run_op_profiling(self, place, run_profiling=True):
         return loss_data
 
     def _compare_loss_between(self, loss_run1, loss_run2):
-        s1, s2 = '%.6f' % loss_run1, '%.6f' % loss_run2
+        s1, s2 = f'{loss_run1:.6f}', f'{loss_run2:.6f}'
         return s1 == s2
 
     def test_op_profiling_cuda0(self):

test/xpu/test_collective_api_base.py

@@ -202,7 +202,7 @@ def setUp(self):
         self._trainers = 2
         self._ps_endpoints = f"127.0.0.1:{self._find_free_port()},127.0.0.1:{self._find_free_port()}"
         self._python_interp = sys.executable
-        self._master_endpoints = "127.0.0.1:%s" % (self._find_free_port())
+        self._master_endpoints = f"127.0.0.1:{self._find_free_port()}"
 
         self.temp_dir = tempfile.TemporaryDirectory()
 
@@ -300,15 +300,15 @@ def _run_cluster(self, model_file, envs):
 
         tr0_out, tr0_err = tr0_proc.communicate()
         tr1_out, tr1_err = tr1_proc.communicate()
-        sys.stderr.write('trainer 0 stderr: %s\n' % tr0_err)
-        sys.stderr.write('trainer 1 stderr: %s\n' % tr1_err)
+        sys.stderr.write(f'trainer 0 stderr: {tr0_err}\n')
+        sys.stderr.write(f'trainer 1 stderr: {tr1_err}\n')
         # close trainer file
         tr0_pipe.close()
         tr1_pipe.close()
         with open(path0, "r") as f:
-            sys.stderr.write('trainer 0 stderr file: %s\n' % f.read())
+            sys.stderr.write(f'trainer 0 stderr file: {f.read()}\n')
         with open(path1, "r") as f:
-            sys.stderr.write('trainer 1 stderr file: %s\n' % f.read())
+            sys.stderr.write(f'trainer 1 stderr file: {f.read()}\n')
 
         def load_and_remove(path):
             with open(path, 'rb') as f:

test/xpu/test_collective_base_xpu.py

@@ -244,8 +244,8 @@ def _run_cluster(self, model_file, envs):
 
         tr0_out, tr0_err = tr0_proc.communicate()
         tr1_out, tr1_err = tr1_proc.communicate()
-        sys.stderr.write('trainer 0 stderr: %s\n' % tr0_err)
-        sys.stderr.write('trainer 1 stderr: %s\n' % tr1_err)
+        sys.stderr.write(f'trainer 0 stderr: {tr0_err}\n')
+        sys.stderr.write(f'trainer 1 stderr: {tr1_err}\n')
         # close trainer file
         tr0_pipe.close()
         tr1_pipe.close()

test/xpu/test_conv2d_op_xpu.py

@@ -36,14 +36,14 @@ def conv2d_forward_naive(
 ):
     if padding_algorithm not in ["SAME", "VALID", "EXPLICIT"]:
         raise ValueError(
-            "Unknown Attr(padding_algorithm): '%s'. "
-            "It can only be 'SAME' or 'VALID'." % str(padding_algorithm)
+            f"Unknown Attr(padding_algorithm): '{str(padding_algorithm)}'. "
+            "It can only be 'SAME' or 'VALID'."
         )
 
     if data_format not in ["NCHW", "NHWC"]:
         raise ValueError(
-            "Unknown Attr(data_format): '%s' ."
-            "It can only be 'NCHW' or 'NHWC'." % str(data_format)
+            f"Unknown Attr(data_format): '{str(data_format)}' ."
+            "It can only be 'NCHW' or 'NHWC'."
         )
 
     channel_last = data_format == "NHWC"

test/xpu/test_conv2d_transpose_op_xpu.py

@@ -31,8 +31,8 @@ def conv2dtranspose_forward_naive(input_, filter_, attrs):
     padding_algorithm = attrs['padding_algorithm']
     if padding_algorithm not in ["SAME", "VALID", "EXPLICIT"]:
         raise ValueError(
-            "Unknown Attr(padding_algorithm): '%s'. "
-            "It can only be 'SAME' or 'VALID'." % str(padding_algorithm)
+            f"Unknown Attr(padding_algorithm): '{str(padding_algorithm)}'. "
+            "It can only be 'SAME' or 'VALID'."
         )
 
     if attrs['data_format'] == 'NHWC':

test/xpu/test_conv3d_op_xpu.py

@@ -31,14 +31,14 @@ def conv3d_forward_naive(
 ):
     if padding_algorithm not in ["SAME", "VALID", "EXPLICIT"]:
         raise ValueError(
-            "Unknown Attr(padding_algorithm): '%s'. "
-            "It can only be 'SAME' or 'VALID'." % str(padding_algorithm)
+            f"Unknown Attr(padding_algorithm): '{str(padding_algorithm)}'. "
+            "It can only be 'SAME' or 'VALID'."
         )
 
     if data_format not in ["NCDHW", "NDHWC"]:
         raise ValueError(
-            "Unknown Attr(data_format): '%s' ."
-            "It can only be 'NCDHW' or 'NDHWC'." % str(data_format)
+            f"Unknown Attr(data_format): '{str(data_format)}' ."
+            "It can only be 'NCDHW' or 'NDHWC'."
         )
 
     channel_last = data_format == "NDHWC"