xobjects 0.2.5__tar.gz → 0.2.7__tar.gz

{xobjects-0.2.5 → xobjects-0.2.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xobjects
-Version: 0.2.5
+Version: 0.2.7
 Summary: In-memory serialization and code generator for CPU and GPU
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xobjects

{xobjects-0.2.5 → xobjects-0.2.7}/setup.py

@@ -33,6 +33,6 @@ setup(
         "Source Code": "https://github.com/xsuite/xobjects",
     },
     extras_require={
-        "tests": ["pytest"],
+        "tests": ["pytest", "pytest-mock"],
     },
 )

xobjects-0.2.7/xobjects/_version.py

@@ -0,0 +1 @@
+__version__ = "0.2.7"

{xobjects-0.2.5 → xobjects-0.2.7}/xobjects/context_cpu.py

@@ -14,6 +14,7 @@ from typing import Callable, Dict, List, Sequence, Tuple
 from .general import _print
 
 import numpy as np
+import scipy as sp
 
 from .context import (
     Kernel,
@@ -535,6 +536,16 @@ class ContextCpu(XContext):
 
         return np
 
+    @property
+    def splike_lib(self):
+        """
+        Module containing all the scipy features. Numpy members should be accessed
+        through ``splike_lib`` to keep compatibility with the other contexts.
+
+        """
+
+        return sp
+
     def synchronize(self):
         """
         Ensures that all computations submitted to the context are completed.
@@ -711,6 +722,7 @@ class BufferNumpy(XBuffer):
         """return data that can be used as argument in kernel"""
         return self.buffer[offset : offset + nbytes]
 
+
 class KernelCpu:
     def __init__(
         self,
@@ -754,7 +766,7 @@ class KernelCpu:
         else:
             if hasattr(arg.atype, "_dtype"):  # it is numerical scalar
                 return arg.atype(value)  # try to return a numpy scalar
-            elif (hasattr(arg.atype, "_size")):  # it is a compound xobject
+            elif hasattr(arg.atype, "_size"):  # it is a compound xobject
                 assert isinstance(
                     value._buffer.context, ContextCpu
                 ), f"Incompatible context for argument `{arg.name}`."

{xobjects-0.2.5 → xobjects-0.2.7}/xobjects/context_cupy.py

@@ -26,6 +26,11 @@ log = logging.getLogger(__name__)
 
 try:
     import cupy
+    import cupyx.scipy
+    import cupyx.scipy.interpolate
+    import cupyx.scipy.signal
+    import cupyx.scipy.special
+    import cupyx.scipy.stats
     from cupyx.scipy import fftpack as cufftp
 
     _enabled = True
@@ -500,6 +505,13 @@ class ContextCupy(XContext):
         """
         return cupy
 
+    @property
+    def splike_lib(self):
+        """
+        Module containing all the scipy features supported by cupy.
+        """
+        return cupyx.scipy
+
     def synchronize(self):
         """
         Ensures that all computations submitted to the context are completed.

{xobjects-0.2.5 → xobjects-0.2.7}/xobjects/context_pyopencl.py

@@ -273,6 +273,13 @@ class ContextPyopencl(XContext):
         """
         return cla
 
+    @property
+    def splike_lib(self):
+        """
+        Scipy features are not available through openCL
+        """
+        raise NotImplementedError
+
     def synchronize(self):
         """
         Ensures that all computations submitted to the context are completed.

{xobjects-0.2.5 → xobjects-0.2.7}/xobjects/hybrid_class.py

@@ -341,7 +341,8 @@ class HybridClass(metaclass=MetaHybridClass):
 
     def __setstate__(self, state):
         self._xobject = self._XoStruct._from_buffer(
-            buffer=state[0], offset=state[1])
+            buffer=state[0], offset=state[1]
+        )
         self._reinit_from_xobject(_xobject=self._xobject)
 
     @property
@@ -359,6 +360,10 @@ class HybridClass(metaclass=MetaHybridClass):
     def compile_kernels(self, *args, **kwargs):
         return self._xobject.compile_kernels(*args, **kwargs)
 
+    def __repr__(self):
+        args = [f"{fname}={getattr(self, fname)}" for fname in self._fields]
+        return f'{type(self).__name__}({", ".join(args)})'
+
 
 class ThisClass:  # Place holder
     pass

{xobjects-0.2.5 → xobjects-0.2.7}/xobjects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xobjects
-Version: 0.2.5
+Version: 0.2.7
 Summary: In-memory serialization and code generator for CPU and GPU
 Home-page: https://xsuite.readthedocs.io/
 Download-URL: https://pypi.python.org/pypi/xobjects

{xobjects-0.2.5 → xobjects-0.2.7}/xobjects.egg-info/SOURCES.txt

@@ -2,23 +2,6 @@ LICENSE
 pyproject.toml
 setup.cfg
 setup.py
-tests/test_align.py
-tests/test_array.py
-tests/test_buffer.py
-tests/test_capi.py
-tests/test_chunk.py
-tests/test_hybrid_class.py
-tests/test_kernel.py
-tests/test_linked_array.py
-tests/test_nplike_arrays.py
-tests/test_ref.py
-tests/test_scalars.py
-tests/test_strides.py
-tests/test_string.py
-tests/test_struct.py
-tests/test_to_json.py
-tests/test_typeutils.py
-tests/test_unionref.py
 xobjects/__init__.py
 xobjects/_patch_pyopencl_array.py
 xobjects/_version.py

{xobjects-0.2.5 → xobjects-0.2.7}/xobjects.egg-info/requires.txt

@@ -3,3 +3,4 @@ cffi
 
 [tests]
 pytest
+pytest-mock

xobjects-0.2.5/tests/test_align.py

@@ -1,18 +0,0 @@
-# copyright ################################# #
-# This file is part of the Xobjects Package.  #
-# Copyright (c) CERN, 2021.                   #
-# ########################################### #
-
-import xobjects as xo
-from xobjects.test_helpers import for_all_test_contexts
-
-
-@for_all_test_contexts
-def test_create_aligned_objects(test_context):
-    for Arr in xo.Float64[3], xo.Float64[16], xo.Float64[17]:
-        buff = test_context.new_buffer(10)
-        assert buff.default_alignment == test_context.minimum_alignment
-        for i in range(4):
-            aa = Arr(_buffer=buff, _offset="aligned")
-            print(test_context, Arr._size, aa._offset)
-            assert aa._offset % test_context.minimum_alignment == 0

xobjects-0.2.5/tests/test_array.py

@@ -1,303 +0,0 @@
-# copyright ################################# #
-# This file is part of the Xobjects Package.  #
-# Copyright (c) CERN, 2021.                   #
-# ########################################### #
-
-# pylint:disable=E1101
-
-import numpy as np
-import pytest
-
-import xobjects as xo
-from xobjects.test_helpers import for_all_test_contexts
-
-
-def test_get_shape():
-    from xobjects.array import get_shape_from_array
-
-    assert get_shape_from_array(0, 0) == ()
-    assert get_shape_from_array([], 1) == (0,)
-    assert get_shape_from_array([1, 2, 3], 1) == (3,)
-    assert get_shape_from_array(range(3), 1) == (3,)
-    assert get_shape_from_array([[], []], 2) == (2, 0)
-    assert get_shape_from_array([[2], [2]], 2) == (2, 1)
-    assert get_shape_from_array([[1, 3], [3]], 1) == (2,)
-    assert get_shape_from_array([[1, [2]], [[3], [4, 5]]], 2) == (2, 2)
-
-    with pytest.raises(ValueError):
-        get_shape_from_array([[1, [2]], [[3], [4, 5]]], 3)
-        get_shape_from_array([[1], [2, 3], [4, 5, 6]], 2)
-
-
-def mk_classes() -> xo.Array:
-    class ArrayA(xo.Array):
-        _itemtype = xo.Float64
-        _shape = (6, 6)
-        _order = (0, 1)
-
-    class ArrayB(xo.Array):
-        _itemtype = xo.Float64
-        _shape = (6, None)
-        _order = (0, 1)
-
-    class ArrayC(xo.Array):
-        _itemtype = xo.Float64
-        _shape = (None,)
-        _order = "C"
-
-    class ArrayD(xo.Array):
-        _itemtype = ArrayA
-        _shape = (None,)
-        _order = "F"
-
-    class ArrayE(xo.Array):
-        _itemtype = ArrayB
-        _shape = (None,)
-        _order = "C"
-
-    return ArrayA, ArrayB, ArrayC, ArrayD, ArrayE
-
-
-def test_class_creation():
-    ArrayA, ArrayB, ArrayC, ArrayD, ArrayE = mk_classes()
-
-    assert ArrayA._is_static_shape == True
-    assert ArrayE._is_static_type == False
-    assert ArrayA._size == 36 * 8
-
-    for arr in ArrayB, ArrayC, ArrayD, ArrayE:
-        assert arr._is_static_shape == False
-    for arr in ArrayB, ArrayC, ArrayD, ArrayE:
-        assert arr._is_static_shape == False
-
-    assert ArrayA._data_offset == 0
-    assert ArrayB._data_offset == 32
-    assert ArrayC._data_offset == 16
-    assert ArrayD._data_offset == 16
-    assert ArrayE._data_offset == 16
-
-    assert ArrayA._strides == (48, 8)
-    assert ArrayC._strides == (8,)
-    assert ArrayD._strides == (ArrayA._size,)
-
-
-def test_class_mk_array():
-    ArrayA = xo.Float64[3, 6]
-    assert ArrayA._shape == (3, 6)
-    assert ArrayA._order == (0, 1)
-    assert ArrayA.__name__ == "Arr3x6Float64"
-
-    ArrayA = xo.Float64[None, 6]
-    assert ArrayA._shape == (None, 6)
-    assert ArrayA.__name__ == "ArrNx6Float64"
-
-    ArrayA = xo.String[3:1, 4:0, 5:2]
-    assert ArrayA._shape == (3, 4, 5)
-    assert ArrayA.__name__ == "Arr3x4x5String"
-
-    class StructA(xo.Struct):
-        a = xo.Float64
-
-    ArrayA = StructA[10]
-
-    assert ArrayA.__name__ == "Arr10StructA"
-
-
-def test_inspect_args():
-    import numpy as np
-
-    arrays = mk_classes()
-
-    for AnArray in arrays:
-        if AnArray._size is not None:
-            info = AnArray._inspect_args()
-            assert info.value == None
-
-    ArrayA = arrays[0]
-    info = ArrayA._inspect_args(np.zeros((6, 6)))
-
-    assert info.size == 36 * 8
-
-
-def test_array_allocation():
-    MyArray = xo.Int64[10]
-    ss = MyArray()
-    assert ss._itemtype == xo.Int64
-
-
-def test_array_sshape_stype():
-    Array1D = xo.Int64[3]
-    Array2D = xo.Int64[2, 3]
-    Array3D = xo.Int64[2, 3, 4]
-
-    for cls in Array1D, Array2D, Array3D:
-        ss = cls()
-        for ii in ss._iter_index():
-            assert ss[0] == 0
-            ss[ii] = sum(ii) if len(ss._shape) > 1 else ii
-        for ii in ss._iter_index():
-            assert ss[ii] == (sum(ii) if len(ss._shape) > 1 else ii)
-
-
-def test_array_dshape_stype():
-    Array1 = xo.Int64[:]
-    Array2 = xo.Int64[:, 3, 4]
-    Array3 = xo.Int64[2, :, 4]
-    Array4 = xo.Int64[2, 3, :]
-
-    for cls in Array1, Array2, Array3, Array4:
-        ss = cls(3)
-        for ii in ss._iter_index():
-            assert ss[0] == 0
-            ss[ii] = sum(ii) if len(ss._shape) > 1 else ii
-        for ii in ss._iter_index():
-            assert ss[ii] == (sum(ii) if len(ss._shape) > 1 else ii)
-
-    arr = Array1(10)
-    arr[3] = 42
-    data = arr._buffer.to_nplike(arr._offset, "int64", (12,))
-    assert data[0] == 8 + 8 + 10 * 8
-    assert data[1] == 10
-    data[6] = 43
-    assert arr[4] == 43
-
-    arr = Array2(2)
-    arr[1, 2, 3] = 42
-    data = arr._buffer.to_nplike(arr._offset, "int64", (29,))
-
-    assert data[0] == 8 + 8 + 3 * 8 + 24 * 8
-
-
-def test_array_sshape_dtype():
-    Array1 = xo.Int64[:]
-    Array2 = Array1[3]
-    arr = Array2([2, 3, 4])
-    arr[0][1] = 3
-    assert arr[0][1] == 3
-
-    arr1 = Array1(2)
-    assert arr1._shape == arr[0]._shape
-
-
-def test_array_dshape_dtype():
-    Array1 = xo.Int64[:]
-    Array2 = Array1[:]
-    ss = Array2([2, 3, 4])
-    ss[0][1] = 3
-    assert ss[0][1] == 3
-
-    ss0 = Array1(2)
-    ss1 = Array1(3)
-    ss2 = Array1(4)
-    assert ss0._shape == ss[0]._shape
-
-    ss = Array2([[1], [2, 3], [4, 5, 6]])
-    assert ss[0][0] == 1
-    assert ss[1][1] == 3
-    assert ss[2][2] == 6
-
-
-def test_array_in_struct():
-    class Multipole(xo.Struct):
-        order = xo.Int64
-        length = xo.Float64
-        hxl = xo.Float64
-        hyl = xo.Float64
-        bal = xo.Float64[:]
-
-    m = Multipole(order=2, bal=np.array([1.0, 2.0, 3.0, 4.0]))
-
-
-def test_initialize_from_array():
-    class MyStruct(xo.Struct):
-        a = xo.Float64[3]
-
-    sa = MyStruct()
-    buf = sa._buffer
-    sb = MyStruct(_buffer=buf)
-    sa.a = sb.a
-
-
-def test_init_with_nparray():
-    a = xo.Float64[:](np.array([1, 2, 3], dtype=np.float64))
-    assert a[1] == 2.0
-
-
-def test_init_with_nparray2d():
-    class Mys(xo.Struct):
-        m0 = xo.Float64[6]
-        m1 = xo.Float64[6, 6]
-
-    m = Mys(m1=np.ones((6, 6)) * 3, m0=np.ones(6))
-    assert m.m1[3, 4] == 3
-    assert m.m0[3] == 1
-
-
-def test_update():
-    class A(xo.Struct):
-        a = xo.Float64[:]
-        b = xo.Float64[10]
-
-    a = A(a=3)
-    with pytest.raises(Exception) as e:
-        a.a = 2
-        assert e.type == ValueError
-
-    with pytest.raises(Exception) as e:
-        a.a = [1, 2]
-        assert e.type == ValueError
-
-    a.a = [1, 2, 3]
-
-
-@for_all_test_contexts
-def test_array_custom_strides(test_context):
-    Array = xo.Int8[2:1, 3:0, 4:2]
-    a_xo = Array(_context=test_context)
-
-    assert a_xo._strides == (4, 8, 1)
-
-    j = 0
-    for i0, i1, i2 in np.ndindex(2, 3, 4):
-        a_xo[i0, i1, i2] = j
-        j += 1
-
-    buffer_contents = a_xo._buffer.to_bytearray(
-        offset=0, nbytes=a_xo._buffer.capacity
-    )
-    assert np.all(
-        buffer_contents
-        == bytearray(
-            [
-                0,
-                1,
-                2,
-                3,
-                12,
-                13,
-                14,
-                15,
-                4,
-                5,
-                6,
-                7,
-                16,
-                17,
-                18,
-                19,
-                8,
-                9,
-                10,
-                11,
-                20,
-                21,
-                22,
-                23,
-            ]
-        )
-    )
-
-    j = 0
-    for i0, i1, i2 in np.ndindex(2, 3, 4):
-        assert a_xo[i0, i1, i2] == j
-        j += 1

xobjects-0.2.5/tests/test_buffer.py

@@ -1,135 +0,0 @@
-# copyright ################################# #
-# This file is part of the Xobjects Package.  #
-# Copyright (c) CERN, 2021.                   #
-# ########################################### #
-
-import numpy as np
-
-import xobjects as xo
-from xobjects.test_helpers import for_all_test_contexts, requires_context
-
-
-class Check:
-    def __init__(self, ctx, capacity):
-        self.ctx = ctx
-        self.buffer = ctx.new_buffer(capacity=capacity)
-        self.state = {}
-
-    def random_string(self, maxlength=100):
-        size = np.random.randint(1, maxlength)
-        self.new_string(size)
-
-    def new_string(self, size=100):
-        if size > 0:
-            data = bytes(np.random.randint(65, 90, size, dtype="u1"))
-
-            offset = self.buffer.allocate(len(data))
-            self.buffer.update_from_buffer(offset, data)
-            self.state[offset] = data
-            return offset
-        else:
-            raise ValueError("size must be >0")
-
-    def free_string(self, offset):
-        size = len(self.state[offset])
-        self.buffer.free(offset, size)
-        del self.state[offset]
-
-    def random_free(self):
-        ii = np.random.randint(1, len(self.state))
-        offset = list(self.state.keys())[ii]
-        self.free_string(offset)
-
-    def check(self):
-        for offset, value in self.state.items():
-            assert self.buffer.to_bytearray(offset, len(value)) == value
-
-
-@requires_context("ContextPyopencl")
-def test_cl_print_devices():
-    xo.ContextPyopencl.print_devices()
-
-
-@requires_context("ContextPyopencl")
-def test_cl_init():
-    _ = xo.ContextPyopencl(device="0.0")
-
-
-@for_all_test_contexts
-def test_new_buffer(test_context):
-    _ = test_context.new_buffer()
-    _ = test_context.new_buffer(capacity=200)
-
-
-@for_all_test_contexts
-def test_read_write(test_context):
-    buff = test_context.new_buffer()
-    bb = b"asdfasdfafsdf"
-    buff.update_from_buffer(23, bb)
-    assert buff.to_bytearray(23, len(bb)) == bb
-
-
-@for_all_test_contexts
-def test_to_from_byterarray(test_context):
-    buff = test_context.new_buffer()
-    bb = b"asdfasdfafsdf"
-    buff.update_from_buffer(23, bb)
-    assert buff.to_bytearray(23, len(bb)) == bb
-
-
-@for_all_test_contexts
-def test_allocate_simple(test_context):
-    ch = Check(test_context, 200)
-    ch.new_string(30)
-    ch.check()
-
-
-@for_all_test_contexts
-def test_free_simple(test_context):
-    ch = Check(test_context, 200)
-    offsets = [ch.new_string(ii * 2 + 1) for ii in range(10)]
-    print(offsets)
-    for offset in offsets:
-        print(offset)
-        ch.free_string(offset)
-        ch.check()
-
-
-@for_all_test_contexts
-def test_grow(test_context):
-    ch = Check(test_context, 200)
-    st = ch.new_string(150)
-    st = ch.new_string(60)
-    ch.check()
-    assert ch.buffer.capacity == 400
-    assert ch.buffer.chunks[0].start == st + 60
-    assert ch.buffer.chunks[0].end == 400
-    st = ch.new_string(500)
-    assert ch.buffer.capacity == 900 + ch.buffer.default_alignment - 1
-    ch.check()
-
-
-@for_all_test_contexts
-def test_random_string(test_context):
-    ch = Check(test_context, 200)
-
-    for i in range(50):
-        ch.random_string(maxlength=2000)
-        ch.check()
-
-    for i in range(50):
-        ch.random_string(maxlength=2000)
-        ch.check()
-        ch.random_free()
-        ch.check()
-
-
-@for_all_test_contexts
-def test_nplike(test_context):
-    buff = test_context.new_buffer(capacity=80)
-    arr = np.arange(6.0).reshape((2, 3))
-    offset = 3
-    buff.update_from_buffer(offset, arr.tobytes())
-    arr2 = buff.to_nplike(offset, "float64", (2, 3))
-    arr3 = test_context.nparray_from_context_array(arr2)
-    assert np.all(arr == arr3)