Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v0.8.x #306

Draft
wants to merge 21 commits into
base: master
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions .github/workflows/capi.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ jobs:
- uses: actions/checkout@v4

- name: Install PineAPPL's C API
env:
# `-C link-dead-code` is needed to prevent 'warning: XX functions have mismatched data' warnings
RUSTFLAGS: '-Cinstrument-coverage -Clink-dead-code'
run: |
export RUSTFLAGS="-Cinstrument-coverage"
cargo cinstall --verbose --prefix=/usr/local/ --manifest-path pineappl_capi/Cargo.toml
cargo cinstall --verbose --prefix=/usr/local/ --libdir=lib --manifest-path pineappl_capi/Cargo.toml
ldconfig

- name: Test C++ example
Expand Down
3 changes: 3 additions & 0 deletions .github/workflows/python.yml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,9 @@ jobs:
with:
python-version: ${{ matrix.python-version }}
- name: Test
env:
# `-C link-dead-code` is needed to prevent 'warning: XX functions have mismatched data' warnings
RUSTFLAGS: '-Cinstrument-coverage -Clink-dead-code'
run: |
cd pineappl_py
python -m venv env
Expand Down
6 changes: 4 additions & 2 deletions .github/workflows/rust.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
uses: actions/cache@v4
with:
path: test-data
key: test-data-v12
key: test-data-v15
- name: Download test data
if: steps.cache-test-data.outputs.cache-hit != 'true'
run: |
Expand All @@ -38,6 +38,7 @@ jobs:
curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/E906nlo_bin_00.tar'
curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/FK_ATLASTTBARTOT13TEV.dat'
curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/FK_POSXDQ.dat'
curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHC8-Mtt-HT4-173_3-bin1.tab.gz'
curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCBWZMU7TEV_PI_part1.appl'
curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_DY_8TEV.pineappl.lz4'
curl -s -C - -O 'https://data.nnpdf.science/pineappl/test-data/LHCB_DY_8TEV.tar'
Expand Down Expand Up @@ -66,7 +67,8 @@ jobs:

- name: Run tests
env:
RUSTFLAGS: '-Cinstrument-coverage'
# `-C link-dead-code` is needed to prevent 'warning: XX functions have mismatched data' warnings
RUSTFLAGS: '-Cinstrument-coverage -Clink-dead-code'
run: |
# we need stderr, but we can't run test twice because it'll regenerate/modify the binaries which interferes with `llvm-cov`
cargo test --features=applgrid,evolve,fastnlo,fktable --no-fail-fast 2> >(tee stderr 1>&2)
Expand Down
35 changes: 34 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,35 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.8.6] - 18/10/2024

### Fixed

