pyopencl 2024.3__cp39-cp39-win_amd64.whl → 2025.1__cp39-cp39-win_amd64.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,9 +1,9 @@
 pyopencl/__init__.py,sha256=wCR09HsGaQ532Dc5vdU8WiyZGZ0qtHBbJQrPQMEGpYI,83853
-pyopencl/_cl.cp39-win_amd64.pyd,sha256=frihMFKY_UF30rxQF59fUGovpl55HPqT3fXclocL5C4,580096
+pyopencl/_cl.cp39-win_amd64.pyd,sha256=RmZH6nDKs6fs4QyCr7_Suc6KiMzytJSj_hrJd-5GLCg,633344
 pyopencl/_cluda.py,sha256=5coLt4eR5BOLgfUesgnaTx_nUhZ6BBhYi9dodvl7cbc,2128
 pyopencl/_mymako.py,sha256=55mRxOnOH9N7ltPWPND19GD4cszQrB2dhiMUlouoWKU,634
 pyopencl/algorithm.py,sha256=7ilnIG3c4YMDUBP4w4e10UMDHj9nbFITg1oLnEEsej0,52742
-pyopencl/array.py,sha256=Ij8euQy7zxxyxyjw7IM841K0MirNV5Zgr690_wMWmAA,115210
+pyopencl/array.py,sha256=WFKzJt9dAoOzu_iildla41PcWWiKxPmh5e8zYA2LxB8,112974
 pyopencl/bitonic_sort.py,sha256=r5Jy-C7LE5ml-Qt0KwD4E0g-Cf4DwpmO_3d25KLNUwY,8263
 pyopencl/bitonic_sort_templates.py,sha256=XQjUiHS9KjFIUYIil1Ls9293hy751AOsJmszlNS-IFk,16745
 pyopencl/cache.py,sha256=HMS-dEURWulvFOzEY33LzNSw3notDY_Rsv_L16OiSuo,16535
@@ -23,7 +23,7 @@ pyopencl/cl/pyopencl-random123/philox.cl,sha256=KqPbLt54UwrHPvBe7v4ZMzqI2oGrzp0c
 pyopencl/cl/pyopencl-random123/threefry.cl,sha256=bC78-HJVuc4AFiNppglDQiN8cZRD45hG1PPdi4Sdt-o,55563
 pyopencl/clmath.py,sha256=GL9s0YwKpCgvsGl6ndoWXEngPFWAqRRR_HOoQm57OA8,8502
 pyopencl/clrandom.py,sha256=baRE9GgAqGcp2xy9FgI0E4oEygLqyjZqwIs6YvB35ok,13453
-pyopencl/cltypes.py,sha256=2jCvMMBtkhXxfbBFBfM4NSFKRg7kEo1tlwGJQlyiwmQ,4955
+pyopencl/cltypes.py,sha256=HL-df-L7ivztkHVXN8ef3TxhjfDVHxs-dXudvycd_P0,4953
 pyopencl/compyte/.gitignore,sha256=PFMRSJycIqPtcpEn7VqbcenWJqHFDuYtwQm_tLbADt8,189
 pyopencl/compyte/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 pyopencl/compyte/array.py,sha256=IJzw-dSS_injEiLVNHLlSRi0R2F1sO_8xeeK-XezsSo,7636
@@ -35,8 +35,8 @@ pyopencl/ipython_ext.py,sha256=e-K-Yjd6sTP9-9d69v0k_1_ifdK77JWMhbynn1FBDH4,1983
 pyopencl/reduction.py,sha256=QoXRhi2_RjUpGDhcfWiMzHHXoBZJuRncnBTn5xwJgR4,26319
 pyopencl/scan.py,sha256=5YoKCBdIHoPha9onGna_65ne2maU0RZ7nR7X2L47YrA,67553
 pyopencl/tools.py,sha256=Pzjm7juH52NZ5fF7ppgCy-p9kR-Jhtw8xqnh-qCEjfs,47467
-pyopencl/version.py,sha256=Fp_v5G59_24Um9NujHpex3VRwdffKTwtN8tjiQl5QOQ,276
-pyopencl-2024.3.dist-info/METADATA,sha256=3Y2AW8BahKcnAPNcX0jR65xiQPsUluv8sTbrVsCtZZc,4783
-pyopencl-2024.3.dist-info/WHEEL,sha256=s-IzttuPuPJp8zDv-jm-zGvTOCxdFCvjX9dIQ9zqnM8,104
-pyopencl-2024.3.dist-info/licenses/LICENSE,sha256=jib9h6nV8oAvCkKPKDecpLakmQi1SktCn4YXmllgySY,15566
-pyopencl-2024.3.dist-info/RECORD,,
+pyopencl/version.py,sha256=sFqCA3Ga7hdYRf_43asDOP4gFoFRrZxfkMoyN-HAgNo,277
+pyopencl-2025.1.dist-info/METADATA,sha256=WUY6JEb89dxhMwOVvX9OJVBYPqzlqPNt1TypeIxsCkQ,4783
+pyopencl-2025.1.dist-info/WHEEL,sha256=s-IzttuPuPJp8zDv-jm-zGvTOCxdFCvjX9dIQ9zqnM8,104
+pyopencl-2025.1.dist-info/licenses/LICENSE,sha256=jib9h6nV8oAvCkKPKDecpLakmQi1SktCn4YXmllgySY,15566
+pyopencl-2025.1.dist-info/RECORD,,