Merge branch 'master' into expose-evolve-capi

Author: Radonirinaunimi

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [1.0.0] - 10/06/2025
+
 PineAPPL 1.0 is a major rewrite from the previous version, allowing grids to
 have an arbitrary number of convolutions in the initial (PDFs with a
 factorization scale) and in the final (FFs with a fragmentation scale) state.
@@ -741,7 +743,8 @@ the old file format can still be read with this new version.
 
 - first release
 
-[Unreleased]: https://github.com/NNPDF/pineappl/compare/v0.8.2...HEAD
+[Unreleased]: https://github.com/NNPDF/pineappl/compare/v1.0.0...HEAD
+[1.0.0]: https://github.com/NNPDF/pineappl/compare/v0.8.2...v1.0.0
 [0.8.7]: https://github.com/NNPDF/pineappl/compare/v0.8.6...v0.8.7
 [0.8.6]: https://github.com/NNPDF/pineappl/compare/v0.8.5...v0.8.6
 [0.8.5]: https://github.com/NNPDF/pineappl/compare/v0.8.4...v0.8.5

Cargo.lock

@@ -22,7 +22,7 @@ keywords = ["high-energy-physics", "physics"]
 license = "GPL-3.0-or-later"
 repository = "https://github.com/NNPDF/pineappl"
 rust-version = "1.80.1"
-version = "1.0.0-alpha5"
+version = "1.0.0"
 
 [workspace.lints.clippy]
 all = { level = "warn", priority = -1 }

Cargo.toml

@@ -19,7 +19,7 @@ version.workspace = true
 workspace = true
 
 [dependencies]
-pineappl = { path = "../pineappl", version = "=1.0.0-alpha5" }
+pineappl = { path = "../pineappl", version = "=1.0.0" }
 itertools = "0.10.1"
 ndarray = "0.15.4"
 

pineappl_capi/Cargo.toml

@@ -30,9 +30,9 @@ lhapdf = { package = "managed-lhapdf", version = "0.3.4" }
 lz4_flex = { optional = true, version = "0.9.2" }
 ndarray = "0.15.4"
 ndarray-npy = { optional = true, version = "0.8.1" }
-pineappl = { path = "../pineappl", version = "=1.0.0-alpha5" }
-pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.0.0-alpha5" }
-pineappl_fastnlo = { optional = true, path = "../pineappl_fastnlo", version = "=1.0.0-alpha5" }
+pineappl = { path = "../pineappl", version = "=1.0.0" }
+pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.0.0" }
+pineappl_fastnlo = { optional = true, path = "../pineappl_fastnlo", version = "=1.0.0" }
 prettytable-rs = { default-features = false, features = ["win_crlf"], version = "0.10.0" }
 rayon = "1.5.1"
 serde = { features = ["derive"], optional = true, version = "1.0.130" }

pineappl_cli/Cargo.toml

@@ -31,5 +31,5 @@ crate-type = ["cdylib"]
 itertools = "0.10.1"
 ndarray = "0.15.4"
 numpy = "0.24.0"
-pineappl = { path = "../pineappl", version = "=1.0.0-alpha5" }
+pineappl = { path = "../pineappl", version = "=1.0.0" }
 pyo3 = { features = ["extension-module"], version = "0.24.1" }

pineappl_py/Cargo.toml

@@ -17,6 +17,7 @@ use pineappl::grid::Grid;
 use pineappl::pids::PidBasis;
 use pyo3::exceptions::PyValueError;
 use pyo3::prelude::*;
+use pyo3::types::PyTuple;
 use std::collections::BTreeMap;
 use std::fs::File;
 use std::io::BufReader;
@@ -468,9 +469,8 @@ impl PyGrid {
     ///
     /// Parameters
     /// ----------
-    /// slices : list(list(tuple(PyOperatorSliceInfo, PyReadOnlyArray4)))
-    ///     list of EKOs where each element is a list of (PyOperatorSliceInfo, 4D array)
-    ///     describing each convolution
+    /// slices : list(Generator(tuple(PyOperatorSliceInfo, PyReadOnlyArray4)))
+    ///     list of EKOs where each element is in turn a list of (PyOperatorSliceInfo, 4D array)
     /// order_mask : numpy.ndarray(bool)
     ///     boolean mask to activate orders
     /// xi : (float, float)
@@ -486,7 +486,7 @@ impl PyGrid {
     ///     produced FK table
     pub fn evolve(
         &self,
-        slices: Vec<Vec<(PyOperatorSliceInfo, PyReadonlyArray4<f64>)>>,
+        slices: Vec<Bound<PyAny>>,
         order_mask: Vec<bool>,
         xi: (f64, f64, f64),
         ren1: Vec<f64>,
@@ -496,12 +496,19 @@ impl PyGrid {
             .grid
             .evolve(
                 slices
-                    .iter()
+                    .into_iter()
                     .map(|subslice| {
-                        subslice.iter().map(|(info, op)| {
+                        // create lazy iterators from Python object
+                        subslice.try_iter().unwrap().map(|item| {
+                            let item = item.unwrap();
+                            let op_tuple = item.downcast::<PyTuple>().unwrap();
+                            let info: PyOperatorSliceInfo =
+                                op_tuple.get_item(0).unwrap().extract().unwrap();
+                            let op: PyReadonlyArray4<f64> =
+                                op_tuple.get_item(1).unwrap().extract().unwrap();
+
                             Ok::<_, std::io::Error>((
-                                info.info.clone(),
-                                // TODO: avoid copying
+                                info.info,
                                 CowArray::from(op.as_array().to_owned()),
                             ))
                         })
@@ -512,7 +519,6 @@ impl PyGrid {
                 &AlphasTable { ren1, alphas },
             )
             .map(|fk_table| PyFkTable { fk_table })
-            // TODO: avoid unwrap and convert `Result` into `PyResult`
             .unwrap())
     }
 

pineappl_py/src/grid.rs

@@ -601,10 +601,8 @@ def test_evolve_with_two_ekos(
         h2 = ConvType(polarized=False, time_like=False)
         convolution_types = [h1, h2]
 
-        input_xgrid = np.geomspace(2e-7, 1, num=50)
-        slices = []
-        for conv_id, cvtype in enumerate(convolution_types):
-            sub_slices = []
+        def _q2_slices(cvtype):
+            """Pass one Q2 at a time using Generators."""
             for q2 in evinfo.fac1:
                 info = OperatorSliceInfo(
                     fac0=1.0,
@@ -626,8 +624,12 @@ def test_evolve_with_two_ekos(
                         input_xgrid.size,
                     ),
                 )
-                sub_slices.append((info, op))
-            slices.append(sub_slices)
+                yield (info, op)
+
+        input_xgrid = np.geomspace(2e-7, 1, num=50)
+
+        # construct the slice object -- list of generator of slices
+        slices = [_q2_slices(cvtype=cvtype) for cvtype in convolution_types]
 
         fktable = g.evolve(
             slices=slices,

pineappl_py/tests/test_grid.py

@@ -21,4 +21,4 @@ clap_mangen = "0.2.26"
 enum_dispatch = "0.3.7"
 #git2 = "0.17.2"
 #semver = "1.0.17"
-pineappl_cli = { path = "../pineappl_cli", version = "=1.0.0-alpha5" }
+pineappl_cli = { path = "../pineappl_cli", version = "=1.0.0" }