diff --git a/pyproject.toml b/pyproject.toml index 810c5d9f64e9cea6ab6f58a6fca8a3950b7a8156..bb6f547bde6e86d87262090aa7ff93ad7524eca4 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -107,14 +107,12 @@ ignore = [ "F403", "F632", "F811", - "C408", - "C417", "PLR0402", "PLC0414", "PLE1205", ] "tools/cinn/**" = [ "F401", - "C416", "PLR0402", + ] diff --git a/test/cinn/fusion/fusion_test.py b/test/cinn/fusion/fusion_test.py index db11a78c982c4e08b9631120d76433e8a09444b2..bbc2d8603b43a9232ea3d221f3903e4496852262 100644 --- a/test/cinn/fusion/fusion_test.py +++ b/test/cinn/fusion/fusion_test.py @@ -26,7 +26,7 @@ class FusionTest(PassTest): def init_input_data(self): """Set feed data""" - self.feed_data = dict() + self.feed_data = {} logger.warn("No Input Data") def build_program(self, builder, target): diff --git a/test/cinn/op_mappers/op_mapper_test.py b/test/cinn/op_mappers/op_mapper_test.py index 881dc740a3578b23f2d6b9059abbf920fe80ac49..c251afb775fc046c71b04b0e3ff5060fc269465b 100644 --- a/test/cinn/op_mappers/op_mapper_test.py +++ b/test/cinn/op_mappers/op_mapper_test.py @@ -77,7 +77,7 @@ class OpMapperTest(OpTest): x2 = paddle.static.data(name='x2', shape=[1, 2], dtype='float32') return {'X' : [x1, x2]} ```""" - return dict() + return {} def set_op_attrs(self) -> dict: """Map from attribute name to attribute value:\n @@ -86,7 +86,7 @@ class OpMapperTest(OpTest): return {'axis' : 0} ``` """ - return dict() + return {} def set_op_outputs(self) -> dict: """Map from output parameter name to argument type, the argument type should be represented by a string.\n @@ -113,7 +113,7 @@ class OpMapperTest(OpTest): return {'MeanOut' : 'Mean'} ``` """ - return dict() + return {} def __set_paddle_op(self): # paddle C++ op type @@ -130,8 +130,8 @@ class OpMapperTest(OpTest): self.inplace_outputs = self.set_inplace_outputs() # collect some important infomation self.input_arg_map = self.__get_arguments_map(self.inputs) - self.fetch_targets = list() - self.skip_check_list = list() + self.fetch_targets = [] + self.skip_check_list = [] self.op_desc = None def __check_valid(self): @@ -194,7 +194,7 @@ class OpMapperTest(OpTest): ) def __get_arguments_map(self, param_maps): - arg_maps = dict() + arg_maps = {} for args in param_maps.values(): self.assertIsInstance( args, @@ -219,7 +219,7 @@ class OpMapperTest(OpTest): self.__check_valid() def __remove_skip_outputs(self, results): - check_outputs = list() + check_outputs = [] for i in range(len(self.fetch_targets)): if self.fetch_targets[i].name not in self.skip_check_list: check_outputs.append(results[i]) @@ -259,14 +259,14 @@ class OpMapperTest(OpTest): self.__init_paddle_op() helper = LayerHelper(self.op_type) - self.outputs = dict() + self.outputs = {} for var_name, dtypes in self.output_dtypes.items(): self.assertIsInstance( dtypes, list, msg="The set_op_outputs should be return dict(OutName, list(OutDtype)), where OutName and OutDtype are string", ) - self.outputs[var_name] = list() + self.outputs[var_name] = [] for dtype in dtypes: out_var = helper.create_variable_for_type_inference(dtype) self.fetch_targets.append(out_var) @@ -356,7 +356,7 @@ class OpMapperTest(OpTest): cinn_feed_datas.append(self.feed_data[name]) # get the CINN output list - fetch_names = list() + fetch_names = [] inplace_start = 0 for dtypes in self.output_dtypes.values(): inplace_start += len(dtypes) @@ -374,7 +374,7 @@ class OpMapperTest(OpTest): self.assertGreater( len(fetch_names), 0, msg="The program's output cannot be empty!" ) - cinn_output_vars = list() + cinn_output_vars = [] for name in fetch_names: cinn_name = convertor.get_cinn_name(name) @@ -394,7 +394,7 @@ class OpMapperTest(OpTest): cinn_inputs, cinn_feed_datas, cinn_output_vars, - passes=list(), + passes=[], scope=scope, ) @@ -403,7 +403,7 @@ class OpMapperTest(OpTest): @staticmethod def get_program_vars(program) -> dict: - vars = dict() + vars = {} for i in range(program.size()): instr = program[i] for var in instr.get_inputs(): diff --git a/test/cinn/op_mappers/test_fill_constant_op.py b/test/cinn/op_mappers/test_fill_constant_op.py index 5fbcb73de0a179c71bfe13c80182eff17c0e8a89..fb083e8644085341d0c2c7ee7db568de179bb5d3 100644 --- a/test/cinn/op_mappers/test_fill_constant_op.py +++ b/test/cinn/op_mappers/test_fill_constant_op.py @@ -53,7 +53,7 @@ class TestFillConstantOp(OpMapperTest): class TestFillConstantCase1(TestFillConstantOp): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [10, 10] self.value = np.random.default_rng(12345).integers(low=0, high=10000) self.str_value = "" @@ -62,7 +62,7 @@ class TestFillConstantCase1(TestFillConstantOp): class TestFillConstantCase2(TestFillConstantOp): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [10, 10] self.value = 0 self.str_value = "0.123456" diff --git a/test/cinn/op_mappers/test_gaussian_random_op.py b/test/cinn/op_mappers/test_gaussian_random_op.py index 283a74cc550836eae3bb22fc6a249fdd08e5b4d1..ebd02eeb1d16551b76254b508bde83c4635eedcc 100644 --- a/test/cinn/op_mappers/test_gaussian_random_op.py +++ b/test/cinn/op_mappers/test_gaussian_random_op.py @@ -24,7 +24,7 @@ import paddle class TestGaussianRandomOp(OpMapperTest): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [2, 3] self.mean = 0.0 self.std = 1.0 @@ -59,7 +59,7 @@ class TestGaussianRandomOp(OpMapperTest): class TestGaussianRandomCase1(TestGaussianRandomOp): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [2, 3, 4] self.mean = 1.0 self.std = 2.0 @@ -69,7 +69,7 @@ class TestGaussianRandomCase1(TestGaussianRandomOp): class TestGaussianRandomCase2(TestGaussianRandomOp): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [2, 3, 4] self.mean = 2.0 self.std = 3.0 diff --git a/test/cinn/op_mappers/test_randint_op.py b/test/cinn/op_mappers/test_randint_op.py index d1d63cee6300f476466954cc1ff35efe25af82c8..e626e29a213a23b73280be94b10eaa0ba16acc03 100644 --- a/test/cinn/op_mappers/test_randint_op.py +++ b/test/cinn/op_mappers/test_randint_op.py @@ -24,7 +24,7 @@ import paddle class TestRandIntOp(OpMapperTest): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [2, 3] self.min = 1 self.max = 5 @@ -61,7 +61,7 @@ class TestRandIntOp(OpMapperTest): class TestRandIntCase1(TestRandIntOp): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [2, 3, 4] self.min = 1 self.max = 9 @@ -71,7 +71,7 @@ class TestRandIntCase1(TestRandIntOp): class TestRandIntCase2(TestRandIntOp): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [2, 3, 4] self.min = 1 self.max = 9 diff --git a/test/cinn/op_mappers/test_uniform_random_op.py b/test/cinn/op_mappers/test_uniform_random_op.py index 2bd453189713573b16e6313d9abed711e1ec13a9..f4fd37b7182c1134ac5ae5b656e9f9a7afaf7085 100644 --- a/test/cinn/op_mappers/test_uniform_random_op.py +++ b/test/cinn/op_mappers/test_uniform_random_op.py @@ -24,7 +24,7 @@ import paddle class TestUniformRandomOp(OpMapperTest): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [2, 3] self.min = -1.0 self.max = 1.0 @@ -65,7 +65,7 @@ class TestUniformRandomOp(OpMapperTest): class TestUniformRandomCase1(TestUniformRandomOp): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [2, 3, 4] self.min = -5.5 self.max = 5.5 @@ -78,7 +78,7 @@ class TestUniformRandomCase1(TestUniformRandomOp): class TestUniformRandomCase2(TestUniformRandomOp): def init_input_data(self): - self.feed_data = dict() + self.feed_data = {} self.shape = [2, 3, 4] self.min = -10.0 self.max = 10.0 diff --git a/test/cinn/ops/test_clz_op.py b/test/cinn/ops/test_clz_op.py index ad0b1be8a70acd2c5b7c5fa1674b46a9d4489938..715a7ae65adcc4bf566e6a3bbb6a2b37ac8a7153 100644 --- a/test/cinn/ops/test_clz_op.py +++ b/test/cinn/ops/test_clz_op.py @@ -60,12 +60,7 @@ class TestClzOp(OpTest): low = INT32_MIN if dtype == "int32" else INT64_MIN high = INT32_MAX if dtype == "int32" else INT64_MAX x = self.random(self.case["shape"], dtype, low=low, high=high) - y = list( - map( - lambda num: count_leading_zeros(num, dtype), - x.reshape(-1).tolist(), - ) - ) + y = [count_leading_zeros(num, dtype) for num in x.reshape(-1).tolist()] self.inputs = {"x": x} self.outputs = {"y": np.array(y).reshape(x.shape).astype(dtype)} diff --git a/test/cinn/ops/test_matmul_op.py b/test/cinn/ops/test_matmul_op.py index a4c2d4bec9402353a7490a9a9b9a0125421c4c6d..a2fd15232668765461b88bc1250763f355adeaa6 100755 --- a/test/cinn/ops/test_matmul_op.py +++ b/test/cinn/ops/test_matmul_op.py @@ -72,7 +72,7 @@ class TestMatmulOp(OpTest): out = self.cinn_func(builder, x, y) prog = builder.build() res = self.get_cinn_output( - prog, target, [x, y], [self.x_np, self.y_np], [out], passes=list() + prog, target, [x, y], [self.x_np, self.y_np], [out], passes=[] ) self.cinn_outputs = res diff --git a/test/cinn/ops/test_popc_op.py b/test/cinn/ops/test_popc_op.py index a1cba471439971602b32a2ded5b3fc37e2fafd58..1b03c4d041cc4c45ac65f1eb70460fdd80491372 100644 --- a/test/cinn/ops/test_popc_op.py +++ b/test/cinn/ops/test_popc_op.py @@ -61,7 +61,7 @@ class TestPopcOp(OpTest): low = INT32_MIN if dtype == "int32" else INT64_MIN high = INT32_MAX if dtype == "int32" else INT64_MAX x = self.random(self.case["shape"], dtype, low=low, high=high) - y = list(map(lambda num: popcount(num, dtype), x.reshape(-1).tolist())) + y = [popcount(num, dtype) for num in x.reshape(-1).tolist()] self.inputs = {"x": x} self.outputs = {"y": np.array(y).reshape(x.shape).astype(dtype)} diff --git a/test/cinn/passes/pass_test.py b/test/cinn/passes/pass_test.py index 71a30abb15bae8626b827e259bfc43e9ccdf2baf..1f047f2348be0a999e24951beeccf492b9f7fd96 100644 --- a/test/cinn/passes/pass_test.py +++ b/test/cinn/passes/pass_test.py @@ -34,7 +34,7 @@ class PassTest(OpTest): def init_input_data(self) -> dict: """Set feed data""" - self.feed_data = dict() + self.feed_data = {} logger.warn("No Input Data") def build_program(self, builder, target): @@ -64,7 +64,7 @@ class PassTest(OpTest): def get_pass_outputs(self, passes): pass_prog, inputs, outputs = self.run_program() - feed_list = list() + feed_list = [] for var in inputs: self.assertIn( var.name(), diff --git a/test/cinn/test_paddle_model_convertor.py b/test/cinn/test_paddle_model_convertor.py index 699bb0dc093afc246e06298adaa7bf6992fa0556..b0c0c55ae113624efb9442a8467b9a92515cd250 100644 --- a/test/cinn/test_paddle_model_convertor.py +++ b/test/cinn/test_paddle_model_convertor.py @@ -128,7 +128,7 @@ class TestPaddleModel(OpMapperTest): return attr_map def init_case(self): - self.feed_data = dict() + self.feed_data = {} for i in range(len(self.feed_names)): # check no repeat variable self.assertNotIn( @@ -208,7 +208,7 @@ class TestPaddleModel(OpMapperTest): msg="CINN only support single block now", ) - feed_with_param = list() + feed_with_param = [] convertor = PaddleModelConvertor(target) for i in range(len(self.feed_names)): diff --git a/tools/cinn/gen_c++_tutorial.py b/tools/cinn/gen_c++_tutorial.py index 08f66411642812eaa5829bea78896c967c1719da..97e6d16fef0882a64588ae4d3a7d5d37fd716d5b 100644 --- a/tools/cinn/gen_c++_tutorial.py +++ b/tools/cinn/gen_c++_tutorial.py @@ -201,7 +201,7 @@ if __name__ == '__main__': class Content(ContentGenerator): def __init__(self): - self.lines = [line for line in sys.stdin] + self.lines = list(sys.stdin) self.cur = 0 def has_next(self):