edits with Enrique

Author: nfarabullini

.pre-commit-config.yaml

@@ -38,10 +38,10 @@ repos:
   - id: debug-statements
 
 - repo: https://github.com/astral-sh/ruff-pre-commit
-  # Ruff version.
   rev: v0.2.0
   hooks:
     # Run the linter.
+    # TODO: include tests here
   - id: ruff
     files: ^src/
     args: [--fix]

pyproject.toml

@@ -396,16 +396,7 @@ preview = true
 # NPY: NumPy-specific rules
 # RUF: Ruff-specific rules
 ignore = [
-  'B008',  # Do not perform function calls in argument defaults
-  'B905',  # B905 `zip()` without an explicit `strict=` parameter
-  'E501',  # Line too long (using Bugbear's B950 warning)
-  'E701',  # Multiple statements on one line, see https://github.com/psf/black/issues/3887
-  'RUF012',  # Mutable class attributes should be annotated with `typing.ClassVar`
-  'RUF003',  # Comment contains ambiguous character
-  'RUF015',  # Prefer `next(iter(new_def_type.pos_or_kw_args.values()))` over single element slice
-  'B028',  # No explicit `stacklevel` keyword argument found
-  'RUF001',  # String contains ambiguous character
-  'RUF009'  # Do not perform function call in dataclass defaults
+  'E501'  # Line too long
 ]
 ignore-init-module-imports = true
 select = ['E', 'F', 'I', 'B', 'A', 'T10', 'ERA', 'NPY', 'RUF']
@@ -460,6 +451,7 @@ split-on-trailing-comma = false
 max-complexity = 15
 
 [tool.ruff.lint.per-file-ignores]
+"src/gt4py/cartesian/*" = ["RUF012"]
 'src/gt4py/eve/extended_typing.py' = ['F401', 'F405']
 'src/gt4py/next/__init__.py' = ['F401']
 

src/gt4py/cartesian/backend/base.py

@@ -271,7 +271,9 @@ def check_options(self, options: gt_definitions.BuildOptions) -> None:
         unknown_options = set(options.backend_opts.keys()) - set(self.options.keys())
         if unknown_options:
             warnings.warn(
-                f"Unknown options '{unknown_options}' for backend '{self.name}'", RuntimeWarning
+                f"Unknown options '{unknown_options}' for backend '{self.name}'",
+                RuntimeWarning,
+                stacklevel=2,
             )
 
     def make_module(

src/gt4py/cartesian/backend/dace_backend.py

@@ -516,7 +516,7 @@ def _postprocess_dace_code(code_objects, is_gpu, builder):
                     break
             for i, line in enumerate(lines):
                 if "#include <dace/dace.h>" in line:
-                    cuda_code = [co.clean_code for co in code_objects if co.title == "CUDA"][0]
+                    cuda_code = next(co.clean_code for co in code_objects if co.title == "CUDA")
                     lines = lines[0:i] + cuda_code.split("\n") + lines[i + 1 :]
                     break
 

src/gt4py/cartesian/frontend/gtscript_frontend.py

@@ -601,7 +601,7 @@ def visit_If(self, node: ast.If):
             and node.test.func.id == "__INLINED"
             and len(node.test.args) == 1
         ):
