Non-auto-generated changes

Author: mdboom

cuda_bindings/cuda/bindings/_lib/utils.pxi.in

@@ -114,7 +114,7 @@ cdef class _HelperKernelParams:
                     raise TypeError("Unsupported type: " + str(type(ctype)))
                 idx += 1
         else:
-            raise TypeError("Argument 'kernelParams' is not a valid type: Tuple[Tuple[Any, ...], Tuple[Any, ...]] or PyObject implimenting Buffer Protocol or Int")
+            raise TypeError("Argument 'kernelParams' is not a valid type: tuple[tuple[Any, ...], tuple[Any, ...]] or PyObject implimenting Buffer Protocol or Int")
 
     def __dealloc__(self):
         if self._pyobj_acquired is True:

cuda_bindings/pyproject.toml

@@ -84,7 +84,6 @@ select = [
 ]
 
 ignore = [
-    "UP006",
     "UP007",
     "E741", # ambiguous variable name such as I
     "B007", # rename unsued loop variable to _name

cuda_core/cuda/core/experimental/_linker.py

@@ -8,7 +8,7 @@
 import weakref
 from contextlib import contextmanager
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, List, Tuple, Union
+from typing import TYPE_CHECKING, Union
 from warnings import warn
 
 if TYPE_CHECKING:
@@ -140,14 +140,14 @@ class LinkerOptions:
     fma : bool, optional
         Use fast multiply-add.
         Default: True.
-    kernels_used : [Union[str, Tuple[str], List[str]]], optional
+    kernels_used : [Union[str, tuple[str], list[str]]], optional
         Pass a kernel or sequence of kernels that are used; any not in the list can be removed.
-    variables_used : [Union[str, Tuple[str], List[str]]], optional
+    variables_used : [Union[str, tuple[str], list[str]]], optional
         Pass a variable or sequence of variables that are used; any not in the list can be removed.
     optimize_unused_variables : bool, optional
         Assume that if a variable is not referenced in device code, it can be removed.
         Default: False.
-    ptxas_options : [Union[str, Tuple[str], List[str]]], optional
+    ptxas_options : [Union[str, tuple[str], list[str]]], optional
         Pass options to PTXAS.
     split_compile : int, optional
         Split compilation maximum thread count. Use 0 to use all available processors. Value of 1 disables split
@@ -177,10 +177,10 @@ class LinkerOptions:
     prec_div: bool | None = None
     prec_sqrt: bool | None = None
     fma: bool | None = None
-    kernels_used: Union[str, Tuple[str], List[str]] | None = None
-    variables_used: Union[str, Tuple[str], List[str]] | None = None
+    kernels_used: Union[str, tuple[str], list[str]] | None = None
+    variables_used: Union[str, tuple[str], list[str]] | None = None
     optimize_unused_variables: bool | None = None
-    ptxas_options: Union[str, Tuple[str], List[str]] | None = None
+    ptxas_options: Union[str, tuple[str], list[str]] | None = None
     split_compile: int | None = None
     split_compile_extended: int | None = None
     no_cache: bool | None = None

cuda_core/cuda/core/experimental/_memory.pyx

@@ -11,7 +11,7 @@ from cuda.core.experimental._utils.cuda_utils cimport (
 )
 
 import abc
-from typing import Tuple, TypeVar, Union
+from typing import TypeVar, Union
 
 from cuda.core.experimental._dlpack import DLDeviceType, make_py_capsule
 from cuda.core.experimental._stream import Stream, default_stream
@@ -183,8 +183,8 @@ cdef class Buffer:
         self,
         *,
         stream: int | None = None,
-        max_version: Tuple[int, int] | None = None,
-        dl_device: Tuple[int, int] | None = None,
+        max_version: tuple[int, int] | None = None,
+        dl_device: tuple[int, int] | None = None,
         copy: bool | None = None,
     ) -> PyCapsule:
         # Note: we ignore the stream argument entirely (as if it is -1).
@@ -197,12 +197,12 @@ cdef class Buffer:
             versioned = False
         else:
             if not isinstance(max_version, tuple) or len(max_version) != 2:
-                raise BufferError(f"Expected max_version Tuple[int, int], got {max_version}")
+                raise BufferError(f"Expected max_version tuple[int, int], got {max_version}")
             versioned = max_version >= (1, 0)
         capsule = make_py_capsule(self, versioned)
         return capsule
 
