From 1da5f9f499132b3f9766e7b18c0ea874baf7abd0 Mon Sep 17 00:00:00 2001 From: Sasha Lopoukhine Date: Wed, 17 Jul 2024 15:50:48 +0100 Subject: [PATCH] ci: ignore more pyright errors in the frontend (#2895) --- tests/filecheck/frontend/dialects/affine.py | 15 ++++-- tests/test_traits.py | 2 +- xdsl/frontend/dialects/builtin.py | 60 ++++++++++++++------- xdsl/frontend/type_conversion.py | 2 +- 4 files changed, 56 insertions(+), 23 deletions(-) diff --git a/tests/filecheck/frontend/dialects/affine.py b/tests/filecheck/frontend/dialects/affine.py index 9520dbde1e..0f9ce3ff80 100644 --- a/tests/filecheck/frontend/dialects/affine.py +++ b/tests/filecheck/frontend/dialects/affine.py @@ -74,7 +74,9 @@ def test_affine_for_IV(): with CodeContext(p): # CHECK: Expected integer constant for loop end, got 'float'. def test_not_supported_affine_loop_I(): - for _ in range(12.0): # pyright: ignore[reportGeneralTypeIssues] + for _ in range( + 12.0 # pyright: ignore[reportArgumentType, reportGeneralTypeIssues] + ): pass return @@ -87,7 +89,10 @@ def test_not_supported_affine_loop_I(): with CodeContext(p): # CHECK: Expected integer constant for loop start, got 'str'. def test_not_supported_affine_loop_II(): - for _ in range("boom", 100): # pyright: ignore[reportGeneralTypeIssues] + for _ in range( + "boom", # pyright: ignore[reportArgumentType, reportGeneralTypeIssues] + 100, + ): pass return @@ -100,7 +105,11 @@ def test_not_supported_affine_loop_II(): with CodeContext(p): # CHECK: Expected integer constant for loop step, got 'float'. def test_not_supported_affine_loop_III(): - for _ in range(0, 100, 1.0): # pyright: ignore[reportGeneralTypeIssues] + for _ in range( + 0, + 100, + 1.0, # pyright: ignore[reportArgumentType, reportGeneralTypeIssues] + ): pass return diff --git a/tests/test_traits.py b/tests/test_traits.py index 5c471aa03d..cd8b71c3e6 100644 --- a/tests/test_traits.py +++ b/tests/test_traits.py @@ -201,7 +201,7 @@ def test_traits_undefined(): class WrongTraitsType(IRDLOperation): name = "test.no_traits" - traits = 1 # pyright: ignore[reportGeneralTypeIssues] + traits = 1 # pyright: ignore[reportGeneralTypeIssues, reportAssignmentType] def test_traits_wrong_type(): diff --git a/xdsl/frontend/dialects/builtin.py b/xdsl/frontend/dialects/builtin.py index 146bc19f9b..4bae22a9aa 100644 --- a/xdsl/frontend/dialects/builtin.py +++ b/xdsl/frontend/dialects/builtin.py @@ -39,8 +39,8 @@ def __add__( from xdsl.frontend.dialects.arith import addi return addi( - self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] - other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] + self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] ) def __and__( @@ -49,8 +49,8 @@ def __and__( from xdsl.frontend.dialects.arith import andi return andi( - self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] - other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] + self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] ) def __lshift__( @@ -59,8 +59,8 @@ def __lshift__( from xdsl.frontend.dialects.arith import shli return shli( - self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] - other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] + self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] ) def __mul__( @@ -69,8 +69,8 @@ def __mul__( from xdsl.frontend.dialects.arith import muli return muli( - self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] - other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] + self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] ) def __rshift__( @@ -79,8 +79,8 @@ def __rshift__( from xdsl.frontend.dialects.arith import shrsi return shrsi( - self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] - other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] + self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] ) def __sub__( @@ -89,8 +89,8 @@ def __sub__( from xdsl.frontend.dialects.arith import subi return subi( - self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] - other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType] + self, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportUnknownVariableType, reportArgumentType] ) def __eq__( # pyright: ignore[reportIncompatibleMethodOverride] @@ -98,34 +98,58 @@ def __eq__( # pyright: ignore[reportIncompatibleMethodOverride] ) -> i1: from xdsl.frontend.dialects.arith import cmpi - return cmpi(self, other, "eq") # pyright: ignore[reportGeneralTypeIssues] + return cmpi( + self, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + "eq", + ) def __ge__(self, other: _Integer[_Width, _Signedness]) -> i1: from xdsl.frontend.dialects.arith import cmpi - return cmpi(self, other, "sge") # pyright: ignore[reportGeneralTypeIssues] + return cmpi( + self, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + "sge", + ) def __gt__(self, other: _Integer[_Width, _Signedness]) -> i1: from xdsl.frontend.dialects.arith import cmpi - return cmpi(self, other, "sgt") # pyright: ignore[reportGeneralTypeIssues] + return cmpi( + self, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + "sgt", + ) def __le__(self, other: _Integer[_Width, _Signedness]) -> i1: from xdsl.frontend.dialects.arith import cmpi - return cmpi(self, other, "sle") # pyright: ignore[reportGeneralTypeIssues] + return cmpi( + self, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + "sle", + ) def __lt__(self, other: _Integer[_Width, _Signedness]) -> i1: from xdsl.frontend.dialects.arith import cmpi - return cmpi(self, other, "slt") # pyright: ignore[reportGeneralTypeIssues] + return cmpi( + self, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + "slt", + ) def __ne__( # pyright: ignore[reportIncompatibleMethodOverride] self, other: _Integer[_Width, _Signedness] ) -> i1: from xdsl.frontend.dialects.arith import cmpi - return cmpi(self, other, "ne") # pyright: ignore[reportGeneralTypeIssues] + return cmpi( + self, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + other, # pyright: ignore[reportGeneralTypeIssues, reportArgumentType] + "ne", + ) # Type aliases for signless integers. diff --git a/xdsl/frontend/type_conversion.py b/xdsl/frontend/type_conversion.py index d83c075af8..f212474a9e 100644 --- a/xdsl/frontend/type_conversion.py +++ b/xdsl/frontend/type_conversion.py @@ -3,7 +3,7 @@ from typing import ( Any, TypeAlias, - _GenericAlias, # pyright: ignore[reportPrivateUsage, reportGeneralTypeIssues, reportUnknownVariableType] + _GenericAlias, # pyright: ignore[reportPrivateUsage, reportGeneralTypeIssues, reportUnknownVariableType, reportAttributeAccessIssue] ) import xdsl.dialects.builtin as xdsl_builtin