Merge branch 'release/0.25.6'

Author: szymonlopaciuk

examples/004_fadeeva/000_check_fadeeva.py

@@ -1,27 +1,28 @@
-import xobjects as xo
-from xfields import _pkg_root
-
 import time
-import numpy as np
+
 import matplotlib.pyplot as plt
+import numpy as np
 from scipy.special import wofz
 
+import xobjects as xo
+
 mode = 'special_y_0'
 mode = 'standard'
 
 ctx = xo.ContextCpu(omp_num_threads=0)
 
 src_code = """
-    /*gpukern*/ void eval_faddeeva_w_q1(
+    #include "xobjects/headers/common.h"
+    #include "xfields/fieldmaps/bigaussian_src/faddeeva.h"
+
+    GPUKERN void eval_faddeeva_w_q1(
         const int n,
-        /*gpuglmem*/ double const* /*restrict*/ re,
-        /*gpuglmem*/ double const* /*restrict*/ im,
-        /*gpuglmem*/ double* /*restrict*/ wz_re,
-        /*gpuglmem*/ double* /*restrict*/ wz_im )
+        GPUGLMEM double const* RESTRICT re,
+        GPUGLMEM double const* RESTRICT im,
+        GPUGLMEM double* RESTRICT wz_re,
+        GPUGLMEM double* RESTRICT wz_im )
     {
-        int tid = 0;
-        for( ; tid < n ; ++tid ) { //autovectorized
-
+        VECTORIZE_OVER(tid, n);
             if( tid < n )
             {
                 double const x = re[ tid ];
@@ -33,7 +34,7 @@
                 wz_re[ tid ] = wz_x;
                 wz_im[ tid ] = wz_y;
             }
-        }
+        END_VECTORIZE;
     }
     """
 
@@ -50,16 +51,11 @@
     ),
 }
 
-headers = [
-    _pkg_root.joinpath("headers/constants.h"),
-    _pkg_root.joinpath("headers/sincos.h"),
-    _pkg_root.joinpath("headers/power_n.h"),
-    _pkg_root.joinpath("fieldmaps/bigaussian_src/faddeeva.h"),
-]
+headers = []
 
 assert mode in ['special_y_0', 'standard']
 if mode == "special_y_0":
-    headers = ["#define FADDEEVA_SPECIAL_Y_0"] + headers
+    headers = ["#define FADDEEVA_SPECIAL_Y_0"]
 
 ctx.add_kernels(
     sources=headers + [src_code], kernels=kernel_descriptions)

pyproject.toml

@@ -1,6 +1,54 @@
 [build-system]
 build-backend = 'setuptools.build_meta'
 requires = [
-    'setuptools >= 43.0.0',
-    'numpy',
-    ]
+    'setuptools>=77.0.0',
+]
+
+[project]
+name = "xfields"
+dynamic = ["version"]
+description = "Field Maps and Particle In Cell"
+readme = "README.md"
+license = "Apache-2.0"
+authors = [
+    {name = "G. Iadarola et al."}
+]
+dependencies = [
+    "numpy>=1.0",
+    "scipy",
+    "pandas",
+    "xobjects>=0.0.4",
+    "xtrack>=0.0.1",
+]
+requires-python = ">=3.10"
+
+[project.urls]
+Homepage = "https://xsuite.readthedocs.io/"
+Documentation = "https://xsuite.readthedocs.io/"
+Source = "https://github.com/xsuite/xfields"
+"Bug Tracker" = "https://github.com/xsuite/xsuite/issues"
+Download = "https://pypi.python.org/pypi/xfields"
+
+[project.optional-dependencies]
+tests = [
+    "pytest",
+    "h5py"
+]
+
+[tool.setuptools.packages.find]
+where = ["."]
+include = ["xfields"]
+
+[tool.setuptools.dynamic]
+version = { attr = "xfields._version.__version__" }
+
+[tool.setuptools]
+include-package-data = true
+
+[project.entry-points.xobjects]
+include = "xfields"
+
+[pytest]
+markers = [
+    "context_dependent: marks test as one that depends on the execution context",
+]

setup.py

@@ -8,17 +8,19 @@
 import pytest
 import xobjects as xo
 from xobjects.context import available
-from xfields.general import _pkg_root
 from xobjects.test_helpers import for_all_test_contexts
 
 
 @pytest.fixture
 def faddeeva_calculator():
-    source = '''
-        /*gpukern*/ void FaddeevaCalculator_compute(FaddeevaCalculatorData data) {
+    source = """
+        #include "xobjects/headers/common.h"
+        #include "xfields/fieldmaps/bigaussian_src/faddeeva.h"
+
+        GPUKERN void FaddeevaCalculator_compute(FaddeevaCalculatorData data) {
             int64_t len = FaddeevaCalculatorData_len_z_re(data);
 
-            for (int64_t ii = 0; ii < len; ii++) {  //vectorize_over ii len
+            VECTORIZE_OVER(ii, len);
                 double z_re = FaddeevaCalculatorData_get_z_re(data, ii);
                 double z_im = FaddeevaCalculatorData_get_z_im(data, ii);
                 double w_re, w_im;
@@ -27,9 +29,9 @@ def faddeeva_calculator():
 
                 FaddeevaCalculatorData_set_w_re(data, ii, w_re);
                 FaddeevaCalculatorData_set_w_im(data, ii, w_im);
-            } //end_vectorize
+            END_VECTORIZE;
         }
-    '''
+    """
 
     class FaddeevaCalculator(xo.HybridClass):
         _xofields = {
@@ -39,13 +41,7 @@ class FaddeevaCalculator(xo.HybridClass):
             'w_im': xo.Float64[:],
         }
 
-        _extra_c_sources = [
-            _pkg_root.joinpath("headers/constants.h"),
-            _pkg_root.joinpath("headers/sincos.h"),
-            _pkg_root.joinpath("headers/power_n.h"),
-            _pkg_root.joinpath("fieldmaps/bigaussian_src/faddeeva.h"),
-            source,
-        ]
+        _extra_c_sources = [source]
 
         _kernels = {
             'FaddeevaCalculator_compute': xo.Kernel(

tests/test_cerrf.py

@@ -35,9 +35,6 @@ def test_digitize(test_context):
 
 @for_all_test_contexts(excluding="ContextPyopencl")
 def test_compute_moments_1(test_context):
-
-    print(repr(test_context))
-
     ###########
     # ttbar 2 #
     ###########

tests/test_temp_slicer.py

@@ -26,7 +26,6 @@
 from .beam_elements.electroncloud import ElectronCloud
 from .beam_elements.electronlens_interpolated import ElectronLensInterpolated
 
-from .general import _pkg_root
 from .config_tools import replace_spacecharge_with_quasi_frozen
 from .config_tools import replace_spacecharge_with_PIC
 from .config_tools import configure_orbit_dependent_parameters_for_bb

xfields/__init__.py

@@ -8,7 +8,6 @@
 import xobjects as xo
 import xtrack as xt
 
-from ..general import _pkg_root
 
 class BeamBeamBiGaussian2D(xt.BeamElement):
 
@@ -40,13 +39,7 @@ class BeamBeamBiGaussian2D(xt.BeamElement):
     }
 
     _extra_c_sources= [
-        _pkg_root.joinpath('headers/constants.h'),
-        _pkg_root.joinpath('headers/sincos.h'),
-        _pkg_root.joinpath('headers/power_n.h'),
-        _pkg_root.joinpath('headers','particle_states.h'),
-        _pkg_root.joinpath('fieldmaps/bigaussian_src/faddeeva.h'),
-        _pkg_root.joinpath('fieldmaps/bigaussian_src/bigaussian.h'),
-        _pkg_root.joinpath('beam_elements/beambeam_src/beambeam2d.h'),
+        '#include "xfields/beam_elements/beambeam_src/beambeam2d.h"',
     ]
 
     def __init__(self,