-    def __dlpack_device__(self) -> Tuple[int, int]:
+    def __dlpack_device__(self) -> tuple[int, int]:
         cdef bint d = self.is_device_accessible
         cdef bint h = self.is_host_accessible
         if d and (not h):

cuda_core/cuda/core/experimental/_program.py

@@ -6,7 +6,7 @@
 
 import weakref
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, List, Tuple, Union
+from typing import TYPE_CHECKING, Union
 from warnings import warn
 
 if TYPE_CHECKING:
@@ -33,22 +33,22 @@ def _process_define_macro_inner(formatted_options, macro):
         return True
     if isinstance(macro, tuple):
         if len(macro) != 2 or any(not isinstance(val, str) for val in macro):
-            raise RuntimeError(f"Expected define_macro Tuple[str, str], got {macro}")
+            raise RuntimeError(f"Expected define_macro tuple[str, str], got {macro}")
         formatted_options.append(f"--define-macro={macro[0]}={macro[1]}")
         return True
     return False
 
 
 def _process_define_macro(formatted_options, macro):
-    union_type = "Union[str, Tuple[str, str]]"
+    union_type = "Union[str, tuple[str, str]]"
     if _process_define_macro_inner(formatted_options, macro):
         return
     if is_nested_sequence(macro):
         for seq_macro in macro:
             if not _process_define_macro_inner(formatted_options, seq_macro):
                 raise RuntimeError(f"Expected define_macro {union_type}, got {seq_macro}")
         return
-    raise RuntimeError(f"Expected define_macro {union_type}, List[{union_type}], got {macro}")
+    raise RuntimeError(f"Expected define_macro {union_type}, list[{union_type}], got {macro}")
 
 
 @dataclass
@@ -79,7 +79,7 @@ class ProgramOptions:
         Enable device code optimization. When specified along with ‘-G’, enables limited debug information generation
         for optimized device code.
         Default: None
-    ptxas_options : Union[str, List[str]], optional
+    ptxas_options : Union[str, list[str]], optional
         Specify one or more options directly to ptxas, the PTX optimizing assembler. Options should be strings.
         For example ["-v", "-O2"].
         Default: None
@@ -113,17 +113,17 @@ class ProgramOptions:
     gen_opt_lto : bool, optional
         Run the optimizer passes before generating the LTO IR.
         Default: False
-    define_macro : Union[str, Tuple[str, str], List[Union[str, Tuple[str, str]]]], optional
+    define_macro : Union[str, tuple[str, str], list[Union[str, tuple[str, str]]]], optional
         Predefine a macro. Can be either a string, in which case that macro will be set to 1, a 2 element tuple of
         strings, in which case the first element is defined as the second, or a list of strings or tuples.
         Default: None
-    undefine_macro : Union[str, List[str]], optional
+    undefine_macro : Union[str, list[str]], optional
         Cancel any previous definition of a macro, or list of macros.
         Default: None
-    include_path : Union[str, List[str]], optional
+    include_path : Union[str, list[str]], optional
         Add the directory or directories to the list of directories to be searched for headers.
         Default: None
-    pre_include : Union[str, List[str]], optional
+    pre_include : Union[str, list[str]], optional
         Preinclude one or more headers during preprocessing. Can be either a string or a list of strings.
         Default: None
     no_source_include : bool, optional
@@ -156,13 +156,13 @@ class ProgramOptions:
     no_display_error_number : bool, optional
         Disable the display of a diagnostic number for warning messages.
         Default: False
-    diag_error : Union[int, List[int]], optional
+    diag_error : Union[int, list[int]], optional
         Emit error for a specified diagnostic message number or comma separated list of numbers.
         Default: None
-    diag_suppress : Union[int, List[int]], optional
+    diag_suppress : Union[int, list[int]], optional
         Suppress a specified diagnostic message number or comma separated list of numbers.
         Default: None
-    diag_warn : Union[int, List[int]], optional
+    diag_warn : Union[int, list[int]], optional
         Emit warning for a specified diagnostic message number or comma separated lis of numbers.
         Default: None
     brief_diagnostics : bool, optional
@@ -189,7 +189,7 @@ class ProgramOptions:
     debug: bool | None = None
     lineinfo: bool | None = None
     device_code_optimize: bool | None = None
-    ptxas_options: Union[str, List[str], Tuple[str]] | None = None
+    ptxas_options: Union[str, list[str], tuple[str]] | None = None
     max_register_count: int | None = None
     ftz: bool | None = None
     prec_sqrt: bool | None = None
