pyopencl 2025.2.1__cp311-cp311-win_amd64.whl → 2025.2.3__cp311-cp311-win_amd64.whl

pyopencl/compyte/array.py

@@ -20,10 +20,13 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
+from typing import Any, Protocol
+
 import numpy as np
+from typing_extensions import override
 
 
-def f_contiguous_strides(itemsize, shape):
+def f_contiguous_strides(itemsize: int, shape: tuple[int, ...]) -> tuple[int, ...]:
     if shape:
         strides = [itemsize]
         for s in shape[:-1]:
@@ -36,7 +39,7 @@ def f_contiguous_strides(itemsize, shape):
         return ()
 
 
-def c_contiguous_strides(itemsize, shape):
+def c_contiguous_strides(itemsize: int, shape: tuple[int, ...]) -> tuple[int, ...]:
     if shape:
         strides = [itemsize]
         for s in shape[:0:-1]:
@@ -49,7 +52,11 @@ def c_contiguous_strides(itemsize, shape):
         return ()
 
 
-def equal_strides(strides1, strides2, shape):
+def equal_strides(
+            strides1: tuple[int, ...],
+            strides2: tuple[int, ...],
+            shape: tuple[int, ...]
+        ) -> bool:
     if strides1 == strides2:
         return True
 
@@ -63,33 +70,53 @@ def equal_strides(strides1, strides2, shape):
     return True
 
 
-def is_f_contiguous_strides(strides, itemsize, shape):
+def is_f_contiguous_strides(
+            strides: tuple[int, ...],
+            itemsize: int,
+            shape: tuple[int, ...]
+        ) -> bool:
     from pytools import product
     return (
             equal_strides(strides, f_contiguous_strides(itemsize, shape), shape)
             or product(shape) == 0)
 
 
-def is_c_contiguous_strides(strides, itemsize, shape):
+def is_c_contiguous_strides(
+            strides: tuple[int, ...],
+            itemsize: int,
+            shape: tuple[int, ...]
+        ) -> bool:
     from pytools import product
     return (equal_strides(strides, c_contiguous_strides(itemsize, shape), shape)
             or product(shape) == 0)
 
 
+class ArrayIsh(Protocol):
+    shape: tuple[int, ...]
+    strides: tuple[int, ...]
+    dtype: np.dtype[Any]
+
+
 class ArrayFlags:
-    def __init__(self, ary):
+    f_contiguous: bool
+    c_contiguous: bool
+    forc: bool
+
+    def __init__(self, ary: ArrayIsh):
         self.f_contiguous = is_f_contiguous_strides(
             ary.strides, ary.dtype.itemsize, ary.shape)
         self.c_contiguous = is_c_contiguous_strides(
             ary.strides, ary.dtype.itemsize, ary.shape)
         self.forc = self.f_contiguous or self.c_contiguous
 
+    @override
     def __repr__(self):
         return (
                 f"  C_CONTIGUOUS : {self.c_contiguous}\n"
                 f"  F_CONTIGUOUS : {self.f_contiguous}"
                 )
 
+    @override
     def __str__(self):
         return repr(self)
 

pyopencl/compyte/dtypes.py

@@ -26,7 +26,11 @@ FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 OTHER DEALINGS IN THE SOFTWARE.
 """
 
+from collections.abc import Sequence
+from typing import Any, Callable, TypeVar
+
 import numpy as np
+from numpy.typing import DTypeLike
 
 
 class TypeNameNotKnown(RuntimeError):  # noqa: N818
@@ -36,11 +40,16 @@ class TypeNameNotKnown(RuntimeError):  # noqa: N818
 # {{{ registry
 
 class DTypeRegistry:
+    dtype_to_name: dict[np.dtype[Any] | str, str]
+    name_to_dtype: dict[str, np.dtype[Any]]
+
     def __init__(self):
         self.dtype_to_name = {}
         self.name_to_dtype = {}
 
-    def get_or_register_dtype(self, c_names, dtype=None):
+    def get_or_register_dtype(self,
+                names: str | Sequence[str],
+                dtype: DTypeLike | None = None) -> np.dtype[Any]:
         """Get or register a :class:`numpy.dtype` associated with the C type names
         in the string list *c_names*. If *dtype* is `None`, no registration is
         performed, and the :class:`numpy.dtype` must already have been registered.
