xobjects 0.5.1__tar.gz → 0.5.3__tar.gz

{xobjects-0.5.1/xobjects.egg-info → xobjects-0.5.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xobjects
-Version: 0.5.1
+Version: 0.5.3
 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.5.1 → xobjects-0.5.3}/tests/test_buffer.py

@@ -4,6 +4,7 @@
 # ########################################### #
 
 import numpy as np
+import pytest
 
 import xobjects as xo
 from xobjects.test_helpers import for_all_test_contexts, requires_context
@@ -94,6 +95,35 @@ def test_free_simple(test_context):
         ch.free_string(offset)
         ch.check()
 
+@for_all_test_contexts
+def test_free(test_context):
+    class CheckFree(xo.Struct):
+        a = xo.Float64
+    ch = CheckFree(a=5, _context=test_context)
+    assert ch._buffer.capacity == 8
+    assert ch._buffer.chunks == []
+    with pytest.raises(ValueError, match="Cannot free outside of buffer"):
+        ch._buffer.free(-2, 8)
+    with pytest.raises(ValueError, match="Cannot free outside of buffer"):
+        ch._buffer.free(0, 10)
+    with pytest.raises(ValueError, match="Cannot free outside of buffer"):
+        ch._buffer.free(7,2)
+    ch._buffer.free(0,4)
+    assert len(ch._buffer.chunks) == 1
+    assert ch._buffer.chunks[0].start == 0
+    assert ch._buffer.chunks[0].end == 4
+    ch._buffer.free(0,4)  # Does nothing
+    ch._buffer.free(2,4)  # Increases free chunk
+    assert len(ch._buffer.chunks) == 1
+    assert ch._buffer.chunks[0].start == 0
+    assert ch._buffer.chunks[0].end == 6
+    ch._buffer.free(7,1)
+    assert len(ch._buffer.chunks) == 2
+    assert ch._buffer.chunks[0].start == 0
+    assert ch._buffer.chunks[0].end == 6
+    assert ch._buffer.chunks[1].start == 7
+    assert ch._buffer.chunks[1].end == 8
+
 
 @for_all_test_contexts
 def test_grow(test_context):

xobjects-0.5.3/xobjects/_version.py

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

{xobjects-0.5.1 → xobjects-0.5.3}/xobjects/context.py

@@ -6,9 +6,9 @@
 import logging
 import os
 import weakref
-import xobjects as xo
 from abc import ABC, abstractmethod
 from collections import defaultdict
+from importlib.metadata import entry_points
 from pathlib import Path
 from typing import (
     Dict,
@@ -354,6 +354,26 @@ class XContext(ABC):
     ) -> Dict[Tuple[str, tuple], KernelType]:
         pass
 
+    def get_installed_c_source_paths(self) -> List[str]:
+        """Returns a list of include paths registered in dependent packages.
+
+        In a package that depends on xobjects, you can register C source paths
+        using the entry point `xobjects.c_sources`. A path to the directory
+        containing the specified module will be added to the include path when
+        building kernels. For example, the following will allow to write
+        ``#include <xtrack/path/to/some/header.h>`` in kernel sources:
+
+         .. code-block:: toml
+            [project.entry-points.xobjects]
+            include = "xtrack"
+        """
+        sources = []
+        for ep in entry_points(group="xobjects", name="include"):
+            module = ep.load()
+            path = Path(module.__file__).parents[1]
+            sources.append(str(path))
+        return sources
+
     @abstractmethod
     def nparray_to_context_array(self, arr):
         return arr
@@ -452,9 +472,13 @@ class XBuffer(ABC):
         self.capacity = newcapacity
 
     def free(self, offset, size):
+        if offset < 0 or offset + size > self.capacity:
+            raise ValueError("Cannot free outside of buffer")
         nch = Chunk(offset, offset + size)
         # insert sorted
-        if offset > self.chunks[-1].start:  # new chuck at the end
+        if len(self.chunks) == 0:
+            self.chunks.append(nch)
+        elif offset > self.chunks[-1].start:  # new chuck at the end
             self.chunks.append(nch)
         else:  # new chuck needs to be inserted
             for ic, ch in enumerate(self.chunks):

{xobjects-0.5.1 → xobjects-0.5.3}/xobjects/context_cpu.py

@@ -426,6 +426,11 @@ class ContextCpu(XContext):
             xtr_compile_args.append("-DXO_CONTEXT_CPU_SERIAL")
             xtr_link_args.append("-DXO_CONTEXT_CPU_SERIAL")
 
+        extra_include_paths = self.get_installed_c_source_paths()
+        include_flags = [f"-I{path}" for path in extra_include_paths]
+        xtr_compile_args.extend(include_flags)
+        xtr_link_args.extend(include_flags)
+
         if os.name == "nt":  # windows
             # TODO: to be handled properly
             xtr_compile_args = []

{xobjects-0.5.1 → xobjects-0.5.3}/xobjects/context_cupy.py

@@ -455,7 +455,10 @@ class ContextCupy(XContext):
             with open(save_source_as, "w") as fid:
                 fid.write(specialized_source)
 
-        extra_compile_args = (*extra_compile_args, "-DXO_CONTEXT_CUDA")
+        extra_include_paths = self.get_installed_c_source_paths()
+        include_flags = [f"-I{path}" for path in extra_include_paths]
+        extra_compile_args = (*extra_compile_args, *include_flags, "-DXO_CONTEXT_CUDA")
+
         module = cupy.RawModule(
             code=specialized_source, options=extra_compile_args
         )

{xobjects-0.5.1 → xobjects-0.5.3}/xobjects/context_pyopencl.py

@@ -219,8 +219,12 @@ class ContextPyopencl(XContext):
             with open(save_source_as, "w") as fid:
                 fid.write(specialized_source)
 
+        extra_include_paths = self.get_installed_c_source_paths()
+        include_flags = [f"-I{path}" for path in extra_include_paths]
+
         extra_compile_args = (
             *extra_compile_args,
+            *include_flags,
             "-cl-std=CL2.0",
             "-DXO_CONTEXT_CL",
         )

{xobjects-0.5.1 → xobjects-0.5.3/xobjects.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xobjects
-Version: 0.5.1
+Version: 0.5.3
 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.5.1/xobjects/_version.py

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