Merge branch 'grid-evolve-slice'

NNPDF · Mar 4, 2024 · 20ccea6 · 20ccea6
2 parents b1036ae + ad42065
commit 20ccea6
Show file tree

Hide file tree

Showing 10 changed files with 1,000 additions and 338 deletions.
diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml
@@ -24,7 +24,7 @@ jobs:
         uses: actions/cache@v3
         with:
           path: test-data
-          key: test-data-v8
+          key: test-data-v11
       - name: Download test data
         if: steps.cache-test-data.outputs.cache-hit != 'true'
         run: |
@@ -43,6 +43,8 @@ jobs:
           curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV_old.pineappl.lz4'
           curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV.pineappl.lz4'
           curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV.tar'
+          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV_v2.tar'
+          curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV_v2_xif_2.tar'
           curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/NJetEvents_0-0-2.tab.gz'
           curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/NUTEV_CC_NU_FE_SIGMARED.pineappl.lz4'
           curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/NUTEV_CC_NU_FE_SIGMARED.tar'

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+### Added
+
+- added `Grid::evolve_with_slice_iter`, `AlphasTable` and `OperatorSliceInfo`,
+  which define a new interface supporting very large evolution kernels that
+  have been introduced in EKO v0.13. This interface will replace `Grid::evolve`
+
+### Changed
+
+- `Grid::evolve` has now been marked deprecated
+
 ### Fixed
 
 - fixed yet another problem that prevent the Python interface for Python 3.6

diff --git a/maintainer/generate-coverage.sh b/maintainer/generate-coverage.sh
@@ -17,6 +17,7 @@ wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl
 wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV_old.pineappl.lz4'
 wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV.pineappl.lz4'
 wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV.tar'
+wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/LHCB_WP_7TEV_v2.tar'
 wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/NJetEvents_0-0-2.tab.gz'
 wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/NUTEV_CC_NU_FE_SIGMARED.pineappl.lz4'
 wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/NUTEV_CC_NU_FE_SIGMARED.tar'

diff --git a/pineappl/Cargo.toml b/pineappl/Cargo.toml
@@ -13,6 +13,7 @@ rust-version.workspace = true
 version.workspace = true
 
 [dependencies]
+anyhow = "1.0.48"
 arrayvec = "0.7.2"
 bincode = "1.3.3"
 bitflags = "2.4.2"