xobjects 0.4.6__tar.gz → 0.5.0__tar.gz

{xobjects-0.4.6 → xobjects-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xobjects
-Version: 0.4.6
+Version: 0.5.0
 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.0/xobjects/_version.py

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

{xobjects-0.4.6 → xobjects-0.5.0}/xobjects/context.py

@@ -254,6 +254,7 @@ class XContext(ABC):
         extra_classes: Sequence[Type] = (),
         extra_headers: Sequence[SourceType] = (),
         compile: bool = True,  # noqa
+        extra_compile_args: Sequence[str] = (),
     ):
         """
         Adds user-defined kernels to the context. The kernel source
@@ -333,6 +334,7 @@ class XContext(ABC):
             extra_classes=extra_classes,
             extra_headers=extra_headers,
             compile=compile,
+            extra_compile_args=extra_compile_args,
         )
         self.kernels.update(generated_kernels)
 
@@ -348,6 +350,7 @@ class XContext(ABC):
         extra_classes: Sequence[Type],
         extra_headers: Sequence[SourceType],
         compile: bool,
+        extra_compile_args: Sequence[str],
     ) -> Dict[Tuple[str, tuple], KernelType]:
         pass
 

{xobjects-0.4.6 → xobjects-0.5.0}/xobjects/context_cpu.py

@@ -169,8 +169,8 @@ class ContextCpu(XContext):
         specialize=True,
         apply_to_source=(),
         save_source_as=None,
-        extra_compile_args: Sequence[str] = ("-O3", "-Wno-unused-function"),
-        extra_link_args: Sequence[str] = ("-O3",),
+        extra_compile_args: Sequence[str] = (),
+        extra_link_args: Sequence[str] = (),
         extra_cdef="",
         extra_classes=(),
         extra_headers=(),
@@ -271,13 +271,16 @@ class ContextCpu(XContext):
         specialize=True,
         apply_to_source=(),
         save_source_as=None,
-        extra_compile_args=("-O3", "-Wno-unused-function"),
-        extra_link_args=("-O3",),
+        extra_compile_args=(),
+        extra_link_args=(),
         extra_cdef="",
         extra_classes=(),
         extra_headers=(),
         compile=True,  # noqa
     ) -> Dict[Tuple[str, tuple], "KernelCpu"]:
+        extra_compile_args += ("-O3", "-Wno-unused-function")
+        extra_link_args += ("-O3",)
+
         # Determine names and paths
         clean_up_so = not module_name
         module_name = module_name or str(uuid.uuid4().hex)
@@ -409,20 +412,25 @@ class ContextCpu(XContext):
             ffi_interface.cdef("int omp_get_max_threads();")
 
         # Compile
-        xtr_compile_args = ["-std=c99"]
-        xtr_link_args = ["-std=c99"]
+        xtr_compile_args = ["-std=c99", "-DXO_CONTEXT_CPU"]
+        xtr_link_args = ["-std=c99", "-DXO_CONTEXT_CPU"]
         xtr_compile_args += extra_compile_args
         xtr_link_args += extra_link_args
 
         if self.openmp_enabled:
             xtr_compile_args.append("-fopenmp")
             xtr_link_args.append("-fopenmp")
+            xtr_compile_args.append("-DXO_CONTEXT_CPU_OPENMP")
+            xtr_link_args.append("-DXO_CONTEXT_CPU_OPENMP")
 
             # https://mac.r-project.org/openmp/
             # on macos comment the above and uncomment the below flags to compile OpenMP with Xcode clang:
             # xtr_compile_args.append("-Xclang")
             # xtr_compile_args.append("-fopenmp")
             # xtr_link_args.append("-lomp")
+        else:
+            xtr_compile_args.append("-DXO_CONTEXT_CPU_SERIAL")
+            xtr_link_args.append("-DXO_CONTEXT_CPU_SERIAL")
 
         if os.name == "nt":  # windows
             # TODO: to be handled properly

{xobjects-0.4.6 → xobjects-0.5.0}/xobjects/context_cupy.py

@@ -416,6 +416,7 @@ class ContextCupy(XContext):
         specialize=True,
         apply_to_source=(),
         save_source_as=None,
+        extra_compile_args=(),
         extra_cdef=None,
         extra_classes=(),
         extra_headers=(),
@@ -454,7 +455,10 @@ class ContextCupy(XContext):
             with open(save_source_as, "w") as fid:
                 fid.write(specialized_source)
 
-        module = cupy.RawModule(code=specialized_source)
+        extra_compile_args = (*extra_compile_args, "-DXO_CONTEXT_CUDA")
+        module = cupy.RawModule(
+            code=specialized_source, options=extra_compile_args
+        )
 
         out_kernels = {}
         for pyname, kernel in kernel_descriptions.items():

{xobjects-0.4.6 → xobjects-0.5.0}/xobjects/context_pyopencl.py

@@ -180,6 +180,7 @@ class ContextPyopencl(XContext):
         specialize=True,
         apply_to_source=(),
         save_source_as=None,
+        extra_compile_args=(),
         extra_cdef=None,
         extra_classes=(),
         extra_headers=(),
@@ -218,8 +219,13 @@ class ContextPyopencl(XContext):
             with open(save_source_as, "w") as fid:
                 fid.write(specialized_source)
 
+        extra_compile_args = (
+            *extra_compile_args,
+            "-cl-std=CL2.0",
+            "-DXO_CONTEXT_CL",
+        )
         prg = cl.Program(self.context, specialized_source).build(
-            options="-cl-std=CL2.0",
+            options=extra_compile_args,
         )
 
         out_kernels = {}

{xobjects-0.4.6 → xobjects-0.5.0}/xobjects/hybrid_class.py

@@ -96,7 +96,7 @@ class JEncoder(json.JSONEncoder):
 def _build_xofields_dict(bases, data):
     if "_xofields" in data.keys():
         xofields = data["_xofields"].copy()
-    elif any(map(lambda b: hasattr(b, "_xofields"), bases)):
+    elif any(hasattr(b, "_xofields") for b in bases):
         n_filled = 0
         for bb in bases:
             if hasattr(bb, "_xofields") and len(bb._xofields.keys()) > 0:

{xobjects-0.4.6 → xobjects-0.5.0}/xobjects/struct.py

@@ -473,6 +473,7 @@ class Struct(metaclass=MetaStruct):
         apply_to_source=(),
         save_source_as=None,
         extra_classes=(),
+        extra_compile_args=(),
     ):
         if only_if_needed:
             all_found = True
@@ -489,6 +490,7 @@ class Struct(metaclass=MetaStruct):
             extra_classes=[cls] + list(extra_classes),
             apply_to_source=apply_to_source,
             save_source_as=save_source_as,
+            extra_compile_args=extra_compile_args,
         )
 
     def compile_kernels(
@@ -497,6 +499,7 @@ class Struct(metaclass=MetaStruct):
         apply_to_source=(),
         save_source_as=None,
         extra_classes=(),
+        extra_compile_args=(),
     ):
         self.compile_class_kernels(
             context=self._context,
@@ -504,6 +507,7 @@ class Struct(metaclass=MetaStruct):
             apply_to_source=apply_to_source,
             save_source_as=save_source_as,
             extra_classes=extra_classes,
+            extra_compile_args=extra_compile_args,
         )
 
 

{xobjects-0.4.6 → xobjects-0.5.0}/xobjects/test_helpers.py

@@ -39,11 +39,13 @@ def _for_all_test_contexts_excluding(
             f"this test: {excluding}."
         )(actual_test)
 
-    return pytest.mark.parametrize(
+    test = pytest.mark.parametrize(
         "test_context",
         test_context_names,
     )(actual_test)
 
+    return pytest.mark.context_dependent(test)
+
 
 def for_all_test_contexts(*args, **kwargs):
     """Parametrize the decorated test over all test contexts with the argument