- fixed [Issue #318](https://github.com/NNPDF/pineappl/issues/318) that caused
fastNLO tables with `NPDFDim = 2` to be incorrectly imported

## [0.8.5] - 07/10/2024

### Fixed

- fixed a bug in `pineappl_applgrid` that lead to linking problems with ROOT
and `gfortran`

## [0.8.4] - 04/10/2024

### Fixed

- fixed a bug that lead to inconsistent convolution metadata
(https://github.com/NNPDF/pineappl/issues/316)

## [0.8.3] - 30/08/2024

### Fixed

- fixed a problem in the evolution when an EKO with 'similar' Q2 slices was
used to evolve; this caused the Q2 slices of the grids to be evolved several
times, leading to wrong results

## [0.8.2] - 22/07/2024

### Changed
Expand Down Expand Up @@ -645,7 +674,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

- first release

[Unreleased]: https://github.com/NNPDF/pineappl/compare/v0.8.2...HEAD
[Unreleased]: https://github.com/NNPDF/pineappl/compare/v0.8.6...HEAD
[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
[0.8.4]: https://github.com/NNPDF/pineappl/compare/v0.8.3...v0.8.4
[0.8.3]: https://github.com/NNPDF/pineappl/compare/v0.8.2...v0.8.3
[0.8.2]: https://github.com/NNPDF/pineappl/compare/v0.8.1...v0.8.2
[0.8.1]: https://github.com/NNPDF/pineappl/compare/v0.8.0...v0.8.1
[0.8.0]: https://github.com/NNPDF/pineappl/compare/v0.7.4...v0.8.0
Expand Down
14 changes: 7 additions & 7 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ keywords = ["high-energy-physics", "physics"]
license = "GPL-3.0-or-later"
repository = "https://github.com/NNPDF/pineappl"
rust-version = "1.70.0"
version = "0.8.2"
version = "0.8.6"

[workspace.lints.clippy]
all = { level = "warn", priority = -1 }
Expand Down
2 changes: 1 addition & 1 deletion docs/installation.md
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ If you want to build the CAPI from its sources instead, you first need to
3. Now install `pineappl_capi`, PineAPPL's C API:

cd pineappl_capi
cargo cinstall --release --prefix=${prefix}
cargo cinstall --release --prefix=${prefix} --libdir=lib
cd ..

where `${prefix}` points to the desired installation directory.
Expand Down
1 change: 1 addition & 0 deletions maintainer/generate-coverage.sh
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,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/E906nlo_bin_00.tar'
wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/FK_ATLASTTBARTOT13TEV.dat'
wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/FK_POSXDQ.dat'
wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/LHC8-Mtt-HT4-173_3-bin1.tab.gz'
wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/LHCBWZMU7TEV_PI_part1.appl'
wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/LHCB_DY_8TEV.pineappl.lz4'
wget --no-verbose --no-clobber -P test-data 'https://data.nnpdf.science/pineappl/test-data/LHCB_DY_8TEV.tar'
Expand Down
22 changes: 6 additions & 16 deletions maintainer/make-release.sh
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@ features=(
fktable
)

main=master
this_branch=$(git rev-parse --abbrev-ref HEAD)

cd ..

if [[ $# != 1 ]]; then
Expand All @@ -38,13 +35,6 @@ if [[ $(echo ${version} | grep -oP '^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:
exit 1
fi

# in branches that are not master we only allow prereleases
if [[ ${this_branch} != ${main} ]] && [[ ${prerelease} == "" ]]; then
echo "Ordinary releases are only allowed in the '${main}' branch."
echo "If you really want to make a release from '${this_branch}', consider making a prerelease."
exit 1
fi

for crate in ${crates[@]}; do
if [[ -n $(git status ${crate} --porcelain) ]]; then
echo "This repository isn't clean. Make sure to add or delete the corresponding files."
Expand Down Expand Up @@ -72,12 +62,6 @@ for feature in ${features[@]}; do
cargo test --release --features=${feature}
done

echo ">>> Testing if 'pineappl' can be published ..."

cd pineappl
cargo publish --dry-run
cd ..

echo ">>> Updating version strings ..."

# we don't want to create a changelog entry for prereleases, which are solely
Expand Down Expand Up @@ -107,6 +91,12 @@ echo ">>> Updating Cargo.lock ..."
echo ${crates[@]} | xargs printf ' -p %s' | xargs cargo update
git add Cargo.lock

echo ">>> Testing if 'pineappl' can be published ..."

cd pineappl
cargo publish --dry-run
cd ..

echo ">>> Commiting and pushing changes ..."

git commit -m "Release v${version}"
Expand Down
2 changes: 1 addition & 1 deletion pineappl/src/evolution.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ use ndarray::{s, Array1, Array2, Array3, ArrayView1, ArrayView4, Axis};
use std::iter;

/// Number of ULPS used to de-duplicate grid values in [`Grid::evolve_info`].
pub(crate) const EVOLVE_INFO_TOL_ULPS: i64 = 64;
pub(crate) const EVOLVE_INFO_TOL_ULPS: i64 = 256;

/// Number of ULPS used to search for grid values in this module. This value must be a large-enough
/// multiple of [`EVOLVE_INFO_TOL_ULPS`], because otherwise similar values are not found in
Expand Down
Loading