@@ -57,12 +66,12 @@ class DTypeRegistry:
         .. versionadded:: 2012.2
         """
 
-        if isinstance(c_names, str):
-            c_names = [c_names]
+        if isinstance(names, str):
+            names = [names]
 
         if dtype is None:
             from pytools import single_valued
-            return single_valued(self.name_to_dtype[name] for name in c_names)
+            return single_valued(self.name_to_dtype[name] for name in names)
 
         dtype = np.dtype(dtype)
 
@@ -77,7 +86,7 @@ class DTypeRegistry:
             assert existing_dtype == dtype
             dtype = existing_dtype
 
-        for nm in c_names:
+        for nm in names:
             try:
                 name_dtype = self.name_to_dtype[nm]
             except KeyError:
@@ -88,13 +97,13 @@ class DTypeRegistry:
                         f"name '{nm}' already registered to different dtype")
 
         if not existed:
-            self.dtype_to_name[dtype] = c_names[0]
+            self.dtype_to_name[dtype] = names[0]
         if str(dtype) not in self.dtype_to_name:
-            self.dtype_to_name[str(dtype)] = c_names[0]
+            self.dtype_to_name[str(dtype)] = names[0]
 
         return dtype
 
-    def dtype_to_ctype(self, dtype):
+    def dtype_to_ctype(self, dtype: DTypeLike) -> str:
         if dtype is None:
             raise ValueError("dtype may not be None")
 
@@ -110,7 +119,11 @@ class DTypeRegistry:
 
 # {{{ C types
 
-def fill_registry_with_c_types(reg, respect_windows, include_bool=True):
+def fill_registry_with_c_types(
+            reg: DTypeRegistry,
+            respect_windows: bool,
+            include_bool: bool = True
+        ) -> None:
     import struct
     from sys import platform
 
@@ -147,17 +160,11 @@ def fill_registry_with_c_types(reg, respect_windows, include_bool=True):
                 f"{i64_name} unsigned int"],
                 np.uint64)
 
-    # https://github.com/numpy/numpy/issues/2610
-    if is_64_bit:
-        reg.get_or_register_dtype([f"unsigned {i64_name}"], np.uintp)
-    else:
-        reg.get_or_register_dtype(["unsigned"], np.uintp)
-
     reg.get_or_register_dtype("float", np.float32)
     reg.get_or_register_dtype("double", np.float64)
 
 
-def fill_registry_with_opencl_c_types(reg):
+def fill_registry_with_opencl_c_types(reg: DTypeRegistry) -> None:
     reg.get_or_register_dtype(["char", "signed char"], np.int8)
     reg.get_or_register_dtype(["uchar", "unsigned char"], np.uint8)
     reg.get_or_register_dtype(["short", "signed short",
@@ -183,7 +190,7 @@ def fill_registry_with_opencl_c_types(reg):
     reg.get_or_register_dtype("double", np.float64)
 
 
-def fill_registry_with_c99_stdint_types(reg):
+def fill_registry_with_c99_stdint_types(reg: DTypeRegistry) -> None:
     reg.get_or_register_dtype("bool", np.bool_)
 
     reg.get_or_register_dtype("int8_t", np.int8)
@@ -200,7 +207,7 @@ def fill_registry_with_c99_stdint_types(reg):
     reg.get_or_register_dtype("double", np.float64)
 
 
-def fill_registry_with_c99_complex_types(reg):
+def fill_registry_with_c99_complex_types(reg: DTypeRegistry) -> None:
     reg.get_or_register_dtype("float complex", np.complex64)
     reg.get_or_register_dtype("double complex", np.complex128)
     reg.get_or_register_dtype("long double complex", np.clongdouble)
@@ -229,12 +236,21 @@ def _fill_dtype_registry(respect_windows, include_bool=True):
 
 # {{{ c declarator parsing
 
-def parse_c_arg_backend(c_arg, scalar_arg_factory, vec_arg_factory,
-        name_to_dtype=None):
+ArgTypeT = TypeVar("ArgTypeT")
+
+
+def parse_c_arg_backend(
+            c_arg: str,
+            scalar_arg_factory: Callable[[np.dtype[Any], str], ArgTypeT],
+            vec_arg_factory: Callable[[np.dtype[Any], str], ArgTypeT],
+            name_to_dtype: Callable[[str], np.dtype[Any]] | DTypeRegistry | None = None,
+        ):
     if isinstance(name_to_dtype, DTypeRegistry):
-        name_to_dtype = name_to_dtype.name_to_dtype__getitem__
+        name_to_dtype_clbl = name_to_dtype.name_to_dtype.__getitem__
     elif name_to_dtype is None:
-        name_to_dtype = NAME_TO_DTYPE.__getitem__
+        name_to_dtype_clbl = NAME_TO_DTYPE.__getitem__
+    else:
+        name_to_dtype_clbl = name_to_dtype
 
     c_arg = (c_arg
             .replace("const", "")
@@ -261,7 +277,7 @@ def parse_c_arg_backend(c_arg, scalar_arg_factory, vec_arg_factory,
     tp = " ".join(tp.split())
 
     try:
-        dtype = name_to_dtype(tp)
+        dtype = name_to_dtype_clbl(tp)
     except KeyError:
         raise ValueError(f"unknown type '{tp}'") from None
 
@@ -270,7 +286,11 @@ def parse_c_arg_backend(c_arg, scalar_arg_factory, vec_arg_factory,
 # }}}
 
 
-def register_dtype(dtype, c_names, alias_ok=False):
+def register_dtype(
+            dtype: DTypeLike,
+            c_names: Sequence[str] | str,
+            alias_ok: bool = False
+        ) -> None:
     from warnings import warn
     warn("register_dtype is deprecated. Use get_or_register_dtype instead.",
             DeprecationWarning, stacklevel=2)

pyopencl/compyte/pyproject.toml

@@ -32,3 +32,21 @@ known-first-party = [
     "pytools",
 ]
 lines-after-imports = 2
+
+
+[tool.basedpyright]
+reportImplicitStringConcatenation = "none"
+reportUnnecessaryIsInstance = "none"
+reportUnusedCallResult = "none"
+reportExplicitAny = "none"
+reportUnreachable = "hint"
+# array.py looks like stdlib array, but pyright doesn't know this
+# won't ever be a top-level anything.
+reportShadowedImports = "none"
+
+# This reports even cycles that are qualified by 'if TYPE_CHECKING'. Not what
+# we care about at this moment.
+# https://github.com/microsoft/pyright/issues/746
+reportImportCycles = "none"
+pythonVersion = "3.10"
+pythonPlatform = "All"

pyopencl/reduction.py

@@ -30,12 +30,14 @@ Based on code/ideas by Mark Harris <mharris@nvidia.com>.
 None of the original source code remains.
 """
 
+import builtins
 from dataclasses import dataclass
-from typing import Any
+from typing import TYPE_CHECKING, Any, Literal, cast, overload
 
 import numpy as np
 
 import pyopencl as cl
+import pyopencl.array as cl_array
 from pyopencl.tools import (
     DtypedArgument,
     KernelTemplateBase,
@@ -45,6 +47,10 @@ from pyopencl.tools import (
 )
 
 
+if TYPE_CHECKING:
+    from pyopencl.typing import Allocator
+
+
 # {{{ kernel source
 
 KERNEL = r"""//CL//
@@ -351,7 +357,40 @@ class ReductionKernel:
                 name=f"{name}_stage2", options=options, preamble=preamble,
                 max_group_size=max_group_size)
 
-    def __call__(self, *args: Any, **kwargs: Any) -> cl.Event:
+    @overload
+    def __call__(self,
+                *args: object,
+                return_event: Literal[True],
+                queue: cl.CommandQueue | None = None,
+                allocator: Allocator | None = None,
+                wait_for: cl.WaitList = None,
+                out: cl_array.Array | None = None,
+                range: slice | None = None,
+                slice: slice | None = None
+            ) ->  tuple[cl_array.Array, cl.Event]: ...
+
+    @overload
+    def __call__(self,
+                *args: object,
+                return_event: Literal[False],
+                queue: cl.CommandQueue | None = None,
+                allocator: Allocator | None = None,
+                wait_for: cl.WaitList = None,
+                out: cl_array.Array | None = None,
+                range: slice | None = None,
+                slice: slice | None = None
+            ) -> cl_array.Array: ...
+
+    def __call__(self,
+                *args: object,
+                return_event: bool = False,
+                queue: cl.CommandQueue | None = None,
+                allocator: Allocator | None = None,
+                wait_for: cl.WaitList = None,
+                out: cl_array.Array | None = None,
+                range: slice | None = None,
+                slice: slice | None = None
+            ) -> cl_array.Array | tuple[cl_array.Array, cl.Event]:
         """Invoke the generated kernel.
 
         |explain-waitfor|
@@ -390,18 +429,6 @@ class ReductionKernel:
             ``(scalar_array, event)``.
         """
 
-        queue = kwargs.pop("queue", None)
-        allocator = kwargs.pop("allocator", None)
-        wait_for = kwargs.pop("wait_for", None)
-        return_event = kwargs.pop("return_event", False)
-        out = kwargs.pop("out", None)
-
-        range_ = kwargs.pop("range", None)
-        slice_ = kwargs.pop("slice", None)
-
-        if kwargs:
-            raise TypeError("invalid keyword argument to reduction kernel")
-
         if wait_for is None:
             wait_for = []
         else:
@@ -415,13 +442,14 @@ class ReductionKernel:
 
         while True:
             invocation_args = []
-            vectors = []
+            vectors: list[cl_array.Array] = []
 
             array_empty = empty
 
             from pyopencl.tools import VectorArg
             for arg, arg_tp in zip(args, stage_inf.arg_types, strict=True):
                 if isinstance(arg_tp, VectorArg):
+                    assert isinstance(arg, cl_array.Array)
                     array_empty = arg.__class__
                     if not arg.flags.forc:
                         raise RuntimeError(
@@ -443,31 +471,30 @@ class ReductionKernel:
 
             # {{{ range/slice processing
 
-            if range_ is not None:
-                if slice_ is not None:
+            if range is not None:
+                if slice is not None:
                     raise TypeError("may not specify both range and slice "
                             "keyword arguments")
 
             else:
-                if slice_ is None:
-                    slice_ = slice(None)
+                if slice is None:
+                    slice = builtins.slice(None)
 
                 if repr_vec is None:
                     raise TypeError(
                             "must have vector argument when range is not specified")
 
-                range_ = slice(*slice_.indices(repr_vec.size))
+                range = builtins.slice(*slice.indices(repr_vec.size))
 
-            assert range_ is not None
+            assert range is not None
 
-            start = range_.start
+            start = cast("int | None", range.start)
             if start is None:
                 start = 0
-            if range_.step is None:
+            step = cast("int | None", range.step)
+            if step is None:
                 step = 1
-            else:
-                step = range_.step
-            sz = abs(range_.stop - start)//step
+            sz = abs(cast("int", range.stop) - start) //step
 
             # }}}
 
@@ -504,7 +531,7 @@ class ReductionKernel:
                 macrogroup_size = group_count*stage_inf.group_size
                 seq_count = (sz + macrogroup_size - 1) // macrogroup_size
 
-            size_args = [start, step, range_.stop, seq_count, sz]
+            size_args = [start, step, range.stop, seq_count, sz]
 
             if group_count == 1 and out is not None:
                 result = out
@@ -536,7 +563,7 @@ class ReductionKernel:
                 stage_inf = self.stage_2_inf
                 args = (result, *stage1_args)
 
-                range_ = slice_ = None
+                range = slice = None
 
 # }}}
 

pyopencl/typing.py

@@ -23,7 +23,7 @@ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
 THE SOFTWARE.
 """
 
-from collections.abc import Sequence
+from collections.abc import Callable, Sequence
 from typing import TYPE_CHECKING, Any, TypeAlias, TypeVar
 
 import numpy as np
@@ -33,6 +33,7 @@ from typing_extensions import Buffer as abc_Buffer
 
 if TYPE_CHECKING:
     import pyopencl as _cl
+    import pyopencl.array as _cl_array
 
 
 DTypeT = TypeVar("DTypeT", bound=np.dtype[Any])
@@ -49,4 +50,8 @@ KernelArg: TypeAlias = """
     | _cl.Buffer
     | _cl.Image
     | _cl.Sampler
-    | _cl.SVMPointer"""
+    | _cl.SVMPointer
+    | _cl_array.Array
+    | None"""
+
+Allocator: TypeAlias = "Callable[[int], _cl.MemoryObjectHolder | _cl.SVMPointer]"

{pyopencl-2025.2.1.dist-info → pyopencl-2025.2.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyopencl
-Version: 2025.2.1
+Version: 2025.2.3
 Summary: Python wrapper for OpenCL
 Author-Email: Andreas Kloeckner <inform@tiker.net>
 License-Expression: MIT

{pyopencl-2025.2.1.dist-info → pyopencl-2025.2.3.dist-info}/RECORD

@@ -1,11 +1,11 @@
-pyopencl/__init__.py,sha256=tF-6Bz22ydaM-nymBImLy7EajeklT_CQgdQNFIFWEl0,64721
-pyopencl/_cl.cp311-win_amd64.pyd,sha256=_mkZirJDgf7oyhF92YkEXzuR8Z4G7qUqjEpMK7zH_aM,633344
+pyopencl/__init__.py,sha256=JAui3XXEV-mVuAeufIOvmvg4TwagUkNsppoJewozayg,65173
+pyopencl/_cl.cp311-win_amd64.pyd,sha256=yb6pp_7lzvYIe3HTeIqlhKkQLbFLoBBORRPpwCfMf9Q,633344
 pyopencl/_cl.pyi,sha256=QnCqG_fjW3VyUQsxcdcZ8M3ZePQ1BtA4XWFfgjfwGPg,58241
 pyopencl/_cluda.py,sha256=zlp4ECLzlQOF5ERjXeDJ6j5wYsxPm3VAYwd7adnNYo0,2168
 pyopencl/_monkeypatch.py,sha256=EyC-4DeFCaSBKQ00kJZxF6z-e44P-XSL6xAN2X0oDXM,35908
 pyopencl/_mymako.py,sha256=Ki5F6iY5oAdm_R6Mll-ltbO-DZF37FDEINimG2HRyRY,674
 pyopencl/algorithm.py,sha256=Gx7xqny_g7SA56gbApRdWUvm8UHWJDNvkdL1L3eQ4rY,52824
-pyopencl/array.py,sha256=QImtVkujKnC93uOtZvFIXes8Rlp4e1S9-gVqNtxwfm4,112961
+pyopencl/array.py,sha256=a99NDsxrpzEWfLx8vqUmLF9RY9U3XIgxjAQY5AIjhag,114958
 pyopencl/bitonic_sort.py,sha256=RQUC8tpezdTQGzSEFyue86gVjc76vLKDwaNkqi4afa8,8297
 pyopencl/bitonic_sort_templates.py,sha256=RQaGOQf7f3f4FPX80h4rxOq3_gAq0e6OKaZIuBjcoUI,16785
 pyopencl/cache.py,sha256=R_EW9ekoMe9V4Am6MbIgtnMm-BbRQyWZgzfscKEtkB0,16552
@@ -28,19 +28,19 @@ pyopencl/clrandom.py,sha256=ozqtoMU9-68DaLDR6SEpjq0rPZ-UeqQuJU-vlp_y2eA,13493
 pyopencl/cltypes.py,sha256=gjRNaTQKQvyWI2ObF-BczGqEIAcgu_SzoW1-_22YLCY,6247
 pyopencl/compyte/.gitignore,sha256=PFMRSJycIqPtcpEn7VqbcenWJqHFDuYtwQm_tLbADt8,189
 pyopencl/compyte/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyopencl/compyte/array.py,sha256=3V7o2uIzebJ3H-g23NP2qe5DGXAkuoLYaQJtKcXc6yU,7594
-pyopencl/compyte/dtypes.py,sha256=HNNh35QPyhsWn-BzvidltBA3Hi72XGlW3-62vRp-bkc,10201
-pyopencl/compyte/pyproject.toml,sha256=y_MOlhePlmLI24oycBBDKqDpfePj2U_fju4mOcbV4GI,756
+pyopencl/compyte/array.py,sha256=uJWC8KBRU29Wzx35VZ-bXRjC-2Qzr8y-4J0UdgldVik,8276
+pyopencl/compyte/dtypes.py,sha256=oNDNExqCOwjI5P17zuGhxcNSbXzEbSMlgEWMdnSZ6JU,10862
+pyopencl/compyte/pyproject.toml,sha256=iUOcs-BY0oYBQyIjT0knJM95TYcoWF-nB7E_FmuyIaE,1332
 pyopencl/elementwise.py,sha256=9VOX-sg8vkPne3PGROxuXLSf1FeQ8E8uGKRYvxrRIg4,39852
 pyopencl/invoker.py,sha256=hMmVaXOgmOjTjCI6Evjx4x_c8FrbBPlClFGCqirAtOE,14123
 pyopencl/ipython_ext.py,sha256=Hfx5go15On4B0CRDuZcsa3d-lme4-xPNHPdgEa9fbJ8,2021
 pyopencl/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-pyopencl/reduction.py,sha256=PUd_5n0ZShiNs8s-Cy4_fqfEiZLx9LICSCuo9wrwe60,26295
+pyopencl/reduction.py,sha256=QypvaTblYw0oKcNv_Gs-pYz96RvcQa2GouAkVhvft58,27459
 pyopencl/scan.py,sha256=tmYbMbSx0CfilgZoRzbROX9TbjptPCxHD-WDUx11uTg,67535
 pyopencl/tools.py,sha256=jLvZAjCBJKwN0Wg_jH9XAObvqIJh-haz_VXpFSfXB1M,48161
-pyopencl/typing.py,sha256=QJTJMuVZ7C5og65xT8s0VJQ6AibQ-Vz7DoEk-vmeg84,1857
+pyopencl/typing.py,sha256=JX9tpZPtwyDb2IpM8Ka3YopLpxe1Iidz-Ot7IFprrU8,2027
 pyopencl/version.py,sha256=Z5G_fsr_KVWqiYzK_pOQ2PbAO20wrFlEuqqKBGiAv4I,315
-pyopencl-2025.2.1.dist-info/METADATA,sha256=ZWuBJXxGy78MiQ68EB8rPStHxAZ7PNgk5LJqDH2OFbg,4756
-pyopencl-2025.2.1.dist-info/WHEEL,sha256=snOjF3_Qdfl83AvEPF_jBYJIRsss89-Tk83TV05TAGs,106
-pyopencl-2025.2.1.dist-info/licenses/LICENSE,sha256=jib9h6nV8oAvCkKPKDecpLakmQi1SktCn4YXmllgySY,15566
-pyopencl-2025.2.1.dist-info/RECORD,,
+pyopencl-2025.2.3.dist-info/METADATA,sha256=2_oRPyLkdxIGNHm3rCoXzlT-GQkg97zLWGWae1v0GIo,4756
+pyopencl-2025.2.3.dist-info/WHEEL,sha256=snOjF3_Qdfl83AvEPF_jBYJIRsss89-Tk83TV05TAGs,106
+pyopencl-2025.2.3.dist-info/licenses/LICENSE,sha256=jib9h6nV8oAvCkKPKDecpLakmQi1SktCn4YXmllgySY,15566
+pyopencl-2025.2.3.dist-info/RECORD,,