-            warnings.warn(
+            warnings.warn(  # noqa: B028 -> no-explicit-stacklevel
                 f"stencil {self.stencil_name}, line {node.lineno}, column {node.col_offset}: compile-time if condition via __INLINED deprecated",
                 category=DeprecationWarning,
             )

src/gt4py/cartesian/gtc/passes/gtir_definitive_assignment_analysis.py

@@ -74,6 +74,6 @@ def check(gtir_stencil_expr: gtir.Stencil) -> gtir.Stencil:
     """Execute definitive assignment analysis and warn on errors."""
     invalid_accesses = analyze(gtir_stencil_expr)
     for invalid_access in invalid_accesses:
-        warnings.warn(f"`{invalid_access.name}` may be uninitialized.")
+        warnings.warn(f"`{invalid_access.name}` may be uninitialized.", stacklevel=2)
 
     return gtir_stencil_expr

src/gt4py/cartesian/gtc/passes/oir_optimizations/vertical_loop_merging.py

@@ -38,7 +38,9 @@ def _mergeable(a: oir.VerticalLoop, b: oir.VerticalLoop) -> bool:
     def _merge(a: oir.VerticalLoop, b: oir.VerticalLoop) -> oir.VerticalLoop:
         sections = a.sections + b.sections
         if a.caches or b.caches:
-            warnings.warn("AdjacentLoopMerging pass removed previously declared caches")
+            warnings.warn(
+                "AdjacentLoopMerging pass removed previously declared caches", stacklevel=2
+            )
         return oir.VerticalLoop(
             loop_order=a.loop_order,
             sections=sections,

src/gt4py/cartesian/stencil_object.py

@@ -420,7 +420,8 @@ def _validate_args(  # Function is too complex
                     warnings.warn(
                         f"The layout of the field '{name}' is not recommended for this backend."
                         f"This may lead to performance degradation. Please consider using the"
-                        f"provided allocators in `gt4py.storage`."
+                        f"provided allocators in `gt4py.storage`.",
+                        stacklevel=2,
                     )
 
                 field_dtype = self.field_info[name].dtype

src/gt4py/cartesian/utils/base.py

@@ -197,7 +197,7 @@ def shashed_id(*args, length=10, hash_algorithm=None):
     return shash(*args, hash_algorithm=hash_algorithm)[:length]
 
 
-def classmethod_to_function(class_method, instance=None, owner=type(None), remove_cls_arg=False):
+def classmethod_to_function(class_method, instance=None, owner=None, remove_cls_arg=False):
     if remove_cls_arg:
         return functools.partial(class_method.__get__(instance, owner), None)
     else:

src/gt4py/cartesian/utils/meta.py

@@ -20,7 +20,7 @@
 import operator
 import platform
 import textwrap
-from typing import Callable, Dict, List, Tuple, Type
+from typing import Callable, Dict, Final, List, Tuple, Type
 
 from packaging import version
 
@@ -260,7 +260,7 @@ def generic_visit(self, node, **kwargs):
 
 
 class ASTEvaluator(ASTPass):
-    AST_OP_TO_OP: Dict[Type, Callable] = {
+    AST_OP_TO_OP: Final[Dict[Type, Callable]] = {
         # Arithmetic operations
         ast.UAdd: operator.pos,
         ast.USub: operator.neg,

src/gt4py/eve/datamodels/core.py

@@ -660,7 +660,7 @@ def get_fields(model: Union[DataModel, Type[DataModel]]) -> utils.FrozenNamespac
         >>> fields(Model)  # doctest:+ELLIPSIS
         FrozenNamespace(...name=Attribute(name='name', default=NOTHING, ...
 
-    """  # doctest conventions confuse RST validator
+    """
     if not is_datamodel(model):
         raise TypeError(f"Invalid datamodel instance or class: '{model}'.")
     if not isinstance(model, type):
@@ -825,7 +825,8 @@ def concretize(
                 RuntimeWarning(
                     f"Existing '{class_name}' symbol in module '{module}' contains a reference"
                     "to a different object."
-                )
+                ),
+                stacklevel=2,
             )
 
     return concrete_cls

src/gt4py/eve/utils.py

@@ -695,7 +695,7 @@ def reset_sequence(self, start: int = 1, *, warn_unsafe: Optional[bool] = None)
         if warn_unsafe is None:
             warn_unsafe = self.warn_unsafe
         if warn_unsafe and start < next(self._counter):
-            warnings.warn("Unsafe reset of UIDGenerator ({self})")
+            warnings.warn("Unsafe reset of UIDGenerator ({self})", stacklevel=2)
         self._counter = itertools.count(start)
 
         return self

src/gt4py/next/constructors.py

@@ -29,7 +29,7 @@
 @eve.utils.with_fluid_partial
 def empty(
     domain: common.DomainLike,
-    dtype: core_defs.DTypeLike = core_defs.Float64DType(()),
+    dtype: core_defs.DTypeLike = core_defs.Float64DType(()),  # noqa: B008 -> function-call-in-default-argument
     *,
     aligned_index: Optional[Sequence[common.NamedIndex]] = None,
     allocator: Optional[next_allocators.FieldBufferAllocationUtil] = None,
@@ -96,7 +96,7 @@ def empty(
 @eve.utils.with_fluid_partial
 def zeros(
     domain: common.DomainLike,
-    dtype: core_defs.DTypeLike = core_defs.Float64DType(()),
+    dtype: core_defs.DTypeLike = core_defs.Float64DType(()),  # noqa: B008 -> function-call-in-default-argument
     *,
     aligned_index: Optional[Sequence[common.NamedIndex]] = None,
     allocator: Optional[next_allocators.FieldBufferAllocatorProtocol] = None,
@@ -128,7 +128,7 @@ def zeros(
 @eve.utils.with_fluid_partial
 def ones(
     domain: common.DomainLike,
-    dtype: core_defs.DTypeLike = core_defs.Float64DType(()),
+    dtype: core_defs.DTypeLike = core_defs.Float64DType(()),  # noqa: B008 -> function-call-in-default-argument
     *,
     aligned_index: Optional[Sequence[common.NamedIndex]] = None,
     allocator: Optional[next_allocators.FieldBufferAllocatorProtocol] = None,

src/gt4py/next/ffront/decorator.py

@@ -298,7 +298,8 @@ def __call__(self, *args, offset_provider: dict[str, Dimension], **kwargs) -> No
             warnings.warn(
                 UserWarning(
                     f"Field View Program '{self.itir.id}': Using Python execution, consider selecting a perfomance backend."
-                )
+                ),
+                stacklevel=2,
             )
             with next_embedded.context.new_context(offset_provider=offset_provider) as ctx:
                 ctx.run(self.definition, *rewritten_args, **kwargs)

src/gt4py/next/ffront/foast_passes/type_deduction.py

@@ -319,15 +319,15 @@ def visit_ScanOperator(self, node: foast.ScanOperator, **kwargs) -> foast.ScanOp
             )
         new_definition = self.visit(node.definition, **kwargs)
         new_def_type = new_definition.type
-        carry_type = list(new_def_type.pos_or_kw_args.values())[0]
+        carry_type = next(iter(new_def_type.pos_or_kw_args.values()))
         if new_init.type != new_def_type.returns:
             raise errors.DSLError(
                 node.location,
                 f"Argument 'init' to scan operator '{node.id}' must have same type as its return: "
                 f"expected '{new_def_type.returns}', got '{new_init.type}'.",
             )
         elif new_init.type != carry_type:
-            carry_arg_name = list(new_def_type.pos_or_kw_args.keys())[0]
+            carry_arg_name = next(iter(new_def_type.pos_or_kw_args.keys()))
             raise errors.DSLError(
                 node.location,
                 f"Argument 'init' to scan operator '{node.id}' must have same type as '{carry_arg_name}' argument: "

src/gt4py/next/ffront/foast_to_itir.py

@@ -114,7 +114,7 @@ def visit_ScanOperator(self, node: foast.ScanOperator, **kwargs) -> itir.Functio
             # (this is the only place in the lowering were a variable is captured in a lifted lambda)
             lowering_utils.to_tuples_of_iterator(
                 im.promote_to_const_iterator(func_definition.params[0].id),
-                [*node.type.definition.pos_or_kw_args.values()][0],
+                [*node.type.definition.pos_or_kw_args.values()][0],  # noqa: RUF015 -> unnecessary-iterable-allocation-for-first-element
             ),
         )(
             # the function itself returns a tuple of iterators, deref element-wise

src/gt4py/next/iterator/embedded.py

@@ -1013,7 +1013,7 @@ def _shift_field_indices(
 def np_as_located_field(
     *axes: common.Dimension, origin: Optional[dict[common.Dimension, int]] = None
 ) -> Callable[[np.ndarray], common.Field]:
-    warnings.warn("`np_as_located_field()` is deprecated, use `gtx.as_field()`", DeprecationWarning)
+    warnings.warn("`np_as_located_field()` is deprecated, use `gtx.as_field()`", DeprecationWarning)  # noqa: B028
 
     origin = origin or {}
 

src/gt4py/next/iterator/pretty_parser.py

@@ -42,7 +42,7 @@
         | "if" prec1 "then" prec1 "else" prec1 -> ifthenelse
 
     ?prec2: prec3
-        | prec2 "∨" prec3 -> bool_or
+        | prec2 "∨" prec3 -> bool_or  
 
     ?prec3: prec4
         | prec3 "∧" prec4 -> bool_and
@@ -85,7 +85,7 @@
 
     %import common (CNAME, SIGNED_FLOAT, SIGNED_INT, WS)
     %ignore WS
-"""
+"""  # noqa: RUF001
 
 
 @lark_visitors.v_args(inline=True)

src/gt4py/next/iterator/pretty_printer.py

@@ -31,13 +31,13 @@
 BINARY_OPS: Final = {
     "plus": "+",
     "minus": "-",
-    "multiplies": "×",
+    "multiplies": "×",  # noqa: RUF001
     "divides": "/",
     "eq": "==",
     "less": "<",
     "greater": ">",
     "and_": "∧",
-    "or_": "∨",
+    "or_": "∨",  # noqa: RUF001
 }
 
 # replacements for builtin unary operations
@@ -195,11 +195,11 @@ def visit_FunCall(self, node: ir.FunCall, *, prec: int) -> list[str]:
                 res = self._hmerge(dim, [": ["], start, [", "], end, [")"])
                 return self._prec_parens(res, prec, PRECEDENCE["__call__"])
             if fun_name == "cartesian_domain" and len(node.args) >= 1:
-                # cartesian_domain(x, y, ...) → c{ x × y × ... }
+                # cartesian_domain(x, y, ...) → c{ x × y × ... } # noqa: RUF003
                 args = self.visit(node.args, prec=PRECEDENCE["__call__"])
                 return self._hmerge(["c⟨ "], *self._hinterleave(args, ", "), [" ⟩"])
             if fun_name == "unstructured_domain" and len(node.args) >= 1:
-                # unstructured_domain(x, y, ...) → u{ x × y × ... }
+                # unstructured_domain(x, y, ...) → u{ x × y × ... } # noqa: RUF003
                 args = self.visit(node.args, prec=PRECEDENCE["__call__"])
                 return self._hmerge(["u⟨ "], *self._hinterleave(args, ", "), [" ⟩"])
             if fun_name == "if_" and len(node.args) == 3:

src/gt4py/next/iterator/tracing.py

@@ -15,7 +15,7 @@
 import dataclasses
 import inspect
 import typing
-from typing import List
+from typing import ClassVar, List
 
 from gt4py._core import definitions as core_defs
 from gt4py.eve import Node
@@ -208,8 +208,8 @@ def __bool__(self):
 
 
 class TracerContext:
-    fundefs: List[FunctionDefinition] = []
-    closures: List[StencilClosure] = []
+    fundefs: ClassVar[List[FunctionDefinition]] = []
+    closures: ClassVar[List[StencilClosure]] = []
 
     @classmethod
     def add_fundef(cls, fun):

src/gt4py/next/iterator/transforms/collapse_tuple.py

@@ -11,6 +11,8 @@
 # distribution for a copy of the license or check <https://www.gnu.org/licenses/>.
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
+from __future__ import annotations
+
 import dataclasses
 import enum
 import functools
@@ -110,12 +112,12 @@ class Flag(enum.Flag):
         INLINE_TRIVIAL_LET = enum.auto()
 
         @classmethod
-        def all(self):  # shadowing a python builtin
+        def all(self) -> CollapseTuple.Flag:
             return functools.reduce(operator.or_, self.__members__.values())
 
     ignore_tuple_size: bool
     use_global_type_inference: bool
-    flags: Flag = Flag.all()
+    flags: Flag = Flag.all()  # noqa: RUF009
 
     PRESERVED_ANNEX_ATTRS = ("type",)
 

src/gt4py/next/iterator/transforms/simple_inline_heuristic.py

@@ -38,11 +38,11 @@ def is_eligible_for_inlining(node: ir.FunCall, is_scan_pass_context: bool) -> bo
 
     assert isinstance(node.fun, ir.FunCall)  # for mypy
     (stencil,) = node.fun.args
-    # Don’t inline scans, i.e. exclude `↑(scan(...))(...)`
+    # Don't inline scans, i.e. exclude `↑(scan(...))(...)`
     if isinstance(stencil, ir.FunCall) and stencil.fun == ir.SymRef(id="scan"):
         return False
 
-    # Don’t inline the first lifted function call within a scan, e.g. if the node given here
+    # Don't inline the first lifted function call within a scan, e.g. if the node given here
     # is `↑(f)(args...)` and appears in a scan pass `scan(λ(acc, args...) → acc + ·↑(f)(args...))`
     # it should not be inlined.
     return not is_scan_pass_context

src/gt4py/next/iterator/type_inference.py

@@ -387,7 +387,7 @@ def _default_constraints():
 DOMAIN_DTYPE = Primitive(name="domain")
 OFFSET_TAG_DTYPE = Primitive(name="offset_tag")
 
-# Some helpers to define the builtins’ types
+# Some helpers to define the builtins' types
 T0 = TypeVar.fresh()
 T1 = TypeVar.fresh()
 T2 = TypeVar.fresh()
@@ -558,16 +558,16 @@ def _infer_shift_location_types(shift_args, offset_provider, constraints):
         current_loc_out = current_loc_in
         for arg in shift_args:
             if not isinstance(arg, ir.OffsetLiteral):
-                # probably some dynamically computed offset, thus we assume it’s a number not an axis and just ignore it (see comment below)
+                # probably some dynamically computed offset, thus we assume it's a number not an axis and just ignore it (see comment below)
                 continue
             offset = arg.value
             if isinstance(offset, int):
-                continue  # ignore ‘application’ of (partial) shifts
+                continue  # ignore 'application' of (partial) shifts
             else:
                 assert isinstance(offset, str)
                 axis = offset_provider[offset]
                 if isinstance(axis, gtx.Dimension):
-                    continue  # Cartesian shifts don’t change the location type
+                    continue  # Cartesian shifts don't change the location type
                 elif isinstance(axis, Connectivity):
                     assert (
                         axis.origin_axis.kind

src/gt4py/next/program_processors/codegens/gtfn/codegen.py

@@ -12,7 +12,7 @@
 #
 # SPDX-License-Identifier: GPL-3.0-or-later
 
-from typing import Any, Collection, Union
+from typing import Any, Collection, Final, Union
 
 from gt4py.eve import codegen
 from gt4py.eve.codegen import FormatTemplate as as_fmt, MakoTemplate as as_mako
@@ -22,12 +22,12 @@
 
 
 class GTFNCodegen(codegen.TemplatedGenerator):
-    _grid_type_str = {
+    _grid_type_str: Final = {
         common.GridType.CARTESIAN: "cartesian",
         common.GridType.UNSTRUCTURED: "unstructured",
     }
 
-    _builtins_mapping = {
+    _builtins_mapping: Final = {
         "abs": "std::abs",
         "sin": "std::sin",
         "cos": "std::cos",

src/gt4py/next/program_processors/codegens/gtfn/gtfn_module.py

@@ -193,7 +193,8 @@ def _preprocess_program(
         if runtime_lift_mode and runtime_lift_mode != self.lift_mode:
             warnings.warn(
                 f"GTFN Backend was configured for LiftMode `{self.lift_mode!s}`, but "
-                f"overriden to be {runtime_lift_mode!s} at runtime."
+                f"overriden to be {runtime_lift_mode!s} at runtime.",
+                stacklevel=2,
             )
 
         if not self.enable_itir_transforms: