[CodeStyle][PLR1701] unify multiple isinstance expressions as one (#5…

…2150)

python/paddle/audio/functional/functional.py

@@ -250,7 +250,7 @@ def compute_fbank_matrix(
     if norm == 'slaney':
         enorm = 2.0 / (mel_f[2 : n_mels + 2] - mel_f[:n_mels])
         weights *= enorm.unsqueeze(1)
-    elif isinstance(norm, int) or isinstance(norm, float):
+    elif isinstance(norm, (int, float)):
         weights = paddle.nn.functional.normalize(weights, p=norm, axis=-1)
 
     return weights

python/paddle/distributed/auto_parallel/dist_op.py

@@ -323,7 +323,7 @@ def __call__(self, *args, **kwargs):
         output = self._serial_op(*args, **kwargs)
         new_op_size = len(cur_block.ops)
 
-        if isinstance(output, tuple) or isinstance(output, list):
+        if isinstance(output, (tuple, list)):
             new_output = list(output)
         elif isinstance(output, Variable):
             new_output = [output]

python/paddle/distributed/auto_parallel/reshard.py

@@ -1948,9 +1948,7 @@ def parse_op_desc(
                     )
                 idx = idx_list[0]
 
-            elif isinstance(op_desc, SliceOpDesc) or isinstance(
-                op_desc, AllGatherConcatOpDesc
-            ):
+            elif isinstance(op_desc, (SliceOpDesc, AllGatherConcatOpDesc)):
                 target_tensor = None
                 if isinstance(op_desc, SliceOpDesc):
                     assert (

python/paddle/distributed/fleet/base/util_factory.py

@@ -425,7 +425,7 @@ def _params_check(self, config):
         def feed_gen(batch_size, feeded_vars_dims, feeded_vars_filelist):
             def reader(batch_size, fn, dim):
                 data = []
-                if isinstance(dim, list) or isinstance(dim, tuple):
+                if isinstance(dim, (list, tuple)):
                     shape = list(dim)
                     _temp = 1
                     for x in dim:

python/paddle/distributed/fleet/meta_optimizers/localsgd_optimizer.py

@@ -45,11 +45,14 @@ def _can_apply(self):
         if self.role_maker._worker_num() <= 1:
             return False
 
-        return (
-            isinstance(self.inner_opt, paddle.optimizer.momentum.Momentum)
-            or isinstance(self.inner_opt, paddle.fluid.optimizer.Momentum)
-            or isinstance(self.inner_opt, paddle.optimizer.sgd.SGD)
-            or isinstance(self.inner_opt, paddle.fluid.optimizer.SGD)
+        return isinstance(
+            self.inner_opt,
+            (
+                paddle.optimizer.momentum.Momentum,
+                paddle.fluid.optimizer.Momentum,
+                paddle.optimizer.sgd.SGD,
+                paddle.fluid.optimizer.SGD,
+            ),
         )
 
     def _disable_strategy(self, dist_strategy):
@@ -228,11 +231,14 @@ def _can_apply(self):
         if self.role_maker._worker_num() <= 1:
             return False
 
-        return (
-            isinstance(self.inner_opt, paddle.optimizer.Momentum)
-            or isinstance(self.inner_opt, paddle.fluid.optimizer.Momentum)
-            or isinstance(self.inner_opt, paddle.optimizer.sgd.SGD)
-            or isinstance(self.inner_opt, paddle.fluid.optimizer.SGD)
+        return isinstance(
+            self.inner_opt,
+            (
+                paddle.optimizer.Momentum,
+                paddle.fluid.optimizer.Momentum,
+                paddle.optimizer.sgd.SGD,
+                paddle.fluid.optimizer.SGD,
+            ),
         )
 
     def _disable_strategy(self, dist_strategy):

python/paddle/fluid/tests/unittests/ir/inference/auto_scan_test.py

@@ -795,9 +795,7 @@ def random_to_skip():
                 if isinstance(threshold, float):
                     atol = threshold
                     rtol = 1e-8
-                elif isinstance(threshold, list) or isinstance(
-                    threshold, tuple
-                ):
+                elif isinstance(threshold, (list, tuple)):
                     atol = threshold[0]
                     rtol = threshold[1]
                 else:

python/paddle/fluid/tests/unittests/mkldnn/test_bilinear_interp_v2_mkldnn_op.py

@@ -110,7 +110,7 @@ def setUp(self):
         scale_w = 0
 
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 scale_h = float(self.scale)
                 scale_w = float(self.scale)
             if isinstance(self.scale, list) and len(self.scale) == 1:

python/paddle/fluid/tests/unittests/mkldnn/test_nearest_interp_v2_mkldnn_op.py

@@ -104,7 +104,7 @@ def setUp(self):
         scale_w = 0
 
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 scale_h = float(self.scale)
                 scale_w = float(self.scale)
             if isinstance(self.scale, list) and len(self.scale) == 1:

python/paddle/fluid/tests/unittests/test_bicubic_interp_v2_op.py

@@ -37,17 +37,15 @@ def bicubic_interp_test(
     align_corners=True,
     align_mode=0,
 ):
-    if isinstance(scale, float) or isinstance(scale, int):
+    if isinstance(scale, (float, int)):
         scale_list = []
         for _ in range(len(x.shape) - 2):
             scale_list.append(scale)
         scale = list(map(float, scale_list))
-    elif isinstance(scale, list) or isinstance(scale, tuple):
+    elif isinstance(scale, (list, tuple)):
         scale = list(map(float, scale))
     if SizeTensor is not None:
-        if not isinstance(SizeTensor, list) and not isinstance(
-            SizeTensor, tuple
-        ):
+        if not isinstance(SizeTensor, (list, tuple)):
             SizeTensor = [SizeTensor]
     return paddle._C_ops.bicubic_interp(
         x,
@@ -197,7 +195,7 @@ def setUp(self):
             in_w = self.input_shape[2]
 
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0.0:
                     scale_h = scale_w = float(self.scale)
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -236,7 +234,7 @@ def setUp(self):
             'data_layout': self.data_layout,
         }
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0.0:
                     self.scale = [self.scale]
             if isinstance(self.scale, list) and len(self.scale) == 1:

python/paddle/fluid/tests/unittests/test_bilinear_interp_v2_op.py

@@ -37,12 +37,12 @@ def bilinear_interp_test(
     align_corners=True,
     align_mode=0,
 ):
-    if isinstance(scale, float) or isinstance(scale, int):
+    if isinstance(scale, (float, int)):
         scale_list = []
         for _ in range(len(x.shape) - 2):
             scale_list.append(scale)
         scale = list(map(float, scale_list))
-    elif isinstance(scale, list) or isinstance(scale, tuple):
+    elif isinstance(scale, (list, tuple)):
         scale = list(map(float, scale))
     if SizeTensor is not None:
         if not isinstance(SizeTensor, list) and not isinstance(
@@ -169,7 +169,7 @@ def setUp(self):
         scale_h = 0
         scale_w = 0
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0.0:
                     scale_h = scale_w = float(self.scale)
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -210,7 +210,7 @@ def setUp(self):
             'data_layout': self.data_layout,
         }
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0.0:
                     self.scale = [self.scale]
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -363,7 +363,7 @@ def setUp(self):
         ).astype("uint8")
 
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     scale_h = scale_w = float(self.scale)
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -400,7 +400,7 @@ def setUp(self):
             'align_mode': self.align_mode,
         }
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     self.scale = [self.scale]
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -537,7 +537,7 @@ def setUp(self):
         if self.scale_by_1Dtensor:
             self.inputs['Scale'] = np.array([self.scale]).astype("float32")
         elif self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     scale_h = scale_w = float(self.scale)
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -564,7 +564,7 @@ def setUp(self):
         self.attrs['out_h'] = self.out_h
         self.attrs['out_w'] = self.out_w
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     self.scale = [self.scale]
             if isinstance(self.scale, list) and len(self.scale) == 1:

python/paddle/fluid/tests/unittests/test_desc_clone.py

@@ -114,9 +114,7 @@ def operator_equal(a, b):
         raise ValueError("In operator_equal not equal\n")
 
     for k, v in a.__dict__.items():
-        if isinstance(v, fluid.framework.Program) or isinstance(
-            v, fluid.framework.Block
-        ):
+        if isinstance(v, (fluid.framework.Program, fluid.framework.Block)):
             continue
 
         elif isinstance(v, core.OpDesc):
@@ -137,13 +135,10 @@ def operator_equal(a, b):
 
 def block_equal(a, b):
     for k, v in a.__dict__.items():
-        if (
-            isinstance(v, core.ProgramDesc)
-            or isinstance(v, fluid.framework.Program)
-            or isinstance(v, core.BlockDesc)
+        if isinstance(
+            v, (core.ProgramDesc, fluid.framework.Program, core.BlockDesc)
         ):
             continue
-
         elif k == "ops":
             assert len(a.ops) == len(b.ops)
             for i in range(0, len(a.ops)):

python/paddle/fluid/tests/unittests/test_linear_interp_v2_op.py

@@ -38,12 +38,12 @@ def linear_interp_test(
     align_corners=True,
     align_mode=0,
 ):
-    if isinstance(scale, float) or isinstance(scale, int):
+    if isinstance(scale, (float, int)):
         scale_list = []
         for _ in range(len(x.shape) - 2):
             scale_list.append(scale)
         scale = list(map(float, scale_list))
-    elif isinstance(scale, list) or isinstance(scale, tuple):
+    elif isinstance(scale, (list, tuple)):
         scale = list(map(float, scale))
     if SizeTensor is not None:
         if not isinstance(SizeTensor, list) and not isinstance(
@@ -138,7 +138,7 @@ def setUp(self):
             in_w = self.input_shape[1]
 
         if self.scale > 0:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 self.scale = float(self.scale)
             if isinstance(self.scale, list):
                 self.scale = float(self.scale[0])
@@ -170,7 +170,7 @@ def setUp(self):
             'data_layout': self.data_layout,
         }
         if self.scale > 0:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 self.scale = [float(self.scale)]
             self.attrs['scale'] = self.scale
         self.outputs = {'Out': output_np}
@@ -262,7 +262,7 @@ def setUp(self):
             in_w = self.input_shape[1]
 
         if self.scale > 0:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 self.scale = float(self.scale)
             if isinstance(self.scale, list):
                 self.scale = float(self.scale[0])
@@ -302,7 +302,7 @@ def setUp(self):
             'data_layout': self.data_layout,
         }
         if self.scale > 0:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 self.scale = [self.scale]
             if isinstance(self.scale, list) and len(self.scale) == 1:
                 self.scale = [self.scale[0], self.scale[0]]
@@ -343,7 +343,7 @@ def setUp(self):
         input_np = np.random.random(self.input_shape).astype("uint8")
 
         if self.scale > 0:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 self.scale = float(self.scale)
             if isinstance(self.scale, list):
                 self.scale = float(self.scale[0])
@@ -371,7 +371,7 @@ def setUp(self):
             'align_mode': self.align_mode,
         }
         if self.scale > 0:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 self.scale = [self.scale]
             if isinstance(self.scale, list) and len(self.scale) == 1:
                 self.scale = [self.scale[0], self.scale[0]]

python/paddle/fluid/tests/unittests/test_nearest_interp_v2_op.py

@@ -39,12 +39,12 @@ def nearest_interp_test(
     align_corners=True,
     align_mode=0,
 ):
-    if isinstance(scale, float) or isinstance(scale, int):
+    if isinstance(scale, (float, int)):
         scale_list = []
         for _ in range(len(x.shape) - 2):
             scale_list.append(scale)
         scale = list(map(float, scale_list))
-    elif isinstance(scale, list) or isinstance(scale, tuple):
+    elif isinstance(scale, (list, tuple)):
         scale = list(map(float, scale))
     if SizeTensor is not None:
         if not isinstance(SizeTensor, list) and not isinstance(
@@ -233,7 +233,7 @@ def setUp(self):
         scale_h = 0
         scale_w = 0
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     scale_d = scale_h = scale_w = float(self.scale)
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -305,7 +305,7 @@ def setUp(self):
                 'data_layout': self.data_layout,
             }
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     self.scale = [self.scale]
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -438,7 +438,7 @@ def setUp(self):
         ).astype("uint8")
 
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     scale_h = scale_w = float(self.scale)
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -472,7 +472,7 @@ def setUp(self):
             'align_corners': self.align_corners,
         }
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     self.scale = [self.scale]
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -583,7 +583,7 @@ def setUp(self):
         if self.scale_by_1Dtensor:
             self.inputs['Scale'] = np.array([self.scale]).astype("float64")
         elif self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     scale_h = scale_w = float(self.scale)
             if isinstance(self.scale, list) and len(self.scale) == 1:
@@ -610,7 +610,7 @@ def setUp(self):
         self.attrs['out_h'] = self.out_h
         self.attrs['out_w'] = self.out_w
         if self.scale:
-            if isinstance(self.scale, float) or isinstance(self.scale, int):
+            if isinstance(self.scale, (float, int)):
                 if self.scale > 0:
                     self.scale = [self.scale]
             if isinstance(self.scale, list) and len(self.scale) == 1: