pyopencl 2024.3__cp311-cp311-macosx_10_14_x86_64.whl → 2025.1__cp311-cp311-macosx_10_14_x86_64.whl

pyopencl/array.py

@@ -32,7 +32,7 @@ import builtins
 from dataclasses import dataclass
 from functools import reduce
 from numbers import Number
-from typing import Any, Dict, Hashable, List, Optional, Tuple, Union
+from typing import Any, Dict, List, Optional, Tuple, Union
 from warnings import warn
 
 import numpy as np
@@ -58,20 +58,14 @@ else:
     _SVMPointer_or_nothing = ()
 
 
-_NUMPY_PRE_2 = np.__version__.startswith("1.")
-
-
 # {{{ _get_common_dtype
 
-_COMMON_DTYPE_CACHE: Dict[Tuple[Hashable, ...], np.dtype] = {}
-
-
 class DoubleDowncastWarning(UserWarning):
     pass
 
 
 _DOUBLE_DOWNCAST_WARNING = (
-        "The operation you requested would result in a double-precisision "
+        "The operation you requested would result in a double-precision "
         "quantity according to numpy semantics. Since your device does not "
         "support double precision, a single-precision quantity is being returned.")
 
@@ -81,78 +75,12 @@ def _get_common_dtype(obj1, obj2, queue):
         raise ValueError("PyOpenCL array has no queue; call .with_queue() to "
                 "add one in order to be able to perform operations")
 
-    allow_double = has_double_support(queue.device)
-    cache_key = None
-    o1_is_array = isinstance(obj1, Array)
-    o2_is_array = isinstance(obj2, Array)
-
-    if o1_is_array and o2_is_array:
-        o1_dtype = obj1.dtype
-        o2_dtype = obj2.dtype
-        cache_key = (obj1.dtype, obj2.dtype, allow_double)
-    else:
-        o1_dtype = getattr(obj1, "dtype", type(obj1))
-        o2_dtype = getattr(obj2, "dtype", type(obj2))
-
-        o1_is_integral = np.issubdtype(o1_dtype, np.integer)
-        o2_is_integral = np.issubdtype(o1_dtype, np.integer)
-
-        o1_key = obj1 if o1_is_integral and not o1_is_array else o1_dtype
-        o2_key = obj2 if o2_is_integral and not o2_is_array else o2_dtype
+    # Note: We are calling np.result_type with pyopencl arrays here.
+    # Luckily, np.result_type only looks at the dtype of input arrays up until
+    # at least numpy v2.1.
+    result = np.result_type(obj1, obj2)
 
-        cache_key = (o1_key, o2_key, o1_is_array, o2_is_array, allow_double)
-
-    try:
-        return _COMMON_DTYPE_CACHE[cache_key]
-    except KeyError:
-        pass
-
-    # Numpy's behavior around integers is a bit bizarre, and definitely value-
-    # and not just type-sensitive when it comes to scalars.  We'll just do our
-    # best to emulate it.
-    #
-    # Some samples that are true as of numpy 1.23.1.
-    #
-    # >>> a = np.zeros(1, dtype=np.int16)
-    # >>> (a + 123123123312).dtype
-    # dtype('int64')
-    # >>> (a + 12312).dtype
-    # dtype('int16')
-    # >>> (a + 12312444).dtype
-    # dtype('int32')
-    # >>> (a + np.int32(12312444)).dtype
-    # dtype('int32')
-    # >>> (a + np.int32(1234)).dtype
-    # dtype('int16')
-    #
-    # Note that np.find_common_type, while appealing, won't be able to tell
-    # the full story.
-
-    if (_NUMPY_PRE_2
-            and not (o1_is_array and o2_is_array)
-            and o1_is_integral and o2_is_integral):
-        if o1_is_array:
-            obj1 = np.zeros(1, dtype=o1_dtype)
-        if o2_is_array:
-            obj2 = np.zeros(1, dtype=o2_dtype)
-
-        result = (obj1 + obj2).dtype
-    else:
-        array_types = []
-        scalars = []
-
-        if o1_is_array:
-            array_types.append(o1_dtype)
-        else:
-            scalars.append(obj1)
-        if o2_is_array:
-            array_types.append(o2_dtype)
-        else:
-            scalars.append(obj2)
-
-        result = np.result_type(*array_types, *scalars)
-
-    if not allow_double:
+    if not has_double_support(queue.device):
         if result == np.float64:
             result = np.dtype(np.float32)
             warn(_DOUBLE_DOWNCAST_WARNING, DoubleDowncastWarning, stacklevel=3)
@@ -160,9 +88,6 @@ def _get_common_dtype(obj1, obj2, queue):
             result = np.dtype(np.complex64)
             warn(_DOUBLE_DOWNCAST_WARNING, DoubleDowncastWarning, stacklevel=3)
 
-    if cache_key is not None:
-        _COMMON_DTYPE_CACHE[cache_key] = result
-
     return result
 
 # }}}
@@ -2518,7 +2443,7 @@ def arange(queue, *args, **kwargs):
         raise TypeError("arange requires a dtype argument")
 
     from math import ceil
-    size = int(ceil((stop-start)/step))
+    size = ceil((stop-start)/step)
 
     result = Array(queue, (size,), dtype, allocator=inf.allocator)
     result.add_event(_arange_knl(result, start, step, queue=queue))

pyopencl/cltypes.py

@@ -50,7 +50,7 @@ double = np.float64
 # {{{ vector types
 
 def _create_vector_types():
-    _mapping = [(k, globals()[k]) for k in
+    mapping = [(k, globals()[k]) for k in
                 ["char", "uchar", "short", "ushort", "int",
                  "uint", "long", "ulong", "float", "double"]]
 
@@ -64,7 +64,7 @@ def _create_vector_types():
 
     counts = [2, 3, 4, 8, 16]
 
-    for base_name, base_type in _mapping:
+    for base_name, base_type in mapping:
         for count in counts:
             name = "%s%d" % (base_name, count)
 

pyopencl/version.py

@@ -3,7 +3,7 @@ from importlib import metadata
 
 
 VERSION_TEXT = metadata.version("pyopencl")
-_match = re.match("^([0-9.]+)([a-z0-9]*?)$", VERSION_TEXT)
+_match = re.match(r"^([0-9.]+)([a-z0-9]*?)$", VERSION_TEXT)
 assert _match is not None
 VERSION_STATUS = _match.group(2)
 VERSION = tuple(int(nr) for nr in _match.group(1).split("."))

{pyopencl-2024.3.dist-info → pyopencl-2025.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: pyopencl
-Version: 2024.3
+Version: 2025.1
 Summary: Python wrapper for OpenCL
 Author-Email: Andreas Kloeckner <inform@tiker.net>
 Classifier: Development Status :: 5 - Production/Stable

{pyopencl-2024.3.dist-info → pyopencl-2025.1.dist-info}/RECORD

@@ -1,20 +1,20 @@
 pyopencl/algorithm.py,sha256=8qqD_GqvuQguSCDWcrJCeA05xFMj8mpJH1y5O0tUqmM,51293
 pyopencl/clmath.py,sha256=lOxQzE6BEp5-nVRuGu0hgxzk_gcx7aTiy_hRFxAPmcI,8222
-pyopencl/version.py,sha256=PhHAIjtUGVQ2wTVlqgoOrcC_2rkvNMmqvy1rRDqWOhg,267
+pyopencl/version.py,sha256=k4ev2_LuJAomsl8CUq1IHcINH3DUnLqTuGkf5q-ua10,268
 pyopencl/capture_call.py,sha256=B2d4SkPrj4f8j5jLDmKHSmSLxK0k9646gKL2FYZkejQ,5694
 pyopencl/reduction.py,sha256=CrWJPDYNy4hxtCGgwq2fkWAQXjJ8zMLxV5CEbAh3Wb8,25533
 pyopencl/tools.py,sha256=eZdKtkwY34kPbMR9FuFAmQbDQG8vJdv1az_UPiGNxjE,45940
 pyopencl/elementwise.py,sha256=HxSSpC944TeJkok8LGeNjqRgfKucbjpLEw3IoGOqLGc,38625
 pyopencl/cache.py,sha256=EbTTIxXmrdcgjzqWQl7O_1EG1RqniHg5sjJQS_5LXIs,16000
 pyopencl/__init__.py,sha256=BDkk5adIO4tHSYxxx_O7W4cyTHALwJB1aPpX5BrKep8,81443
-pyopencl/cltypes.py,sha256=DdBVPBU2bRuIbT8ImhWFIQosrefMOkAa4mY4yoSnurc,4818
+pyopencl/cltypes.py,sha256=Pkr7_oTkQhVHP-1JyfIWiE8ORpkQ3molOL986Sodvl0,4816
 pyopencl/invoker.py,sha256=hL5qMYOJpXEh2X1xbkkDaoYWRXgP-9fISY0N5VtL--8,14060
 pyopencl/ipython_ext.py,sha256=TUgxJa_w7tvXaKj6kPjiXNEKlxrwsJScQCD0khAA1kk,1915
 pyopencl/scan.py,sha256=Z4Ew6NE0VRNhxPItM4M8oCtPdif0yCclW-CcsFqScu0,65638
 pyopencl/_cluda.py,sha256=KKUxizD1iQEuZ_TmmFZNJ8IdXa8x8uT9HgB0nmAlYLw,2074
-pyopencl/_cl.cpython-311-darwin.so,sha256=qxBTtd5aWPu4QK_gxyyR75RtK06DbDusgUv38umeDgU,487128
+pyopencl/_cl.cpython-311-darwin.so,sha256=ZQ41WkNNDQXY9oFcjEKqtKUBRP2H32HTQEYxKP_g3dY,552120
 pyopencl/_mymako.py,sha256=WzmwJ-9EyenDo6RNOcXZmVum886PsmPS2gLNmUBORsA,620
-pyopencl/array.py,sha256=tw-OcXsRyStFcpLEjq64aiuX9rvlcMzu4qtshyJOWY4,111773
+pyopencl/array.py,sha256=tENUt-t3tso0LjQS4o6s2nXFwIOxzazOeTS3V-YpN2M,109612
 pyopencl/bitonic_sort.py,sha256=cHd7PHX0arDGJbhaB7AJVI9THVJE69lGuGiB08zeZJ0,8021
 pyopencl/bitonic_sort_templates.py,sha256=x2hJaR-9AO74C_X7bVTTSxQxGqoDrF2-nQxzmMCSCXs,16151
 pyopencl/clrandom.py,sha256=BciZJkcKaNzmqP8tfGdb5SPI4qMACSUtLbQTJaOT5kE,13044
@@ -36,7 +36,7 @@ pyopencl/cl/pyopencl-random123/threefry.cl,sha256=2WmQGxx5gPSv22UL9_MlXv0eMug91k
 pyopencl/cl/pyopencl-random123/philox.cl,sha256=vYcQH7Vw13Q3qkW5Nhy1HTUDbWLGKoloE1YP0VWk6vU,21740
 pyopencl/cl/pyopencl-random123/array.h,sha256=nIV0zDWYuybldNgtsh79icNtDXHYdDsSpFaWIvDTyw4,17088
 pyopencl/cl/pyopencl-random123/openclfeatures.h,sha256=pAPbl7JkQgJxulSuGGevpaI43P7PwiH2mYxtNfHq59M,2881
-pyopencl-2024.3.dist-info/RECORD,,
-pyopencl-2024.3.dist-info/WHEEL,sha256=KEGFkeKhpIXnpo3O52Lh8ueC3-31r69536bUTFfcapU,116
-pyopencl-2024.3.dist-info/METADATA,sha256=3Y2AW8BahKcnAPNcX0jR65xiQPsUluv8sTbrVsCtZZc,4783
-pyopencl-2024.3.dist-info/licenses/LICENSE,sha256=wiBvs-UC54bB5DswWuvB66B96b4hkYw_VLt8IR0cBPI,15284
+pyopencl-2025.1.dist-info/RECORD,,
+pyopencl-2025.1.dist-info/WHEEL,sha256=KEGFkeKhpIXnpo3O52Lh8ueC3-31r69536bUTFfcapU,116
+pyopencl-2025.1.dist-info/METADATA,sha256=WUY6JEb89dxhMwOVvX9OJVBYPqzlqPNt1TypeIxsCkQ,4783
+pyopencl-2025.1.dist-info/licenses/LICENSE,sha256=wiBvs-UC54bB5DswWuvB66B96b4hkYw_VLt8IR0cBPI,15284