@@ -80,7 +82,7 @@ def requires_context(context_name: str):
     ctx_names = (type(ctx).__name__ for ctx in get_test_contexts())
 
     if {context_name} & set(ctx_names):  # proceed as normal
-        return lambda test_function: test_function
+        return pytest.mark.context_dependent
 
     return pytest.mark.skip(f"{context_name} is unavailable on this platform.")
 

{xobjects-0.4.6 → xobjects-0.5.0}/xobjects.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xobjects
-Version: 0.4.6
+Version: 0.5.0
 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.4.6 → xobjects-0.5.0}/xobjects.egg-info/SOURCES.txt

@@ -1,48 +1,7 @@
-.gitignore
-.pre-commit-config.yaml
-.readthedocs.yaml
-Architecture.md
 LICENSE
-Readme.md
-contributors_and_credits.txt
-mktest
 pyproject.toml
-release.sh
-requirements.txt
 setup.cfg
 setup.py
-update_cprght_statement.py
-.github/workflows/black.yml
-docs/Makefile
-docs/architecture.rst
-docs/conf.py
-docs/index.rst
-docs/make.bat
-docs/quickstart.rst
-docs/reference.rst
-docs/architecture/contexts.rst
-docs/architecture/types.rst
-examples/api_def.py
-examples/api_init.py
-examples/capi_example.c
-examples/check_assembly.c
-examples/ex_array_init_perf.py
-examples/ex_cpugpu.py
-examples/ex_nested_ref.py
-examples/ex_ref_cpu.py
-examples/ex_struct_cpu.py
-examples/ex_unionref_cpu.py
-examples/ex_unionref_method.py
-examples/init_soa.py
-examples/issue_with_two_pyopencl_contexts.py
-examples/opencl_offsets.py
-examples/simple_kernel.py
-examples/sixtracklib.py
-examples/kernel_basics/kernel_cffi.py
-examples/kernel_basics/kernel_cupy.py
-examples/kernel_basics/kernel_pyopencl.py
-tests/__init__.py
-tests/notest_capi.py
 tests/test_align.py
 tests/test_array.py
 tests/test_buffer.py
@@ -62,7 +21,6 @@ tests/test_struct.py
 tests/test_to_json.py
 tests/test_typeutils.py
 tests/test_unionref.py
-tests/__pycache__/test_context.cpython-37-pytest-6.2.1.pyc
 xobjects/__init__.py
 xobjects/_patch_pyopencl_array.py
 xobjects/_version.py

xobjects-0.4.6/.github/workflows/black.yml

@@ -1,10 +0,0 @@
-name: Lint
-
-on: [push, pull_request]
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: psf/black@stable

xobjects-0.4.6/.gitignore

@@ -1,11 +0,0 @@
-__pycache__/
-*.pyc
-*.pyo
-*.swp
-*.egg-info/
-docs/_build
-cov_html
-.vscode
-.pytest_cache
-.coverage
-*.c

xobjects-0.4.6/.pre-commit-config.yaml

@@ -1,12 +0,0 @@
-repos:
-  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.5.0
-    hooks:
-    -   id: check-yaml
-    -   id: end-of-file-fixer
-    -   id: trailing-whitespace
-  - repo: https://github.com/psf/black
-    rev: 23.10.1
-    hooks:
-      - id: black
-        language_version: python3 # Should be a command that runs python3.6+

xobjects-0.4.6/.readthedocs.yaml

@@ -1,20 +0,0 @@
-# .readthedocs.yaml
-# Read the Docs configuration file
-# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
-
-# Required
-version: 2
-
-# Build documentation in the docs/ directory with Sphinx
-sphinx:
-   configuration: docs/conf.py
-
-# Optionally build your docs in additional formats such as PDF
-formats:
-   - pdf
-
-# Optionally set the version of Python and requirements required to build your docs
-python:
-   version: 3.7
-#   install:
-#   - requirements: docs/requirements.txt

xobjects-0.4.6/Architecture.md

@@ -1,202 +0,0 @@
-# Architecture
-
-## Introduction
-
-The library is based on:
-- Buffers: manage chunck of bytes on CPU and GPU (Cuda and OpenCL) memory using different backends
-- Contexts: keep track of buffers, launch functions operating on buffers
-- Basic types: a set of basic types that allow to describe structured data. Basic types are scalars, strings, structs, arrays and unions. User defined classes, composed with basic types, allow to interact with data on buffers and generate C functions to operate with data.
-- C-API generation: The type information allows to write C functions that can be interact with data. The C functions are specialized for CPU, OpenCL and Cuda. Also loops described by annotation in comments are automatically generated for CPU, OpenCL and Cuda.
-
-When a user defined class is created, Python methods and additional metadeta is attached to the class.
-When an instance of a user defined class is instantiated, memory is written to a buffer and a Python object is created to interact with the data.
-The size of an instance may not be known at class defintion time, but it cannot be changed after initialization.
-
-## Contexts and Buffers
-
-A context contain:
-
-- `new_buffer(capacity)`: create new buffer of initial capacity
-- `buffers`: list of weakref to buffers
--  kernels : Object containing compiled code from sources/
-
-Buffer:
-- `buffer`: low level buffer
-- `allocate(self,size)`: return the offset of the first free memory chunk of given size and grows the buffer if necessary
-- `free(self,offset,size)`: free a chuck of memory of a given size
-- `grow(self,capacity)`: increase the size of a buffer
-- `_new_buffer(capacity)`: creae lowlevel buffer
-- `update_from_native(...)`: Copy data from native buffer into self.buffer starting from offset
-- `update_from_buffer(...)`: Copy data from python buffer such as bytearray, bytes, memoryview, numpy array.data
-- `update_from_nplike(...)`: Copy data from nplike matching dest_dtype
-- `update_from_xbuffer(...)`: Copy data from any xbuffer, don't pass through cpu if possible
-- `copy_to_native(...)`: Copy data from self.buffer into dest
-- `to_native(...)`: Return native data with content at from offset and nbytes
-- `to_nplike(...)`: Return a view in of an nplike
-- `to_bytearray(...)`: Return a byte array: used in update_from_xbuffer
-- `to_pointer_arg(...)`: Return data that can be used as argument in kernel
-
-## Types
-
-Types can be composed of:
-- scalar: numbers, String
-- compound: Struct, Array, Ref, UnionRef 
-
-### Scalars
-- examples: Float64, Int64, ...
-- create: Float64(3.14)
-- memory layout
-    - data 
-
-### String:
-- create: String(string_or_int)
-- memory layout
-    - size
-    - data 
-
-
-### Struct
-- example: struct MyStruct field1 field2 ...
-- create: Struct(dict), Struct(**args)
-- memory layout:
-  - [ instance size ]
-  - static-field1
-  -  ..
-  - static-fieldn
-  - [ offset field 2 ]
-  - [ offset ...     ]
-  - [ offset field n ]
-  - [ dynamic-field1 ]
-  - [ ... ]
-  - [ dynamic-fieldn ]
-
-### Array:
-- example: 'array' 'f64' d1 d2 d3 'C' ; 'array' 'i64' d1 ':' d3 'F' ;
-- where:
-   - 'C'/'F' is C-contiguos or F-contiguous
-   - d1, d2, .. are the dimensions for each axis and ':' means not specified
-- create: Array(d1,d2,...) or Array([...]) or Array(np-array)
-- memory layout:
-  - [size] if not _is_static_shape or not _is_static_type
-  - [dims ... ] len(_dynamic_shape)
-  - [strides...] if nd>1 and dynamic shapes
-  - [offsets] if not _is_static_type
-  - data
-
-### Union:
-- create: Union(obj), Union( (typename,args) )
-- memory layout
-  - typeid
-  - data
-
-### UnionRef:
-- create: UnionRef(obj), UnionRef( (typename,args) )
-- memory layout
-  - typeid
-  - offset
-
-
-### Ref:
-- memory layout
-  - offset
-
-## Implementation details
-
-Assumptions:
-- Python user API cannot change the internal structure of the object but only the content
-- Python object caches the structure information to avoid round trips to access data
-- C user API does not manipulate structures
-
-
-Operation:
-
-- _inspect_args(*args, **args) -> info: Info
-  - check value and calculate size, offsets and dimensions from arguments, recursively
-  - returns at least `size` for `_get_a_buffer` and `value` for `_to_buffer`
-
-- _get_a_buffer(size, _context, _buffer, _offset):
-  - make sure a valid buffer and offset is created
-
-- _to_buffer(buffer, offset, value, info, size?):
-  - set data on buffer with offset from pyhon value, using info and implicitely respecting size
-  - if value same class -> binary copy (passing from context if needed)
-
-- _from_buffer(buffer, offset) -> value:
-  - create python object from data on buffer. Can be a native type (scalar or string) or another XObject (struct, array)
-
-
-- __init__(self,*args,_context=None, _buffer=None, _offset=None,*nargs)
-  - initialize object data on buffer from args and create python object:
-    - use _pre_init(*args,**nargs) -> return args, nargs standard initialization value
-    - check values and calculate size using `_inspect_args`, return info object containing size, offsets and values to be later used by _to_buffer
-    - allocate using `_get_a_buffer`
-    - write data using `_to_buffer`
-    - use `_post_init` to complete object
-`
-- _update(self, value, size=None):
-  - Optional update object content using value, in case respecting size for string
-
-- __get__(field,instance) or __getitem__(self,index...)
-  - if return instance._cache[field.index] else  #should implement item caching for struct and array
-  - else return _from_buffer
-
-- __set__(..., value) or __setitem__(...,value)
-  - if hasattr(self.ftype._update) get object and update in place
-    else call _to_buffer
-
-- json enconding
-  nested object can be initialized using a json enconding
-  d:dict -> type(**d)
-  t:tuple -> type(*t)
-  a:other -> type(a)
-
-
-
-Class content:
-
-- _inspect_args(cls, *args, **nargs) -> size, offsets
-  compute size and sizes and offsets from arguments
-
-- _to_buffer(cls, buffer, offset, value, offsets=None):
-  initialize object on buffer
-
-- _from_buffer(cls, buffer,offset):
-  create python object from initlialized object on buffer,offset
-
-- _size: object size
-  None if dynamic
-
-Instance content:
-
-- _get_size(self) -> size
-
-## C-API
-
-Access
-- `<Class>_get<_attrs>(obj, <indexes>)` -> scalar or object pointer
-- `<Class>_set<_attrs>(obj, <indexes>, scalar)`
-
-e.g. Multipole_get_field_normal(3)
-
-Kernel convention:
-
-```
-<fun>(void **refs){
-          Type0 arg0 = (Type0) refs[0];
-          ....
-          Type1 argN = (TypeN) refs[N];
-        ...
-        }
-```
-
-``` <fun>(buffer1, offset, ..., offset3){
-         Type0 arg0 = (Type0) refs[offset0];
-         ,,,
-         TypeN argN = (TypeN) refs[offsetN];
-}
-```
-
-## TODO
-
-- add free methods to delete data from buffer
-- implement SOA types

xobjects-0.4.6/Readme.md

@@ -1,10 +0,0 @@
-# XObjects
-
-Library to create and manipulate serialized object in CPU and GPU memory efficiently.
-
-The library defines:
--  Contexts: create buffers and manage computations e.g. BytearrayContext, CLContext, ...
--  Buffers: reference to internal memory buffer with an allocator e.g.
-   BytearrayContext, CLBuffer, ...
--  Data types: define users define types to create and manipulate objects on
-   buffers and generate C api, e.g. Float64, Int64, String, Struct, Array, Union

xobjects-0.4.6/contributors_and_credits.txt

@@ -1,7 +0,0 @@
-The following people contributed to the development of this package:
-
-CERN contributors:
- - R. De Maria
- - G. Iadarola
- - P. Kiksiny
- - S. Lopaciuk

xobjects-0.4.6/docs/Makefile

@@ -1,20 +0,0 @@
-# Minimal makefile for Sphinx documentation
-#
-
-# You can set these variables from the command line, and also
-# from the environment for the first two.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = .
-BUILDDIR      = _build
-
-# Put it first so that "make" without argument is like "make help".
-help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
-
-.PHONY: help Makefile
-
-# Catch-all target: route all unknown targets to Sphinx using the new
-# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
-%: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)