[CodeStyle][task 1] enable Ruff UP032 rule with some comments (Paddle…

…Paddle#58175)
hitywt · Oct 24, 2023 · 299632e · 299632e
1 parent 2f8c8f6
commit 299632e
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 20 deletions.
diff --git a/python/paddle/distributed/fleet/elastic/manager.py b/python/paddle/distributed/fleet/elastic/manager.py
@@ -494,9 +494,9 @@ def _update_elastic_scale_out(self):
             if curr_host_port not in host_endpoints:
                 host_endpoints.append(curr_host_port)
 
-        os.environ[
-            'PADDLE_TRAINER_ID'
-        ] = f'{host_endpoints.index(self.curr_host)}'
+        os.environ['PADDLE_TRAINER_ID'] = str(
+            host_endpoints.index(self.curr_host)
+        )
         hosts = ','.join(
             [host_port.split(":")[0] for host_port in host_endpoints]
         )
@@ -547,9 +547,9 @@ def _update_elastic_scale_in(self):
         )
 
         self.args.ips = hosts
-        os.environ[
-            'PADDLE_TRAINER_ID'
-        ] = f'{sorted_endpoints.index(self.curr_host)}'
+        os.environ['PADDLE_TRAINER_ID'] = str(
+            sorted_endpoints.index(self.curr_host)
+        )
         os.environ['PADDLE_TRAINERS'] = hosts
         self.np = len(sorted_endpoints)
         os.environ['PADDLE_TRAINER_ENDPOINTS'] = ','.join(sorted_endpoints)

diff --git a/python/paddle/distributed/passes/auto_parallel_amp.py b/python/paddle/distributed/passes/auto_parallel_amp.py
@@ -215,7 +215,7 @@ def build_state(self):
                         fwd_op_id = self.grad_op_to_op_map[
                             op.desc.original_id()
                         ]
-                        assert fwd_op_id in self._op_fp16_dict, f"{str(op)}"
+                        assert fwd_op_id in self._op_fp16_dict, str(op)
                         self._op_fp16_dict[
                             op.desc.original_id()
                         ] = self._is_fp16_op(fwd_op_id)

diff --git a/python/paddle/tensor/to_string.py b/python/paddle/tensor/to_string.py
@@ -126,15 +126,11 @@ def _format_item(np_var, max_width=0, signed=False):
         or np_var.dtype == np.float16
     ):
         if DEFAULT_PRINT_OPTIONS.sci_mode:
-            item_str = f'{{:.{DEFAULT_PRINT_OPTIONS.precision}e}}'.format(
-                np_var
-            )
+            item_str = f'{np_var:.{DEFAULT_PRINT_OPTIONS.precision}e}'
         elif np.ceil(np_var) == np_var:
             item_str = f'{np_var:.0f}.'
         else:
-            item_str = f'{{:.{DEFAULT_PRINT_OPTIONS.precision}f}}'.format(
-                np_var
-            )
+            item_str = f'{np_var:.{DEFAULT_PRINT_OPTIONS.precision}f}'
     else:
         item_str = f'{np_var}'
 

diff --git a/test/legacy_test/test_inplace.py b/test/legacy_test/test_inplace.py
@@ -56,7 +56,7 @@ def test_backward_error(self):
             loss = paddle.nn.functional.relu(var_c + var_d)
             with self.assertRaisesRegex(
                 RuntimeError,
-                f"received tensor_version:{1} != wrapper_version_snapshot:{0}",
+                "received tensor_version:1 != wrapper_version_snapshot:0",
             ):
                 loss.backward()
 
@@ -171,7 +171,7 @@ def test_backward_error(self):
             loss = paddle.nn.functional.relu(var_c)
             with self.assertRaisesRegex(
                 RuntimeError,
-                f"received tensor_version:{1} != wrapper_version_snapshot:{0}",
+                "received tensor_version:1 != wrapper_version_snapshot:0",
             ):
                 loss.backward()
 
@@ -939,7 +939,7 @@ def test_backward_error(self):
             loss = paddle.nn.functional.relu(var_c)
             with self.assertRaisesRegex(
                 RuntimeError,
-                f"received tensor_version:{3} != wrapper_version_snapshot:{0}",
+                "received tensor_version:3 != wrapper_version_snapshot:0",
             ):
                 loss.backward()
 
@@ -1028,7 +1028,7 @@ def test_backward_error(self):
             loss = paddle.nn.functional.relu(var_c)
             with self.assertRaisesRegex(
                 RuntimeError,
-                f"received tensor_version:{2} != wrapper_version_snapshot:{0}",
+                "received tensor_version:2 != wrapper_version_snapshot:0",
             ):
                 loss.backward()
 
@@ -1104,7 +1104,7 @@ def test_backward_error(self):
             loss = paddle.nn.functional.relu(var_c)
             with self.assertRaisesRegex(
                 RuntimeError,
-                f"received tensor_version:{2} != wrapper_version_snapshot:{0}",
+                "received tensor_version:2 != wrapper_version_snapshot:0",
             ):
                 loss.backward()
 
@@ -1400,7 +1400,7 @@ def test_backward_error(self):
             loss = paddle.nn.functional.relu(var_c)
             with self.assertRaisesRegex(
                 RuntimeError,
-                f"received tensor_version:{2} != wrapper_version_snapshot:{0}",
+                "received tensor_version:2 != wrapper_version_snapshot:0",
             ):
                 loss.backward()
 
@@ -1442,7 +1442,7 @@ def test_backward_error(self):
             loss = paddle.nn.functional.relu(var_c)
             with self.assertRaisesRegex(
                 RuntimeError,
-                f"received tensor_version:{2} != wrapper_version_snapshot:{0}",
+                "received tensor_version:2 != wrapper_version_snapshot:0",
             ):
                 loss.backward()