@@ -200,11 +200,11 @@ class ProgramOptions:
     link_time_optimization: bool | None = None
     gen_opt_lto: bool | None = None
     define_macro: (
-        Union[str, Tuple[str, str], List[Union[str, Tuple[str, str]]], Tuple[Union[str, Tuple[str, str]]]] | None
+        Union[str, tuple[str, str], list[Union[str, tuple[str, str]]], tuple[Union[str, tuple[str, str]]]] | None
     ) = None
-    undefine_macro: Union[str, List[str], Tuple[str]] | None = None
-    include_path: Union[str, List[str], Tuple[str]] | None = None
-    pre_include: Union[str, List[str], Tuple[str]] | None = None
+    undefine_macro: Union[str, list[str], tuple[str]] | None = None
+    include_path: Union[str, list[str], tuple[str]] | None = None
+    pre_include: Union[str, list[str], tuple[str]] | None = None
     no_source_include: bool | None = None
     std: str | None = None
     builtin_move_forward: bool | None = None
@@ -215,9 +215,9 @@ class ProgramOptions:
     device_int128: bool | None = None
     optimization_info: str | None = None
     no_display_error_number: bool | None = None
-    diag_error: Union[int, List[int], Tuple[int]] | None = None
-    diag_suppress: Union[int, List[int], Tuple[int]] | None = None
-    diag_warn: Union[int, List[int], Tuple[int]] | None = None
+    diag_error: Union[int, list[int], tuple[int]] | None = None
+    diag_suppress: Union[int, list[int], tuple[int]] | None = None
+    diag_warn: Union[int, list[int], tuple[int]] | None = None
     brief_diagnostics: bool | None = None
     time: str | None = None
     split_compile: int | None = None
@@ -453,7 +453,7 @@ def compile(self, target_type, name_expressions=(), logs=None):
         target_type : Any
             String of the targeted compilation type.
             Supported options are "ptx", "cubin" and "ltoir".
-        name_expressions : Union[List, Tuple], optional
+        name_expressions : Union[list, tuple], optional
             List of explicit name expressions to become accessible.
             (Default to no expressions)
         logs : Any, optional

cuda_core/cuda/core/experimental/_stream.pyx

@@ -12,7 +12,7 @@ from cuda.core.experimental._utils.cuda_utils cimport (
 import os
 import warnings
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Optional, Protocol, Tuple, Union
+from typing import TYPE_CHECKING, Optional, Protocol, Union
 
 if TYPE_CHECKING:
     import cuda.bindings
@@ -47,7 +47,7 @@ cdef class StreamOptions:
 
 
 class IsStreamT(Protocol):
-    def __cuda_stream__(self) -> Tuple[int, int]:
+    def __cuda_stream__(self) -> tuple[int, int]:
         """
         For any Python object that is meant to be interpreted as a CUDA stream, the intent
         can be communicated by implementing this protocol that returns a 2-tuple: The protocol
@@ -201,7 +201,7 @@ cdef class Stream:
             self._owner = None
         self._handle = None
 
-    def __cuda_stream__(self) -> Tuple[int, int]:
+    def __cuda_stream__(self) -> tuple[int, int]:
         """Return an instance of a __cuda_stream__ protocol."""
         return (0, int(self.handle))
 

cuda_core/pyproject.toml

@@ -97,7 +97,6 @@ select = [
 ]
 
 ignore = [
-    "UP006",
     "UP007",
     "E741", # ambiguous variable name such as I
     "B007", # rename unsued loop variable to _name

cuda_core/tests/test_memory.py

@@ -229,9 +229,9 @@ def test_buffer_dunder_dlpack():
         buffer.__dlpack__(dl_device=())
     with pytest.raises(BufferError, match=r"^Sorry, not supported: copy=True$"):
         buffer.__dlpack__(copy=True)
-    with pytest.raises(BufferError, match=r"^Expected max_version Tuple\[int, int\], got \(\)$"):
+    with pytest.raises(BufferError, match=r"^Expected max_version tuple\[int, int\], got \(\)$"):
         buffer.__dlpack__(max_version=())
-    with pytest.raises(BufferError, match=r"^Expected max_version Tuple\[int, int\], got \(9, 8, 7\)$"):
+    with pytest.raises(BufferError, match=r"^Expected max_version tuple\[int, int\], got \(9, 8, 7\)$"):
         buffer.__dlpack__(max_version=(9, 8, 7))