From 16145b673db8544f570230f8f28bd3263d5910ec Mon Sep 17 00:00:00 2001 From: Tanjona Rabemananjara Date: Mon, 26 Jan 2026 11:40:35 +0100 Subject: [PATCH 01/21] Implement the backend logic for PDF interpolation with LHAPDF and NeoPDF --- Cargo.lock | 1290 ++++++++++++++++++++++++++++--- pineappl_cli/Cargo.toml | 1 + pineappl_cli/src/convolve.rs | 10 +- pineappl_cli/src/helpers.rs | 195 +++++ pineappl_cli/src/lib.rs | 4 + pineappl_cli/src/pdf_backend.rs | 459 +++++++++++ pineappl_cli/src/uncert.rs | 15 +- pineappl_cli/tests/convolve.rs | 15 + 8 files changed, 1871 insertions(+), 118 deletions(-) create mode 100644 pineappl_cli/src/pdf_backend.rs diff --git a/Cargo.lock b/Cargo.lock index 77c291e5..d3bb7be5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3,10 +3,10 @@ version = 3 [[package]] -name = "adler" -version = "1.0.2" +name = "adler2" +version = "2.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +checksum = "320119579fcad9c21884f5c4861d16174d0e06250625266f50fe6898340abefa" [[package]] name = "aho-corasick" @@ -107,6 +107,24 @@ dependencies = [ "tempfile", ] +[[package]] +name = "async-compression" +version = "0.4.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d10e4f991a553474232bc0a31799f6d24b034a84c0971d80d2e2f78b2e576e40" +dependencies = [ + "compression-codecs", + "compression-core", + "pin-project-lite", + "tokio", +] + +[[package]] +name = "atomic-waker" +version = "1.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" + [[package]] name = "autocfg" version = "1.1.0" @@ -163,12 +181,24 @@ dependencies = [ "serde", ] +[[package]] +name = "bumpalo" +version = "3.19.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510" + [[package]] name = "byteorder" version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" +[[package]] +name = "bytes" +version = "1.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b35204fbdc0b3f4446b89fc1ac2cf84a8a68971995d0bf2e925ec7cd960f9cb3" + [[package]] name = "cc" version = "1.2.16" @@ -184,6 +214,12 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +[[package]] +name = "cfg_aliases" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" + [[package]] name = "clap" version = "4.5.38" @@ -241,7 +277,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ "termcolor", - "unicode-width", + "unicode-width 0.1.11", ] [[package]] @@ -250,6 +286,36 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7" +[[package]] +name = "compression-codecs" +version = "0.4.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "00828ba6fd27b45a448e57dbfe84f1029d4c9f26b368157e9a448a5f49a2ec2a" +dependencies = [ + "compression-core", + "flate2", + "memchr", +] + +[[package]] +name = "compression-core" +version = "0.4.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "75984efb6ed102a0d42db99afb6c1948f0380d1d91808d5529916e6c08b49d8d" + +[[package]] +name = "console" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +dependencies = [ + "encode_unicode", + "libc", + "once_cell", + "unicode-width 0.2.2", + "windows-sys 0.59.0", +] + [[package]] name = "cpufeatures" version = "0.2.12" @@ -411,6 +477,12 @@ version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" +[[package]] +name = "dyn-clone" +version = "1.0.20" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d0881ea181b1df73ff77ffaaf9c7544ecc11e82fba9b5f27b262a3c73a332555" + [[package]] name = "either" version = "1.9.0" @@ -446,19 +518,19 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5" [[package]] name = "errno" -version = "0.3.8" +version = "0.3.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245" +checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "fastrand" -version = "2.0.1" +version = "2.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "25cbce373ec4653f1a01a31e8a5e5ec0c622dc27ff9c4e6606eefef5cbbed4a5" +checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be" [[package]] name = "filetime" @@ -474,9 +546,9 @@ dependencies = [ [[package]] name = "flate2" -version = "1.0.28" +version = "1.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e" +checksum = "b375d6465b98090a5f25b1c7703f3859783755aa9a80433b36e0379a3ec2f369" dependencies = [ "crc32fast", "miniz_oxide", @@ -510,6 +582,68 @@ dependencies = [ "winapi", ] +[[package]] +name = "futures-channel" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10" +dependencies = [ + "futures-core", + "futures-sink", +] + +[[package]] +name = "futures-core" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e" + +[[package]] +name = "futures-io" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6" + +[[package]] +name = "futures-macro" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "futures-sink" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7" + +[[package]] +name = "futures-task" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988" + +[[package]] +name = "futures-util" +version = "0.3.31" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81" +dependencies = [ + "futures-core", + "futures-io", + "futures-macro", + "futures-sink", + "futures-task", + "memchr", + "pin-project-lite", + "pin-utils", + "slab", +] + [[package]] name = "generic-array" version = "0.14.7" @@ -527,8 +661,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "190092ea657667030ac6a35e305e62fc4dd69fd98ac98631e5d3a2b1575a12b5" dependencies = [ "cfg-if", + "js-sys", "libc", "wasi", + "wasm-bindgen", +] + +[[package]] +name = "getrandom" +version = "0.3.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +dependencies = [ + "cfg-if", + "js-sys", + "libc", + "r-efi", + "wasip2", + "wasm-bindgen", ] [[package]] @@ -593,6 +743,107 @@ version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5d3d0e0f38255e7fa3cf31335b3a56f05febd18025f4db5ef7a0cfb4f8da651f" +[[package]] +name = "http" +version = "1.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +dependencies = [ + "bytes", + "itoa", +] + +[[package]] +name = "http-body" +version = "1.0.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +dependencies = [ + "bytes", + "http", +] + +[[package]] +name = "http-body-util" +version = "0.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +dependencies = [ + "bytes", + "futures-core", + "http", + "http-body", + "pin-project-lite", +] + +[[package]] +name = "httparse" +version = "1.10.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" + +[[package]] +name = "hyper" +version = "1.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2ab2d4f250c3d7b1c9fcdff1cece94ea4e2dfbec68614f7b87cb205f24ca9d11" +dependencies = [ + "atomic-waker", + "bytes", + "futures-channel", + "futures-core", + "http", + "http-body", + "httparse", + "itoa", + "pin-project-lite", + "pin-utils", + "smallvec", + "tokio", + "want", +] + +[[package]] +name = "hyper-rustls" +version = "0.27.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e3c93eb611681b207e1fe55d5a71ecf91572ec8a6705cdb6857f7d8d5242cf58" +dependencies = [ + "http", + "hyper", + "hyper-util", + "rustls", + "rustls-pki-types", + "tokio", + "tokio-rustls", + "tower-service", + "webpki-roots 1.0.5", +] + +[[package]] +name = "hyper-util" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "727805d60e7938b76b826a6ef209eb70eaa1812794f9424d4a4e2d740662df5f" +dependencies = [ + "base64", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "hyper", + "ipnet", + "libc", + "percent-encoding", + "pin-project-lite", + "socket2", + "tokio", + "tower-service", + "tracing", +] + [[package]] name = "idna" version = "1.0.3" @@ -636,12 +887,41 @@ dependencies = [ "hashbrown", ] +[[package]] +name = "indicatif" +version = "0.17.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "183b3088984b400f4cfac3620d5e076c84da5364016b4f49473de574b2586235" +dependencies = [ + "console", + "number_prefix", + "portable-atomic", + "unicode-width 0.2.2", + "web-time", +] + [[package]] name = "indoc" version = "2.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1e186cfbae8084e513daff4240b4797e342f988cecda4fb6c939150f96315fd8" +[[package]] +name = "ipnet" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "469fb0b9cefa57e3ef31275ee7cacb78f2fdca44e4765491884a2b119d4eb130" + +[[package]] +name = "iri-string" +version = "0.7.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c91338f0783edbd6195decb37bae672fd3b165faffb89bf7b9e6942f8b1a731a" +dependencies = [ + "memchr", + "serde", +] + [[package]] name = "is-terminal" version = "0.4.10" @@ -649,7 +929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bad00257d07be169d870ab665980b06cdb366d792ad690bf2e76876dc503455" dependencies = [ "hermit-abi", - "rustix", + "rustix 0.38.30", "windows-sys 0.52.0", ] @@ -662,12 +942,31 @@ dependencies = [ "either", ] +[[package]] +name = "itertools" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186" +dependencies = [ + "either", +] + [[package]] name = "itoa" version = "1.0.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1a46d1a171d865aa5f83f92695765caa047a9b4cbae2cbf37dbd613a793fd4c" +[[package]] +name = "js-sys" +version = "0.3.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8c942ebf8e95485ca0d52d97da7c5a2c387d0e7f0ba4c35e93bfcaee045955b3" +dependencies = [ + "once_cell", + "wasm-bindgen", +] + [[package]] name = "lazy_static" version = "1.4.0" @@ -676,9 +975,9 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" [[package]] name = "libc" -version = "0.2.170" +version = "0.2.180" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875b3680cb2f8f71bdcf9a30f38d48282f5d3c95cbf9b3fa57269bb5d5c06828" +checksum = "bcc35a38544a891a5f7c865aca548a982ccb3b8650a5b06d0fd33a10283c56fc" [[package]] name = "libredox" @@ -706,19 +1005,40 @@ version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c" +[[package]] +name = "linux-raw-sys" +version = "0.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df1d3c3b53da64cf5760482273a98e575c651a67eec7f77df96b5b642de8f039" + [[package]] name = "log" version = "0.4.20" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +[[package]] +name = "lru-slab" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" + [[package]] name = "lz4_flex" version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1a8cbbb2831780bc3b9c15a41f5b49222ef756b6730a95f3decfdd15903eb5a3" dependencies = [ - "twox-hash", + "twox-hash 1.6.3", +] + +[[package]] +name = "lz4_flex" +version = "0.11.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "08ab2867e3eeeca90e844d1940eab391c9dc5228783db2ed999acbc0a9ed375a" +dependencies = [ + "twox-hash 2.1.2", ] [[package]] @@ -736,7 +1056,7 @@ dependencies = [ "pkg-config", "serde", "tar", - "thiserror", + "thiserror 1.0.69", "toml", "ureq", ] @@ -768,11 +1088,23 @@ dependencies = [ [[package]] name = "miniz_oxide" -version = "0.7.1" +version = "0.8.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" +dependencies = [ + "adler2", + "simd-adler32", +] + +[[package]] +name = "mio" +version = "1.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" dependencies = [ - "adler", + "libc", + "wasi", + "windows-sys 0.61.2", ] [[package]] @@ -789,6 +1121,22 @@ dependencies = [ "serde", ] +[[package]] +name = "ndarray" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "882ed72dce9365842bf196bdeedf5055305f11fc8c03dee7bb0194a6cad34841" +dependencies = [ + "matrixmultiply", + "num-complex", + "num-integer", + "num-traits", + "portable-atomic", + "portable-atomic-util", + "rawpointer", + "serde", +] + [[package]] name = "ndarray-npy" version = "0.8.1" @@ -796,12 +1144,74 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f85776816e34becd8bd9540818d7dc77bf28307f3b3dcc51cc82403c6931680c" dependencies = [ "byteorder", - "ndarray", + "ndarray 0.15.6", "num-traits", "py_literal", "zip", ] +[[package]] +name = "neopdf" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "61b0aaca320ec52a7b70f90e14b5046b194db82fcdf59d0692e539aff111e816" +dependencies = [ + "bincode", + "flate2", + "git-version", + "indicatif", + "itertools 0.13.0", + "lz4_flex 0.11.5", + "ndarray 0.16.1", + "ninterp", + "rayon", + "regex", + "reqwest", + "serde", + "serde_yaml", + "tar", + "tempfile", + "thiserror 1.0.69", +] + +[[package]] +name = "neopdf" +version = "0.3.0-alpha2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c94df70e35a6e075fb87f8838d1c0810f8a55e6a4e76f72dab8feebd062350b" +dependencies = [ + "bincode", + "flate2", + "git-version", + "indicatif", + "itertools 0.13.0", + "lz4_flex 0.11.5", + "ndarray 0.16.1", + "neopdf 0.2.0", + "ninterp", + "rayon", + "regex", + "reqwest", + "serde", + "serde_yaml", + "tar", + "tempfile", + "thiserror 1.0.69", +] + +[[package]] +name = "ninterp" +version = "0.7.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2b9a8917fb3e2ae0574a15c14f29d1855cb53f483edfde819bc218238830ca11" +dependencies = [ + "dyn-clone", + "itertools 0.13.0", + "ndarray 0.16.1", + "num-traits", + "thiserror 1.0.69", +] + [[package]] name = "num-bigint" version = "0.4.4" @@ -841,6 +1251,12 @@ dependencies = [ "autocfg", ] +[[package]] +name = "number_prefix" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3" + [[package]] name = "numpy" version = "0.26.0" @@ -848,7 +1264,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9b2dba356160b54f5371b550575b78130a54718b4c6e46b3f33a6da74a27e78b" dependencies = [ "libc", - "ndarray", + "ndarray 0.16.1", "num-complex", "num-integer", "num-traits", @@ -882,7 +1298,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1f200d8d83c44a45b21764d1916299752ca035d15ecd46faca3e9a2a2bf6ad06" dependencies = [ "memchr", - "thiserror", + "thiserror 1.0.69", "ucd-trie", ] @@ -920,6 +1336,18 @@ dependencies = [ "sha2", ] +[[package]] +name = "pin-project-lite" +version = "0.2.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b" + +[[package]] +name = "pin-utils" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184" + [[package]] name = "pineappl" version = "0.8.3" @@ -933,12 +1361,12 @@ dependencies = [ "enum_dispatch", "float-cmp", "git-version", - "itertools", - "lz4_flex", - "ndarray", + "itertools 0.10.5", + "lz4_flex 0.9.5", + "ndarray 0.15.6", "rustc-hash 1.1.0", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -952,18 +1380,18 @@ dependencies = [ "enum_dispatch", "float-cmp", "git-version", - "itertools", - "lz4_flex", + "itertools 0.10.5", + "lz4_flex 0.9.5", "managed-lhapdf", - "ndarray", + "ndarray 0.15.6", "num-complex", "pineappl 0.8.3", - "rand", + "rand 0.8.5", "rand_pcg", "rayon", "rustc-hash 1.1.0", "serde", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -981,8 +1409,8 @@ dependencies = [ name = "pineappl_capi" version = "1.3.0" dependencies = [ - "itertools", - "ndarray", + "itertools 0.10.5", + "ndarray 0.15.6", "pineappl 1.3.0", ] @@ -1001,11 +1429,12 @@ dependencies = [ "flate2", "float-cmp", "git-version", - "itertools", - "lz4_flex", + "itertools 0.10.5", + "lz4_flex 0.9.5", "managed-lhapdf", - "ndarray", + "ndarray 0.15.6", "ndarray-npy", + "neopdf 0.3.0-alpha2", "pineappl 1.3.0", "pineappl_applgrid", "pineappl_fastnlo", @@ -1024,15 +1453,15 @@ dependencies = [ "cxx", "cxx-build", "pkg-config", - "thiserror", + "thiserror 1.0.69", ] [[package]] name = "pineappl_py" version = "1.3.0" dependencies = [ - "itertools", - "ndarray", + "itertools 0.10.5", + "ndarray 0.15.6", "numpy", "pineappl 1.3.0", "pyo3", @@ -1050,6 +1479,24 @@ version = "1.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0" +[[package]] +name = "portable-atomic-util" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d8a2f0d8d040d7848a709caf78912debcc3f33ee4b3cac47d73d1e1069e83507" +dependencies = [ + "portable-atomic", +] + +[[package]] +name = "ppv-lite86" +version = "0.2.21" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +dependencies = [ + "zerocopy", +] + [[package]] name = "predicates" version = "3.1.0" @@ -1087,14 +1534,14 @@ dependencies = [ "is-terminal", "lazy_static", "term", - "unicode-width", + "unicode-width 0.1.11", ] [[package]] name = "proc-macro2" -version = "1.0.88" +version = "1.0.106" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9" +checksum = "8fd00f0bb2e90d81d1044c2b32617f68fcb9fa3bb7640c23e9c748e53fb30934" dependencies = [ "unicode-ident", ] @@ -1174,21 +1621,102 @@ dependencies = [ ] [[package]] -name = "quote" -version = "1.0.35" +name = "quinn" +version = "0.11.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" dependencies = [ - "proc-macro2", + "bytes", + "cfg_aliases", + "pin-project-lite", + "quinn-proto", + "quinn-udp", + "rustc-hash 2.1.1", + "rustls", + "socket2", + "thiserror 2.0.18", + "tokio", + "tracing", + "web-time", ] [[package]] -name = "rand" -version = "0.8.5" +name = "quinn-proto" +version = "0.11.13" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31" +dependencies = [ + "bytes", + "getrandom 0.3.4", + "lru-slab", + "rand 0.9.2", + "ring", + "rustc-hash 2.1.1", + "rustls", + "rustls-pki-types", + "slab", + "thiserror 2.0.18", + "tinyvec", + "tracing", + "web-time", +] + +[[package]] +name = "quinn-udp" +version = "0.5.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" +dependencies = [ + "cfg_aliases", + "libc", + "once_cell", + "socket2", + "tracing", + "windows-sys 0.60.2", +] + +[[package]] +name = "quote" +version = "1.0.35" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291ec9ab5efd934aaf503a6466c5d5251535d108ee747472c3977cc5acc868ef" +dependencies = [ + "proc-macro2", +] + +[[package]] +name = "r-efi" +version = "5.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" + +[[package]] +name = "rand" +version = "0.8.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "34af8d1a0e25924bc5b7c43c079c942339d8f0a8b57c39049bef581b46327404" dependencies = [ - "rand_core", + "rand_core 0.6.4", +] + +[[package]] +name = "rand" +version = "0.9.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6db2770f06117d490610c7488547d543617b21bfa07796d7a12f6f1bd53850d1" +dependencies = [ + "rand_chacha", + "rand_core 0.9.5", +] + +[[package]] +name = "rand_chacha" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" +dependencies = [ + "ppv-lite86", + "rand_core 0.9.5", ] [[package]] @@ -1197,13 +1725,22 @@ version = "0.6.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c" +[[package]] +name = "rand_core" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" +dependencies = [ + "getrandom 0.3.4", +] + [[package]] name = "rand_pcg" version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "59cad018caf63deb318e5a4586d99a24424a364f40f1e5778c29aca23f4fc73e" dependencies = [ - "rand_core", + "rand_core 0.6.4", ] [[package]] @@ -1247,16 +1784,28 @@ version = "0.4.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a18479200779601e498ada4e8c1e1f50e3ee19deb0259c25825a98b5603b2cb4" dependencies = [ - "getrandom", + "getrandom 0.2.12", "libredox", - "thiserror", + "thiserror 1.0.69", +] + +[[package]] +name = "regex" +version = "1.12.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843bc0191f75f3e22651ae5f1e72939ab2f72a4bc30fa80a066bd66edefc24d4" +dependencies = [ + "aho-corasick", + "memchr", + "regex-automata", + "regex-syntax", ] [[package]] name = "regex-automata" -version = "0.4.5" +version = "0.4.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5bb987efffd3c6d0d8f5f89510bb458559eab11e4f869acb20bf845e016259cd" +checksum = "5276caf25ac86c8d810222b3dbb938e512c55c6831a10f3e6ed1c93b84041f1c" dependencies = [ "aho-corasick", "memchr", @@ -1265,9 +1814,51 @@ dependencies = [ [[package]] name = "regex-syntax" -version = "0.8.2" +version = "0.8.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f" +checksum = "7a2d987857b319362043e95f5353c0535c1f58eec5336fdfcf626430af7def58" + +[[package]] +name = "reqwest" +version = "0.12.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" +dependencies = [ + "base64", + "bytes", + "futures-channel", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "hyper", + "hyper-rustls", + "hyper-util", + "js-sys", + "log", + "percent-encoding", + "pin-project-lite", + "quinn", + "rustls", + "rustls-pki-types", + "serde", + "serde_json", + "serde_urlencoded", + "sync_wrapper", + "tokio", + "tokio-rustls", + "tokio-util", + "tower", + "tower-http", + "tower-service", + "url", + "wasm-bindgen", + "wasm-bindgen-futures", + "wasm-streams", + "web-sys", + "webpki-roots 1.0.5", +] [[package]] name = "ring" @@ -1277,7 +1868,7 @@ checksum = "70ac5d832aa16abd7d1def883a8545280c20a60f523a370aa3a9617c2b8550ee" dependencies = [ "cc", "cfg-if", - "getrandom", + "getrandom 0.2.12", "libc", "untrusted", "windows-sys 0.52.0", @@ -1310,15 +1901,28 @@ dependencies = [ "bitflags 2.4.2", "errno", "libc", - "linux-raw-sys", + "linux-raw-sys 0.4.13", "windows-sys 0.52.0", ] +[[package]] +name = "rustix" +version = "1.1.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "146c9e247ccc180c1f61615433868c99f3de3ae256a30a43b49f67c2d9171f34" +dependencies = [ + "bitflags 2.4.2", + "errno", + "libc", + "linux-raw-sys 0.11.0", + "windows-sys 0.61.2", +] + [[package]] name = "rustls" -version = "0.23.12" +version = "0.23.36" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c58f8c84392efc0a126acce10fa59ff7b3d2ac06ab451a33f2741989b806b044" +checksum = "c665f33d38cea657d9614f766881e4d510e0eda4239891eea56b4cadcf01801b" dependencies = [ "log", "once_cell", @@ -1331,15 +1935,19 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.8.0" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc0a2ce646f8655401bb81e7927b812614bd5d91dbc968696be50603510fcaf0" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +dependencies = [ + "web-time", + "zeroize", +] [[package]] name = "rustls-webpki" -version = "0.102.6" +version = "0.103.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e" +checksum = "d7df23109aa6c1567d1c575b9952556388da57401e4ace1d15f79eedad0d8f53" dependencies = [ "ring", "rustls-pki-types", @@ -1393,6 +2001,18 @@ dependencies = [ "syn", ] +[[package]] +name = "serde_json" +version = "1.0.143" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d401abef1d108fbd9cbaebc3e46611f4b1021f714a0597a71f41ee463f5f4a5a" +dependencies = [ + "itoa", + "memchr", + "ryu", + "serde", +] + [[package]] name = "serde_spanned" version = "0.6.5" @@ -1402,6 +2022,18 @@ dependencies = [ "serde", ] +[[package]] +name = "serde_urlencoded" +version = "0.7.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" +dependencies = [ + "form_urlencoded", + "itoa", + "ryu", + "serde", +] + [[package]] name = "serde_yaml" version = "0.9.30" @@ -1432,12 +2064,34 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "simd-adler32" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e320a6c5ad31d271ad523dcf3ad13e2767ad8b1cb8f047f75a8aeaf8da139da2" + +[[package]] +name = "slab" +version = "0.4.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7a2ae44ef20feb57a68b23d846850f861394c2e02dc425a50098ae8c90267589" + [[package]] name = "smallvec" version = "1.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67" +[[package]] +name = "socket2" +version = "0.6.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0" +dependencies = [ + "libc", + "windows-sys 0.60.2", +] + [[package]] name = "static_assertions" version = "1.1.0" @@ -1458,20 +2112,29 @@ checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc" [[package]] name = "syn" -version = "2.0.82" +version = "2.0.114" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021" +checksum = "d4d107df263a3013ef9b1879b0df87d706ff80f65a86ea879bd9c31f9b307c2a" dependencies = [ "proc-macro2", "quote", "unicode-ident", ] +[[package]] +name = "sync_wrapper" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +dependencies = [ + "futures-core", +] + [[package]] name = "tar" -version = "0.4.40" +version = "0.4.44" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b16afcea1f22891c49a00c751c7b63b2233284064f11a200fc624137c51e2ddb" +checksum = "1d863878d212c87a19c1a610eb53bb01fe12951c0501cf5a0d65f724914a667a" dependencies = [ "filetime", "libc", @@ -1486,15 +2149,15 @@ checksum = "e502f78cdbb8ba4718f566c418c52bc729126ffd16baee5baa718cf25dd5a69a" [[package]] name = "tempfile" -version = "3.9.0" +version = "3.24.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "01ce4141aa927a6d1bd34a041795abd0db1cccba5d5f24b009f694bdf3a1f3fa" +checksum = "655da9c7eb6305c55742045d5a8d2037996d61d8de95806335c7c86ce0f82e9c" dependencies = [ - "cfg-if", "fastrand", - "redox_syscall", - "rustix", - "windows-sys 0.52.0", + "getrandom 0.3.4", + "once_cell", + "rustix 1.1.3", + "windows-sys 0.61.2", ] [[package]] @@ -1525,24 +2188,96 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76" [[package]] name = "thiserror" -version = "1.0.56" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d54378c645627613241d077a3a79db965db602882668f9136ac42af9ecb730ad" +checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" +dependencies = [ + "thiserror-impl 2.0.18", ] [[package]] name = "thiserror-impl" -version = "1.0.56" +version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa0faa943b50f3db30a20aa7e265dbc66076993efed8463e8de414e5d06d3471" +checksum = "4fee6c4efc90059e10f81e6d42c60a18f76588c3d74cb83a0b242a2b6c7504c1" dependencies = [ "proc-macro2", "quote", "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "tinyvec" +version = "1.10.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa" +dependencies = [ + "tinyvec_macros", +] + +[[package]] +name = "tinyvec_macros" +version = "0.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" + +[[package]] +name = "tokio" +version = "1.49.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86" +dependencies = [ + "bytes", + "libc", + "mio", + "pin-project-lite", + "socket2", + "windows-sys 0.61.2", +] + +[[package]] +name = "tokio-rustls" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" +dependencies = [ + "rustls", + "tokio", +] + +[[package]] +name = "tokio-util" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" +dependencies = [ + "bytes", + "futures-core", + "futures-sink", + "pin-project-lite", + "tokio", +] + [[package]] name = "toml" version = "0.8.12" @@ -1577,6 +2312,81 @@ dependencies = [ "winnow", ] +[[package]] +name = "tower" +version = "0.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" +dependencies = [ + "futures-core", + "futures-util", + "pin-project-lite", + "sync_wrapper", + "tokio", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-http" +version = "0.6.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d4e6559d53cc268e5031cd8429d05415bc4cb4aefc4aa5d6cc35fbf5b924a1f8" +dependencies = [ + "async-compression", + "bitflags 2.4.2", + "bytes", + "futures-core", + "futures-util", + "http", + "http-body", + "http-body-util", + "iri-string", + "pin-project-lite", + "tokio", + "tokio-util", + "tower", + "tower-layer", + "tower-service", +] + +[[package]] +name = "tower-layer" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" + +[[package]] +name = "tower-service" +version = "0.3.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" + +[[package]] +name = "tracing" +version = "0.1.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" +dependencies = [ + "pin-project-lite", + "tracing-core", +] + +[[package]] +name = "tracing-core" +version = "0.1.36" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" +dependencies = [ + "once_cell", +] + +[[package]] +name = "try-lock" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" + [[package]] name = "twox-hash" version = "1.6.3" @@ -1587,6 +2397,12 @@ dependencies = [ "static_assertions", ] +[[package]] +name = "twox-hash" +version = "2.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" + [[package]] name = "typenum" version = "1.17.0" @@ -1611,6 +2427,12 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +[[package]] +name = "unicode-width" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + [[package]] name = "unindent" version = "0.2.3" @@ -1642,7 +2464,7 @@ dependencies = [ "rustls", "rustls-pki-types", "url", - "webpki-roots", + "webpki-roots 0.26.1", ] [[package]] @@ -1693,12 +2515,122 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "want" +version = "0.3.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" +dependencies = [ + "try-lock", +] + [[package]] name = "wasi" version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +[[package]] +name = "wasip2" +version = "1.0.2+wasi-0.2.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9517f9239f02c069db75e65f174b3da828fe5f5b945c4dd26bd25d89c03ebcf5" +dependencies = [ + "wit-bindgen", +] + +[[package]] +name = "wasm-bindgen" +version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "64024a30ec1e37399cf85a7ffefebdb72205ca1c972291c51512360d90bd8566" +dependencies = [ + "cfg-if", + "once_cell", + "rustversion", + "wasm-bindgen-macro", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-futures" +version = "0.4.58" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "70a6e77fd0ae8029c9ea0063f87c46fde723e7d887703d74ad2616d792e51e6f" +dependencies = [ + "cfg-if", + "futures-util", + "js-sys", + "once_cell", + "wasm-bindgen", + "web-sys", +] + +[[package]] +name = "wasm-bindgen-macro" +version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "008b239d9c740232e71bd39e8ef6429d27097518b6b30bdf9086833bd5b6d608" +dependencies = [ + "quote", + "wasm-bindgen-macro-support", +] + +[[package]] +name = "wasm-bindgen-macro-support" +version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5256bae2d58f54820e6490f9839c49780dff84c65aeab9e772f15d5f0e913a55" +dependencies = [ + "bumpalo", + "proc-macro2", + "quote", + "syn", + "wasm-bindgen-shared", +] + +[[package]] +name = "wasm-bindgen-shared" +version = "0.2.108" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1f01b580c9ac74c8d8f0c0e4afb04eeef2acf145458e52c03845ee9cd23e3d12" +dependencies = [ + "unicode-ident", +] + +[[package]] +name = "wasm-streams" +version = "0.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +dependencies = [ + "futures-util", + "js-sys", + "wasm-bindgen", + "wasm-bindgen-futures", + "web-sys", +] + +[[package]] +name = "web-sys" +version = "0.3.85" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "312e32e551d92129218ea9a2452120f4aabc03529ef03e4d0d82fb2780608598" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + +[[package]] +name = "web-time" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb" +dependencies = [ + "js-sys", + "wasm-bindgen", +] + [[package]] name = "webpki-roots" version = "0.26.1" @@ -1708,6 +2640,15 @@ dependencies = [ "rustls-pki-types", ] +[[package]] +name = "webpki-roots" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "12bed680863276c63889429bfd6cab3b99943659923822de1c8a39c49e4d722c" +dependencies = [ + "rustls-pki-types", +] + [[package]] name = "winapi" version = "0.3.9" @@ -1739,6 +2680,12 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +[[package]] +name = "windows-link" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" + [[package]] name = "windows-sys" version = "0.48.0" @@ -1754,7 +2701,34 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d" dependencies = [ - "windows-targets 0.52.0", + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.59.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b" +dependencies = [ + "windows-targets 0.52.6", +] + +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + +[[package]] +name = "windows-sys" +version = "0.61.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" +dependencies = [ + "windows-link", ] [[package]] @@ -1774,17 +2748,35 @@ dependencies = [ [[package]] name = "windows-targets" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a18201040b24831fbb9e4eb208f8892e1f50a37feb53cc7ff887feb8f50e7cd" +checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973" dependencies = [ - "windows_aarch64_gnullvm 0.52.0", - "windows_aarch64_msvc 0.52.0", - "windows_i686_gnu 0.52.0", - "windows_i686_msvc 0.52.0", - "windows_x86_64_gnu 0.52.0", - "windows_x86_64_gnullvm 0.52.0", - "windows_x86_64_msvc 0.52.0", + "windows_aarch64_gnullvm 0.52.6", + "windows_aarch64_msvc 0.52.6", + "windows_i686_gnu 0.52.6", + "windows_i686_gnullvm 0.52.6", + "windows_i686_msvc 0.52.6", + "windows_x86_64_gnu 0.52.6", + "windows_x86_64_gnullvm 0.52.6", + "windows_x86_64_msvc 0.52.6", +] + +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", ] [[package]] @@ -1795,9 +2787,15 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" [[package]] name = "windows_aarch64_gnullvm" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" + +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb7764e35d4db8a7921e09562a0304bf2f93e0a51bfccee0bd0bb0b666b015ea" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" [[package]] name = "windows_aarch64_msvc" @@ -1807,9 +2805,15 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" [[package]] name = "windows_aarch64_msvc" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bbaa0368d4f1d2aaefc55b6fcfee13f41544ddf36801e793edbbfd7d7df075ef" +checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" + +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" [[package]] name = "windows_i686_gnu" @@ -1819,9 +2823,27 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" [[package]] name = "windows_i686_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a28637cb1fa3560a16915793afb20081aba2c92ee8af57b4d5f28e4b3e7df313" +checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" + +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" + +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" [[package]] name = "windows_i686_msvc" @@ -1831,9 +2853,15 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" [[package]] name = "windows_i686_msvc" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" + +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ffe5e8e31046ce6230cc7215707b816e339ff4d4d67c65dffa206fd0f7aa7b9a" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" [[package]] name = "windows_x86_64_gnu" @@ -1843,9 +2871,15 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" [[package]] name = "windows_x86_64_gnu" -version = "0.52.0" +version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d6fa32db2bc4a2f5abeacf2b69f7992cd09dca97498da74a151a3132c26befd" +checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" + +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" [[package]] name = "windows_x86_64_gnullvm" @@ -1855,9 +2889,15 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" [[package]] name = "windows_x86_64_gnullvm" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" + +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a657e1e9d3f514745a572a6846d3c7aa7dbe1658c056ed9c3344c4109a6949e" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" [[package]] name = "windows_x86_64_msvc" @@ -1867,9 +2907,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" [[package]] name = "windows_x86_64_msvc" -version = "0.52.0" +version = "0.52.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" + +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dff9641d1cd4be8d1a070daf9e3773c5f67e78b4d9d42263020c057706765c04" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" [[package]] name = "winnow" @@ -1880,6 +2926,12 @@ dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" + [[package]] name = "xattr" version = "1.3.1" @@ -1887,8 +2939,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8da84f1a25939b27f6820d92aed108f83ff920fdf11a7b19366c27c4cda81d4f" dependencies = [ "libc", - "linux-raw-sys", - "rustix", + "linux-raw-sys 0.4.13", + "rustix 0.38.30", ] [[package]] @@ -1902,11 +2954,31 @@ dependencies = [ "pineappl_cli", ] +[[package]] +name = "zerocopy" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0894878a5fa3edfd6da3f88c4805f4c8558e2b996227a3d864f47fe11e38282c" +dependencies = [ + "zerocopy-derive", +] + +[[package]] +name = "zerocopy-derive" +version = "0.8.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "88d2b8d9c68ad2b9e4340d7832716a4d21a22a1154777ad56ea55c51a9cf3831" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zeroize" -version = "1.7.0" +version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d" +checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zip" @@ -1916,5 +2988,5 @@ checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" dependencies = [ "byteorder", "crc32fast", - "thiserror", + "thiserror 1.0.69", ] diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml index ce1ae688..d6aa1b1d 100644 --- a/pineappl_cli/Cargo.toml +++ b/pineappl_cli/Cargo.toml @@ -28,6 +28,7 @@ git-version = "0.3.5" itertools = "0.10.1" lhapdf = { package = "managed-lhapdf", version = "0.3.4" } lz4_flex = { optional = true, version = "0.9.2" } +neopdf = "=0.3.0-alpha2" ndarray = "0.15.4" ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.8.1" } pineappl = { path = "../pineappl", version = "=1.3.0" } diff --git a/pineappl_cli/src/convolve.rs b/pineappl_cli/src/convolve.rs index facee52f..7bf56e29 100644 --- a/pineappl_cli/src/convolve.rs +++ b/pineappl_cli/src/convolve.rs @@ -58,10 +58,11 @@ pub struct Opts { impl Subcommand for Opts { fn run(&self, cfg: &GlobalConfiguration) -> Result { let grid = helpers::read_grid(&self.input)?; - let mut conv_funs_0 = helpers::create_conv_funs(&self.conv_funs[0])?; + let mut conv_funs_0 = + helpers::create_conv_funs_with_backend(&self.conv_funs[0], cfg.pdf_backend)?; let bins: Vec<_> = self.bins.iter().cloned().flatten().collect(); - let results = helpers::convolve_scales( + let results = helpers::convolve_scales_with_backend( &grid, &mut conv_funs_0, &self.conv_funs[0].conv_types, @@ -91,8 +92,9 @@ impl Subcommand for Opts { .iter() .flat_map(|conv_funs| { let conv_types = &conv_funs.conv_types; - let mut conv_funs = helpers::create_conv_funs(conv_funs).unwrap(); - helpers::convolve( + let mut conv_funs = + helpers::create_conv_funs_with_backend(conv_funs, cfg.pdf_backend).unwrap(); + helpers::convolve_with_backend( &grid, &mut conv_funs, conv_types, diff --git a/pineappl_cli/src/helpers.rs b/pineappl_cli/src/helpers.rs index b3569358..1836b631 100644 --- a/pineappl_cli/src/helpers.rs +++ b/pineappl_cli/src/helpers.rs @@ -1,3 +1,4 @@ +use super::pdf_backend::{self, Backend, ForcePositive, PdfBackend, PdfSetBackend}; use super::GlobalConfiguration; use anyhow::{anyhow, bail, Context, Error, Result}; use itertools::Itertools; @@ -64,6 +65,7 @@ impl FromStr for ConvFuns { } } +/// Creates convolution functions using LHAPDF backend (legacy). pub fn create_conv_funs(funs: &ConvFuns) -> Result> { Ok(funs .lhapdf_names @@ -82,6 +84,22 @@ pub fn create_conv_funs(funs: &ConvFuns) -> Result> { .collect::>()?) } +/// Creates convolution functions using the specified backend. +pub fn create_conv_funs_with_backend( + funs: &ConvFuns, + backend: Backend, +) -> Result>> { + funs.lhapdf_names + .iter() + .zip(&funs.members) + .map(|(name, member)| { + let member = member.unwrap_or(0); + pdf_backend::create_pdf(name, member, backend) + }) + .collect() +} + +/// Creates convolution functions for a PDF set using LHAPDF backend (legacy). pub fn create_conv_funs_for_set( funs: &ConvFuns, index_of_set: usize, @@ -115,6 +133,30 @@ pub fn create_conv_funs_for_set( Ok((set, conv_funs)) } +/// Creates convolution functions for a PDF set using the specified backend. +/// +/// Returns a tuple of (PdfSetBackend, Vec>>). +pub fn create_conv_funs_for_set_with_backend( + funs: &ConvFuns, + index_of_set: usize, + backend: Backend, +) -> Result<(Box, Vec>>)> { + let setname = &funs.lhapdf_names[index_of_set]; + let set = pdf_backend::create_pdf_set(setname, backend)?; + + let set_members = set.mk_pdfs()?; + let conv_funs = set_members + .into_iter() + .map(|member_pdf| { + let mut conv_funs = create_conv_funs_with_backend(funs, backend)?; + conv_funs[index_of_set] = member_pdf; + Ok::<_, Error>(conv_funs) + }) + .collect::>()?; + + Ok((set, conv_funs)) +} + pub fn read_grid(input: &Path) -> Result { Grid::read(File::open(input).context(format!("unable to open '{}'", input.display()))?) .context(format!("unable to read '{}'", input.display())) @@ -238,6 +280,7 @@ pub enum ConvoluteMode { Normal, } +/// Performs convolution with scale variations using LHAPDF backend (legacy). pub fn convolve_scales( grid: &Grid, conv_funs: &mut [Pdf], @@ -357,6 +400,131 @@ pub fn convolve_scales( } } +/// Performs convolution with scale variations using the backend abstraction. +#[allow(clippy::too_many_arguments)] +pub fn convolve_scales_with_backend( + grid: &Grid, + conv_funs: &mut [Box], + conv_types: &[ConvType], + orders: &[(u8, u8)], + bins: &[usize], + channels: &[bool], + scales: &[(f64, f64, f64)], + mode: ConvoluteMode, + cfg: &GlobalConfiguration, +) -> Vec { + let orders: Vec<_> = grid + .orders() + .iter() + .map(|order| { + orders.is_empty() + || orders + .iter() + .any(|other| (order.alphas == other.0) && (order.alpha == other.1)) + }) + .collect(); + + if cfg.force_positive { + for fun in conv_funs.iter_mut() { + fun.set_force_positive(ForcePositive::ClipNegative); + } + } + + // TODO: promote this to an error + assert!( + cfg.use_alphas_from < conv_funs.len(), + "expected `use_alphas_from` to be an integer within `[0, {})`, but got `{}`", + conv_funs.len(), + cfg.use_alphas_from + ); + + // Get x_min/x_max before creating closures (requires mut) + let x_min_max: Vec<_> = conv_funs + .iter_mut() + .map(|fun| (fun.x_min(), fun.x_max())) + .collect(); + + // Create closures for xfx evaluation + let mut funs: Vec<_> = conv_funs + .iter() + .zip(&x_min_max) + .map(|(fun, &(x_min, x_max))| { + move |id: i32, x: f64, q2: f64| { + if !cfg.allow_extrapolation && (x < x_min || x > x_max) { + 0.0 + } else { + fun.xfx_q2(id, x, q2) + } + } + }) + .collect(); + + let xfx: Vec<_> = funs + .iter_mut() + .map(|fun| fun as &mut dyn FnMut(i32, f64, f64) -> f64) + .collect(); + + // Create alphas closures + let mut alphas_funs: Vec<_> = conv_funs + .iter() + .map(|fun| { + let fun_ref = fun.as_ref(); + move |q2: f64| fun_ref.alphas_q2(q2) + }) + .collect(); + + // Get particle IDs from the PDFs using the backend interface + let convolutions: Vec<_> = conv_funs + .iter() + .zip(conv_types) + .map(|(fun, &conv_type)| { + let pid = fun.particle_id(); + Conv::new(conv_type, pid) + }) + .collect(); + + let mut cache = ConvolutionCache::new(convolutions, xfx, &mut alphas_funs[cfg.use_alphas_from]); + let mut results = grid.convolve(&mut cache, &orders, bins, channels, scales); + + match mode { + ConvoluteMode::Asymmetry => { + let bin_count = grid.bwfl().len(); + + // calculating the asymmetry for a subset of bins doesn't work + assert!((bins.is_empty() || (bins.len() == bin_count)) && (bin_count % 2 == 0)); + + results + .iter() + .skip((bin_count / 2) * scales.len()) + .zip( + results + .chunks_exact(scales.len()) + .take(bin_count / 2) + .rev() + .flatten(), + ) + .map(|(pos, neg)| (pos - neg) / (pos + neg)) + .collect() + } + ConvoluteMode::Integrated => { + results + .iter_mut() + .zip( + grid.bwfl() + .normalizations() + .into_iter() + .enumerate() + .filter(|(index, _)| bins.is_empty() || bins.contains(index)) + .flat_map(|(_, norm)| iter::repeat(norm).take(scales.len())), + ) + .for_each(|(value, norm)| *value *= norm); + + results + } + ConvoluteMode::Normal => results, + } +} + pub fn scales_vector(grid: &Grid, scales: usize) -> &[(f64, f64, f64)] { let Scales { fac, frg, .. } = grid.scales(); @@ -373,6 +541,7 @@ pub fn scales_vector(grid: &Grid, scales: usize) -> &[(f64, f64, f64)] { } } +/// Performs convolution using LHAPDF backend (legacy). pub fn convolve( grid: &Grid, conv_funs: &mut [Pdf], @@ -397,6 +566,32 @@ pub fn convolve( ) } +/// Performs convolution using the backend abstraction. +#[allow(clippy::too_many_arguments)] +pub fn convolve_with_backend( + grid: &Grid, + conv_funs: &mut [Box], + conv_types: &[ConvType], + orders: &[(u8, u8)], + bins: &[usize], + lumis: &[bool], + scales: usize, + mode: ConvoluteMode, + cfg: &GlobalConfiguration, +) -> Vec { + convolve_scales_with_backend( + grid, + conv_funs, + conv_types, + orders, + bins, + lumis, + scales_vector(grid, scales), + mode, + cfg, + ) +} + pub fn convolve_limits(grid: &Grid, bins: &[usize], mode: ConvoluteMode) -> Vec> { let limits: Vec<_> = grid .bwfl() diff --git a/pineappl_cli/src/lib.rs b/pineappl_cli/src/lib.rs index 04ee204b..166e3ee7 100644 --- a/pineappl_cli/src/lib.rs +++ b/pineappl_cli/src/lib.rs @@ -14,6 +14,7 @@ mod helpers; mod import; mod merge; mod orders; +pub mod pdf_backend; mod plot; mod pull; mod read; @@ -41,6 +42,9 @@ pub struct GlobalConfiguration { /// Choose the PDF/FF set for the strong coupling. #[arg(default_value = "0", long, value_name = "IDX")] pub use_alphas_from: usize, + /// Select the PDF interpolation backend: 'lhapdf' or 'neopdf'. + #[arg(default_value = "lhapdf", long, value_name = "BACKEND")] + pub pdf_backend: pdf_backend::Backend, } #[enum_dispatch] diff --git a/pineappl_cli/src/pdf_backend.rs b/pineappl_cli/src/pdf_backend.rs new file mode 100644 index 00000000..61e0732f --- /dev/null +++ b/pineappl_cli/src/pdf_backend.rs @@ -0,0 +1,459 @@ +//! PDF backend abstraction layer. +//! +//! This module provides a unified interface for different PDF interpolation backends, +//! currently supporting LHAPDF and NeoPDF. It allows runtime selection of the backend +//! and provides type-safe access to PDF metadata. + +use anyhow::{anyhow, Context, Result}; +use std::fmt; +use std::str::FromStr; + +/// Constant for 1-sigma confidence level (for compatibility with lhapdf::CL_1_SIGMA). +pub const CL_1_SIGMA: f64 = 68.268_949_213_708_58; + +/// The type of PDF set (space-like for PDFs, time-like for FFs). +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub enum SetType { + /// Space-like PDF (standard parton distribution function). + #[default] + SpaceLike, + /// Time-like PDF (fragmentation function). + TimeLike, +} + +impl fmt::Display for SetType { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::SpaceLike => write!(f, "SpaceLike"), + Self::TimeLike => write!(f, "TimeLike"), + } + } +} + +/// Method for handling negative PDF values. +#[derive(Clone, Copy, Debug, Default)] +pub enum ForcePositive { + /// No clipping - return values as-is. + #[default] + None, + /// Clip negative values to zero. + ClipNegative, +} + +/// Available PDF backends. +#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +pub enum Backend { + /// LHAPDF backend (C++ library with Rust bindings). + #[default] + Lhapdf, + /// NeoPDF backend (pure Rust implementation). + Neopdf, +} + +impl FromStr for Backend { + type Err = anyhow::Error; + + fn from_str(s: &str) -> Result { + match s.to_lowercase().as_str() { + "lhapdf" => Ok(Self::Lhapdf), + "neopdf" => Ok(Self::Neopdf), + _ => Err(anyhow!( + "unknown PDF backend '{}'; must be 'lhapdf' or 'neopdf'", + s + )), + } + } +} + +impl fmt::Display for Backend { + fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { + match self { + Self::Lhapdf => write!(f, "lhapdf"), + Self::Neopdf => write!(f, "neopdf"), + } + } +} + +/// Unified PDF backend interface. +/// +/// This trait provides a common interface for PDF interpolation backends, +/// allowing the CLI to work with different implementations transparently. +pub trait PdfBackend: Send { + /// Evaluates xf(x, Q^2) for a given flavor. + /// + /// # Arguments + /// * `id` - The Monte Carlo PDG flavor ID. + /// * `x` - The momentum fraction. + /// * `q2` - The squared energy scale. + /// + /// # Returns + /// The PDF value xf(x, Q^2). + /// + /// # TODO + /// Extend to support NeoPDF multi-parameters interpolation. + fn xfx_q2(&self, id: i32, x: f64, q2: f64) -> f64; + + /// Evaluates the strong coupling constant alpha_s(Q^2). + fn alphas_q2(&self, q2: f64) -> f64; + + /// Returns the minimum valid x value. + fn x_min(&mut self) -> f64; + + /// Returns the maximum valid x value. + fn x_max(&mut self) -> f64; + + /// Returns the hadron particle ID (PDG code). + fn particle_id(&self) -> i32; + + /// Returns whether this is a polarized PDF. + fn is_polarized(&self) -> bool; + + /// Returns the PDF set type (space-like or time-like). + fn set_type(&self) -> SetType; + + /// Sets the method for handling negative PDF values. + fn set_force_positive(&mut self, method: ForcePositive); + + /// Returns the error type of the PDF set (e.g., "replicas", "hessian"). + fn error_type(&self) -> String; +} + +/// Unified PDF set interface for uncertainty calculations. +pub trait PdfSetBackend { + /// Returns the number of members in this set. + fn num_members(&self) -> usize; + + /// Creates all PDF members in the set. + fn mk_pdfs(&self) -> Result>>; + + /// Calculates the uncertainty for a set of values. + fn uncertainty(&self, values: &[f64], cl: f64, alternative: bool) -> Result; +} + +/// Uncertainty information from a PDF set. +#[derive(Clone, Debug)] +pub struct Uncertainty { + /// Central value. + pub central: f64, + /// Negative error (absolute value). + pub errminus: f64, + /// Positive error (absolute value). + pub errplus: f64, +} + +// ============================================================================ +// LHAPDF Backend Implementation +// ============================================================================ + +/// LHAPDF backend wrapper. +pub struct LhapdfPdf { + pdf: lhapdf::Pdf, +} + +impl LhapdfPdf { + /// Creates a new LHAPDF PDF by set name and member index. + pub fn with_setname_and_member(setname: &str, member: i32) -> Result { + Ok(Self { + pdf: lhapdf::Pdf::with_setname_and_member(setname, member).with_context(|| { + format!("failed to load LHAPDF set '{setname}' member {member}") + })?, + }) + } + + /// Creates a new LHAPDF PDF by LHAID. + pub fn with_lhaid(lhaid: i32) -> Result { + Ok(Self { + pdf: lhapdf::Pdf::with_lhaid(lhaid) + .with_context(|| format!("failed to load LHAPDF with LHAID {lhaid}"))?, + }) + } +} + +impl PdfBackend for LhapdfPdf { + fn xfx_q2(&self, id: i32, x: f64, q2: f64) -> f64 { + self.pdf.xfx_q2(id, x, q2) + } + + fn alphas_q2(&self, q2: f64) -> f64 { + self.pdf.alphas_q2(q2) + } + + fn x_min(&mut self) -> f64 { + self.pdf.x_min() + } + + fn x_max(&mut self) -> f64 { + self.pdf.x_max() + } + + fn particle_id(&self) -> i32 { + self.pdf + .set() + .entry("Particle") + .map_or(Ok(2212), |s| s.parse()) + .unwrap_or(2212) + } + + fn is_polarized(&self) -> bool { + self.pdf + .set() + .entry("Polarized") + .is_some_and(|s| s.eq_ignore_ascii_case("true")) + } + + fn set_type(&self) -> SetType { + self.pdf + .set() + .entry("SetType") + .map_or(SetType::SpaceLike, |s| { + if s.eq_ignore_ascii_case("timelike") { + SetType::TimeLike + } else { + SetType::SpaceLike + } + }) + } + + fn set_force_positive(&mut self, method: ForcePositive) { + match method { + ForcePositive::None => self.pdf.set_force_positive(0), + ForcePositive::ClipNegative => self.pdf.set_force_positive(1), + } + } + + fn error_type(&self) -> String { + self.pdf + .set() + .entry("ErrorType") + .map(|s| s.to_owned()) + .unwrap_or_default() + } +} + +/// LHAPDF set wrapper. +pub struct LhapdfSet { + set: lhapdf::PdfSet, +} + +impl LhapdfSet { + /// Creates a new LHAPDF set by name. + pub fn new(setname: &str) -> Result { + Ok(Self { + set: lhapdf::PdfSet::new(setname) + .with_context(|| format!("failed to load LHAPDF set '{setname}'"))?, + }) + } +} + +impl PdfSetBackend for LhapdfSet { + fn num_members(&self) -> usize { + self.set + .entry("NumMembers") + .and_then(|s| s.parse().ok()) + .unwrap_or(1) + } + + fn mk_pdfs(&self) -> Result>> { + let pdfs = self.set.mk_pdfs()?; + Ok(pdfs + .into_iter() + .map(|pdf| Box::new(LhapdfPdf { pdf }) as Box) + .collect()) + } + + fn uncertainty(&self, values: &[f64], cl: f64, alternative: bool) -> Result { + let unc = self.set.uncertainty(values, cl, alternative)?; + Ok(Uncertainty { + central: unc.central, + errminus: unc.errminus, + errplus: unc.errplus, + }) + } +} + +// ============================================================================ +// NeoPDF Backend Implementation +// ============================================================================ + +/// NeoPDF backend wrapper. +pub struct NeopdfPdf { + pdf: neopdf::pdf::PDF, +} + +impl NeopdfPdf { + /// Loads a NeoPDF member by set name and member index. + pub fn load(pdf_name: &str, member: usize) -> Self { + Self { + pdf: neopdf::pdf::PDF::load(pdf_name, member), + } + } +} + +impl PdfBackend for NeopdfPdf { + fn xfx_q2(&self, id: i32, x: f64, q2: f64) -> f64 { + self.pdf.xfxq2(id, &[x, q2]) + } + + fn alphas_q2(&self, q2: f64) -> f64 { + self.pdf.alphas_q2(q2) + } + + fn x_min(&mut self) -> f64 { + self.pdf.metadata().x_min + } + + fn x_max(&mut self) -> f64 { + self.pdf.metadata().x_max + } + + fn particle_id(&self) -> i32 { + self.pdf.metadata().hadron_pid + } + + fn is_polarized(&self) -> bool { + self.pdf.metadata().polarised + } + + fn set_type(&self) -> SetType { + match self.pdf.metadata().set_type { + neopdf::metadata::SetType::SpaceLike => SetType::SpaceLike, + neopdf::metadata::SetType::TimeLike => SetType::TimeLike, + } + } + + fn set_force_positive(&mut self, method: ForcePositive) { + match method { + ForcePositive::None => { + self.pdf + .set_force_positive(neopdf::gridpdf::ForcePositive::NoClipping); + } + ForcePositive::ClipNegative => { + self.pdf + .set_force_positive(neopdf::gridpdf::ForcePositive::ClipNegative); + } + } + } + + fn error_type(&self) -> String { + self.pdf.metadata().error_type.clone() + } +} + +/// NeoPDF set wrapper. +pub struct NeopdfSet { + pdf_name: String, + num_members: usize, + error_type: String, +} + +impl NeopdfSet { + /// Creates a new NeoPDF set by name. + pub fn new(pdf_name: &str) -> Self { + // Load member 0 to get metadata + let pdf0 = neopdf::pdf::PDF::load(pdf_name, 0); + let metadata = pdf0.metadata(); + + Self { + pdf_name: pdf_name.to_owned(), + num_members: metadata.num_members as usize, + error_type: metadata.error_type.clone(), + } + } +} + +impl PdfSetBackend for NeopdfSet { + fn num_members(&self) -> usize { + self.num_members + } + + fn mk_pdfs(&self) -> Result>> { + let pdfs = neopdf::pdf::PDF::load_pdfs(&self.pdf_name); + Ok(pdfs + .into_iter() + .map(|pdf| Box::new(NeopdfPdf { pdf }) as Box) + .collect()) + } + + fn uncertainty(&self, values: &[f64], cl: f64, _alternative: bool) -> Result { + let central = values[0]; + + let (errminus, errplus) = if self.error_type.to_lowercase().contains("replicas") + || self.error_type.to_lowercase().contains("monte carlo") + { + let n = values.len() as f64; + let mean: f64 = values.iter().skip(1).sum::() / (n - 1.0); + let variance: f64 = values + .iter() + .skip(1) + .map(|&v| (v - mean).powi(2)) + .sum::() + / (n - 1.0); + let std_dev = variance.sqrt(); + + let scale = if (cl - 68.27).abs() < 0.1 { + 1.0 + } else if (cl - 95.45).abs() < 0.1 { + 2.0 + } else { + cl / 100.0 * 1.645 // approximate + }; + + (std_dev * scale, std_dev * scale) + } else { + let mut sum_sq = 0.0; + for pair in values[1..].chunks(2) { + if pair.len() == 2 { + let diff = (pair[0] - pair[1]).abs() / 2.0; + sum_sq += diff.powi(2); + } + } + let err = sum_sq.sqrt(); + (err, err) + }; + + Ok(Uncertainty { + central, + errminus, + errplus, + }) + } +} + +// ============================================================================ +// Factory Functions +// ============================================================================ + +/// Creates a single PDF from a set name and member index. +pub fn create_pdf(name: &str, member: usize, backend: Backend) -> Result> { + match backend { + Backend::Lhapdf => { + if let Ok(lhaid) = name.parse::() { + Ok(Box::new(LhapdfPdf::with_lhaid(lhaid)?)) + } else { + Ok(Box::new(LhapdfPdf::with_setname_and_member( + name, + member.try_into().unwrap(), + )?)) + } + } + Backend::Neopdf => Ok(Box::new(NeopdfPdf::load(name, member))), + } +} + +/// Creates a PDF set for uncertainty calculations. +pub fn create_pdf_set(name: &str, backend: Backend) -> Result> { + match backend { + Backend::Lhapdf => { + // Try parsing as LHAID first + let setname = if let Ok(lhaid) = name.parse::() { + lhapdf::lookup_pdf(lhaid) + .map(|(set, _)| set) + .ok_or_else(|| anyhow!("no PDF set found for LHAID = {lhaid}"))? + } else { + name.to_owned() + }; + Ok(Box::new(LhapdfSet::new(&setname)?)) + } + Backend::Neopdf => Ok(Box::new(NeopdfSet::new(name))), + } +} diff --git a/pineappl_cli/src/uncert.rs b/pineappl_cli/src/uncert.rs index 33b795a4..59bc8cef 100644 --- a/pineappl_cli/src/uncert.rs +++ b/pineappl_cli/src/uncert.rs @@ -66,7 +66,7 @@ pub struct Opts { #[command(flatten)] group: Group, /// Confidence level in per cent, for convolution function uncertainties. - #[arg(default_value_t = lhapdf::CL_1_SIGMA, long)] + #[arg(default_value_t = super::pdf_backend::CL_1_SIGMA, long)] cl: f64, /// Show integrated numbers (without bin widths) instead of differential ones. #[arg(long, short)] @@ -94,7 +94,8 @@ pub struct Opts { impl Subcommand for Opts { fn run(&self, cfg: &GlobalConfiguration) -> Result { let grid = helpers::read_grid(&self.input)?; - let mut conv_funs = helpers::create_conv_funs(&self.conv_funs)?; + let mut conv_funs = + helpers::create_conv_funs_with_backend(&self.conv_funs, cfg.pdf_backend)?; let limits = helpers::convolve_limits( &grid, @@ -116,11 +117,15 @@ impl Subcommand for Opts { .conv_fun .iter() .map(|&index| { - let (set, funs) = helpers::create_conv_funs_for_set(&self.conv_funs, index)?; + let (set, funs) = helpers::create_conv_funs_for_set_with_backend( + &self.conv_funs, + index, + cfg.pdf_backend, + )?; let results: Vec<_> = funs .into_par_iter() .map(|mut funs| { - Ok::<_, Error>(helpers::convolve( + Ok::<_, Error>(helpers::convolve_with_backend( &grid, &mut funs, &self.conv_funs.conv_types, @@ -159,7 +164,7 @@ impl Subcommand for Opts { .max() .unwrap_or(1); let scale_tuples = helpers::scales_vector(&grid, scales_max); - let scale_results = helpers::convolve_scales( + let scale_results = helpers::convolve_scales_with_backend( &grid, &mut conv_funs, &self.conv_funs.conv_types, diff --git a/pineappl_cli/tests/convolve.rs b/pineappl_cli/tests/convolve.rs index e20f894b..3be6f7cf 100644 --- a/pineappl_cli/tests/convolve.rs +++ b/pineappl_cli/tests/convolve.rs @@ -475,3 +475,18 @@ fn no_channels_grid() { .success() .stdout(NO_CHANNELS_GRID_STR); } + +#[test] +fn neopdf_backend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--pdf-backend=neopdf", + "convolve", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed", + ]) + .assert() + .success() + .stdout(str::contains(DEFAULT_STR)); +} From 7da5396fa2419dc04dd70380a6e7da450ec8f135 Mon Sep 17 00:00:00 2001 From: Tanjona Rabemananjara Date: Mon, 26 Jan 2026 15:31:57 +0100 Subject: [PATCH 02/21] Bump `ndarray` version to `0.16.1` --- Cargo.lock | 65 ++++++++++++++++++++++++++++++--------- pineappl/Cargo.toml | 2 +- pineappl/src/evolution.rs | 2 +- pineappl_capi/Cargo.toml | 2 +- pineappl_cli/Cargo.toml | 4 +-- pineappl_py/Cargo.toml | 2 +- 6 files changed, 56 insertions(+), 21 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index d3bb7be5..5192b752 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -71,6 +71,15 @@ version = "1.0.79" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "080e9890a082662b09c1ad45f567faeeb47f22b5fb23895fbe1e651e718e25ca" +[[package]] +name = "arbitrary" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arrayvec" version = "0.7.4" @@ -327,9 +336,9 @@ dependencies = [ [[package]] name = "crc32fast" -version = "1.3.2" +version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +checksum = "9481c1c90cbf2ac953f07c8d4a58aa3945c425b7185c9154d67a65e4230da511" dependencies = [ "cfg-if", ] @@ -355,9 +364,9 @@ dependencies = [ [[package]] name = "crossbeam-utils" -version = "0.8.19" +version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345" +checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" [[package]] name = "crypto-common" @@ -413,6 +422,17 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_arbitrary" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "difflib" version = "0.4.0" @@ -471,6 +491,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "doc-comment" version = "0.3.3" @@ -1139,12 +1170,12 @@ dependencies = [ [[package]] name = "ndarray-npy" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f85776816e34becd8bd9540818d7dc77bf28307f3b3dcc51cc82403c6931680c" +checksum = "7b313788c468c49141a9d9b6131fc15f403e6ef4e8446a0b2e18f664ddb278a9" dependencies = [ "byteorder", - "ndarray 0.15.6", + "ndarray 0.16.1", "num-traits", "py_literal", "zip", @@ -1383,7 +1414,7 @@ dependencies = [ "itertools 0.10.5", "lz4_flex 0.9.5", "managed-lhapdf", - "ndarray 0.15.6", + "ndarray 0.16.1", "num-complex", "pineappl 0.8.3", "rand 0.8.5", @@ -1410,7 +1441,7 @@ name = "pineappl_capi" version = "1.3.0" dependencies = [ "itertools 0.10.5", - "ndarray 0.15.6", + "ndarray 0.16.1", "pineappl 1.3.0", ] @@ -1432,7 +1463,7 @@ dependencies = [ "itertools 0.10.5", "lz4_flex 0.9.5", "managed-lhapdf", - "ndarray 0.15.6", + "ndarray 0.16.1", "ndarray-npy", "neopdf 0.3.0-alpha2", "pineappl 1.3.0", @@ -1461,7 +1492,7 @@ name = "pineappl_py" version = "1.3.0" dependencies = [ "itertools 0.10.5", - "ndarray 0.15.6", + "ndarray 0.16.1", "numpy", "pineappl 1.3.0", "pyo3", @@ -2982,11 +3013,15 @@ checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" [[package]] name = "zip" -version = "0.5.13" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", - "thiserror 1.0.69", + "crossbeam-utils", + "displaydoc", + "indexmap", + "memchr", + "thiserror 2.0.18", ] diff --git a/pineappl/Cargo.toml b/pineappl/Cargo.toml index 6d262264..a2317e41 100644 --- a/pineappl/Cargo.toml +++ b/pineappl/Cargo.toml @@ -25,7 +25,7 @@ float-cmp = { default-features = false, version = "0.9.0" } git-version = "0.3.5" itertools = "0.10.1" lz4_flex = "0.9.2" -ndarray = { features = ["serde"], version = "0.15.4" } +ndarray = { features = ["serde"], version = "0.16.1" } # TODO: opt out of default features in this crate to match line above pineappl-v0 = { package = "pineappl", version = "0.8.2" } rayon = "1.5.1" diff --git a/pineappl/src/evolution.rs b/pineappl/src/evolution.rs index f7d03dbe..b252ff65 100644 --- a/pineappl/src/evolution.rs +++ b/pineappl/src/evolution.rs @@ -489,7 +489,7 @@ pub(crate) fn evolve_slice( Ok(( Array1::from_iter(sub_fk_tables) - .into_shape((1, grid.bwfl().len(), channels0.len())) + .into_shape_with_order((1, grid.bwfl().len(), channels0.len())) .unwrap(), channels0 .into_iter() diff --git a/pineappl_capi/Cargo.toml b/pineappl_capi/Cargo.toml index d87aac41..0fab881c 100644 --- a/pineappl_capi/Cargo.toml +++ b/pineappl_capi/Cargo.toml @@ -21,7 +21,7 @@ workspace = true [dependencies] pineappl = { path = "../pineappl", version = "=1.3.0" } itertools = "0.10.1" -ndarray = "0.15.4" +ndarray = "0.16.1" [features] capi = [] diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml index d6aa1b1d..3df7efb3 100644 --- a/pineappl_cli/Cargo.toml +++ b/pineappl_cli/Cargo.toml @@ -29,8 +29,8 @@ itertools = "0.10.1" lhapdf = { package = "managed-lhapdf", version = "0.3.4" } lz4_flex = { optional = true, version = "0.9.2" } neopdf = "=0.3.0-alpha2" -ndarray = "0.15.4" -ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.8.1" } +ndarray = "0.16.1" +ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.9.0" } pineappl = { path = "../pineappl", version = "=1.3.0" } pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.3.0" } pineappl_fastnlo = { optional = true, path = "../pineappl_fastnlo", version = "=1.3.0" } diff --git a/pineappl_py/Cargo.toml b/pineappl_py/Cargo.toml index fd08773a..b681be1c 100644 --- a/pineappl_py/Cargo.toml +++ b/pineappl_py/Cargo.toml @@ -29,7 +29,7 @@ crate-type = ["cdylib"] [dependencies] itertools = "0.10.1" -ndarray = "0.15.4" +ndarray = "0.16.1" numpy = "0.26.0" pineappl = { path = "../pineappl", version = "=1.3.0" } pyo3 = { features = ["extension-module"], version = "0.26.0" } From cd6ef4e5f2dd484f184d3e7ba98441a2e637a0ad Mon Sep 17 00:00:00 2001 From: Tanjona Rabemananjara Date: Mon, 26 Jan 2026 16:54:42 +0100 Subject: [PATCH 03/21] Fix Rust CLI tets --- pineappl_cli/tests/main.rs | 1 + 1 file changed, 1 insertion(+) diff --git a/pineappl_cli/tests/main.rs b/pineappl_cli/tests/main.rs index 8f6b2e34..2074f377 100644 --- a/pineappl_cli/tests/main.rs +++ b/pineappl_cli/tests/main.rs @@ -29,6 +29,7 @@ Options: --force-positive Forces negative PDF values to zero --allow-extrapolation Allow extrapolation of PDFs outside their region of validity --use-alphas-from Choose the PDF/FF set for the strong coupling [default: 0] + --pdf-backend Select the PDF interpolation backend: 'lhapdf' or 'neopdf' [default: lhapdf] -h, --help Print help -V, --version Print version "; From d98d251689a1a24d11a3f52d2f27c8648d4a449d Mon Sep 17 00:00:00 2001 From: Tanjona Rabemananjara Date: Mon, 26 Jan 2026 17:18:53 +0100 Subject: [PATCH 04/21] Address parts of the clippy warnings --- pineappl_cli/src/helpers.rs | 10 +--------- pineappl_cli/src/pdf_backend.rs | 17 +++++++++-------- 2 files changed, 10 insertions(+), 17 deletions(-) diff --git a/pineappl_cli/src/helpers.rs b/pineappl_cli/src/helpers.rs index 1836b631..20232c54 100644 --- a/pineappl_cli/src/helpers.rs +++ b/pineappl_cli/src/helpers.rs @@ -135,7 +135,7 @@ pub fn create_conv_funs_for_set( /// Creates convolution functions for a PDF set using the specified backend. /// -/// Returns a tuple of (PdfSetBackend, Vec>>). +/// Returns a tuple of (`PdfSetBackend`, Vec>>). pub fn create_conv_funs_for_set_with_backend( funs: &ConvFuns, index_of_set: usize, @@ -364,8 +364,6 @@ pub fn convolve_scales( match mode { ConvoluteMode::Asymmetry => { let bin_count = grid.bwfl().len(); - - // calculating the asymmetry for a subset of bins doesn't work assert!((bins.is_empty() || (bins.len() == bin_count)) && (bin_count % 2 == 0)); results @@ -438,13 +436,11 @@ pub fn convolve_scales_with_backend( cfg.use_alphas_from ); - // Get x_min/x_max before creating closures (requires mut) let x_min_max: Vec<_> = conv_funs .iter_mut() .map(|fun| (fun.x_min(), fun.x_max())) .collect(); - // Create closures for xfx evaluation let mut funs: Vec<_> = conv_funs .iter() .zip(&x_min_max) @@ -464,7 +460,6 @@ pub fn convolve_scales_with_backend( .map(|fun| fun as &mut dyn FnMut(i32, f64, f64) -> f64) .collect(); - // Create alphas closures let mut alphas_funs: Vec<_> = conv_funs .iter() .map(|fun| { @@ -473,7 +468,6 @@ pub fn convolve_scales_with_backend( }) .collect(); - // Get particle IDs from the PDFs using the backend interface let convolutions: Vec<_> = conv_funs .iter() .zip(conv_types) @@ -489,8 +483,6 @@ pub fn convolve_scales_with_backend( match mode { ConvoluteMode::Asymmetry => { let bin_count = grid.bwfl().len(); - - // calculating the asymmetry for a subset of bins doesn't work assert!((bins.is_empty() || (bins.len() == bin_count)) && (bin_count % 2 == 0)); results diff --git a/pineappl_cli/src/pdf_backend.rs b/pineappl_cli/src/pdf_backend.rs index 61e0732f..814ff31e 100644 --- a/pineappl_cli/src/pdf_backend.rs +++ b/pineappl_cli/src/pdf_backend.rs @@ -1,14 +1,14 @@ //! PDF backend abstraction layer. //! //! This module provides a unified interface for different PDF interpolation backends, -//! currently supporting LHAPDF and NeoPDF. It allows runtime selection of the backend +//! currently supporting `LHAPDF` and `NeoPDF`. It allows runtime selection of the backend //! and provides type-safe access to PDF metadata. use anyhow::{anyhow, Context, Result}; use std::fmt; use std::str::FromStr; -/// Constant for 1-sigma confidence level (for compatibility with lhapdf::CL_1_SIGMA). +/// Constant for 1-sigma confidence level (for compatibility with `lhapdf::CL_1_SIGMA`). pub const CL_1_SIGMA: f64 = 68.268_949_213_708_58; /// The type of PDF set (space-like for PDFs, time-like for FFs). @@ -43,10 +43,10 @@ pub enum ForcePositive { /// Available PDF backends. #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] pub enum Backend { - /// LHAPDF backend (C++ library with Rust bindings). + /// `LHAPDF` backend (C++ library with Rust bindings). #[default] Lhapdf, - /// NeoPDF backend (pure Rust implementation). + /// `NeoPDF` backend (pure Rust implementation). Neopdf, } @@ -90,10 +90,10 @@ pub trait PdfBackend: Send { /// The PDF value xf(x, Q^2). /// /// # TODO - /// Extend to support NeoPDF multi-parameters interpolation. + /// Extend to support `NeoPDF` multi-parameters interpolation. fn xfx_q2(&self, id: i32, x: f64, q2: f64) -> f64; - /// Evaluates the strong coupling constant alpha_s(Q^2). + /// Evaluates the strong coupling constant `alpha_s(Q^2)`. fn alphas_q2(&self, q2: f64) -> f64; /// Returns the minimum valid x value. @@ -275,7 +275,7 @@ impl PdfSetBackend for LhapdfSet { // NeoPDF Backend Implementation // ============================================================================ -/// NeoPDF backend wrapper. +/// `NeoPDF` backend wrapper. pub struct NeopdfPdf { pdf: neopdf::pdf::PDF, } @@ -339,7 +339,7 @@ impl PdfBackend for NeopdfPdf { } } -/// NeoPDF set wrapper. +/// `NeoPDF` set wrapper. pub struct NeopdfSet { pdf_name: String, num_members: usize, @@ -436,6 +436,7 @@ pub fn create_pdf(name: &str, member: usize, backend: Backend) -> Result Ok(Box::new(NeopdfPdf::load(name, member))), } } From 585ec1389b4d81386b6aea87c25a99f122454406 Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Mon, 2 Mar 2026 12:37:36 +0100 Subject: [PATCH 05/21] Revert back `ndarray==0.16.1` --- Cargo.lock | 7 ++++--- pineappl_cli/Cargo.toml | 3 ++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 1c97a2c0..bd375812 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1349,9 +1349,9 @@ dependencies = [ [[package]] name = "neopdf" -version = "0.3.0-alpha2" +version = "0.3.0-alpha4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c94df70e35a6e075fb87f8838d1c0810f8a55e6a4e76f72dab8feebd062350b" +checksum = "23eaee18bece0f288a5eea2c1f47ef1c995a5d1efb446da1c697e56ebaa16bdc" dependencies = [ "bincode", "flate2", @@ -1607,8 +1607,9 @@ dependencies = [ "itertools 0.10.5", "lz4_flex 0.9.5", "managed-lhapdf", + "ndarray 0.16.1", "ndarray-npy", - "neopdf 0.3.0-alpha2", + "neopdf 0.3.0-alpha4", "pineappl 1.3.3", "pineappl_applgrid", "pineappl_fastnlo", diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml index 3e030aba..911c8f23 100644 --- a/pineappl_cli/Cargo.toml +++ b/pineappl_cli/Cargo.toml @@ -28,8 +28,9 @@ git-version = "0.3.5" itertools = "0.10.1" lhapdf = { package = "managed-lhapdf", version = "0.3.4" } lz4_flex = { optional = true, version = "0.9.2" } -neopdf = "=0.3.0-alpha2" +ndarray = "0.16.1" ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.8.1" } +neopdf = "=0.3.0-alpha4" pineappl = { path = "../pineappl", version = "=1.3.3" } pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.3.3" } pineappl_fastnlo = { optional = true, path = "../pineappl_fastnlo", version = "=1.3.3" } From 94ab4ff08dc25c286f3452c7ca7d1200335f10ba Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Thu, 19 Mar 2026 10:09:07 +0100 Subject: [PATCH 06/21] Update version of `neopdf` --- Cargo.lock | 6 +++--- pineappl_cli/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 6580398c..157b2d9a 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1349,9 +1349,9 @@ dependencies = [ [[package]] name = "neopdf" -version = "0.3.0-alpha4" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "23eaee18bece0f288a5eea2c1f47ef1c995a5d1efb446da1c697e56ebaa16bdc" +checksum = "9dd15e470d0b80e5b5bf4383a8a78b4f3f661a186f599b1f9bbd16a8f40eed33" dependencies = [ "bincode", "flate2", @@ -1609,7 +1609,7 @@ dependencies = [ "managed-lhapdf", "ndarray 0.16.1", "ndarray-npy", - "neopdf 0.3.0-alpha4", + "neopdf 0.3.1", "pineappl 1.3.3", "pineappl_applgrid", "pineappl_fastnlo", diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml index 63e898fc..28c5931c 100644 --- a/pineappl_cli/Cargo.toml +++ b/pineappl_cli/Cargo.toml @@ -30,7 +30,7 @@ lhapdf = { package = "managed-lhapdf", version = "0.3.4" } lz4_flex = { optional = true, version = "0.11.6" } ndarray = "0.16.1" ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.8.1" } -neopdf = "=0.3.0-alpha4" +neopdf = "0.3.1" pineappl = { path = "../pineappl", version = "=1.3.3" } pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.3.3" } pineappl_fastnlo = { optional = true, path = "../pineappl_fastnlo", version = "=1.3.3" } From 665587ca321c15d8928023d1a4563e6b3fa7f001 Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Thu, 19 Mar 2026 10:24:37 +0100 Subject: [PATCH 07/21] Fix `ndarray-npy` version --- Cargo.lock | 38 +++++++++++++++++++++++++++++++------- pineappl_cli/Cargo.toml | 2 +- 2 files changed, 32 insertions(+), 8 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 157b2d9a..faa7df66 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -73,6 +73,15 @@ version = "1.0.102" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f202df86484c868dbad7eaa557ef785d5c66295e41b460ef922eca0723b842c" +[[package]] +name = "arbitrary" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1" +dependencies = [ + "derive_arbitrary", +] + [[package]] name = "arrayvec" version = "0.7.6" @@ -429,6 +438,17 @@ dependencies = [ "syn", ] +[[package]] +name = "derive_arbitrary" +version = "1.4.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "difflib" version = "0.4.0" @@ -1312,12 +1332,12 @@ dependencies = [ [[package]] name = "ndarray-npy" -version = "0.8.1" +version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f85776816e34becd8bd9540818d7dc77bf28307f3b3dcc51cc82403c6931680c" +checksum = "7b313788c468c49141a9d9b6131fc15f403e6ef4e8446a0b2e18f664ddb278a9" dependencies = [ "byteorder", - "ndarray 0.15.6", + "ndarray 0.16.1", "num-traits", "py_literal", "zip", @@ -3440,13 +3460,17 @@ dependencies = [ [[package]] name = "zip" -version = "0.5.13" +version = "2.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "93ab48844d61251bb3835145c521d88aa4031d7139e8485990f60ca911fa0815" +checksum = "fabe6324e908f85a1c52063ce7aa26b68dcb7eb6dbc83a2d148403c9bc3eba50" dependencies = [ - "byteorder", + "arbitrary", "crc32fast", - "thiserror 1.0.69", + "crossbeam-utils", + "displaydoc", + "indexmap", + "memchr", + "thiserror 2.0.18", ] [[package]] diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml index 28c5931c..566cf542 100644 --- a/pineappl_cli/Cargo.toml +++ b/pineappl_cli/Cargo.toml @@ -29,7 +29,7 @@ itertools = "0.10.1" lhapdf = { package = "managed-lhapdf", version = "0.3.4" } lz4_flex = { optional = true, version = "0.11.6" } ndarray = "0.16.1" -ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.8.1" } +ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.9.1" } neopdf = "0.3.1" pineappl = { path = "../pineappl", version = "=1.3.3" } pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.3.3" } From 1f655111414f798851aa75826d93bec0dbe66ac9 Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Sun, 29 Mar 2026 21:44:10 +0200 Subject: [PATCH 08/21] Update uncertainty computations from NeoPDF --- pineappl_cli/src/pdf_backend.rs | 54 ++++------------ pineappl_cli/tests/convolve.rs | 48 ++++++++++++++ pineappl_cli/tests/uncert.rs | 108 ++++++++++++++++++++++++++++++++ 3 files changed, 169 insertions(+), 41 deletions(-) diff --git a/pineappl_cli/src/pdf_backend.rs b/pineappl_cli/src/pdf_backend.rs index 814ff31e..90ef0232 100644 --- a/pineappl_cli/src/pdf_backend.rs +++ b/pineappl_cli/src/pdf_backend.rs @@ -8,8 +8,7 @@ use anyhow::{anyhow, Context, Result}; use std::fmt; use std::str::FromStr; -/// Constant for 1-sigma confidence level (for compatibility with `lhapdf::CL_1_SIGMA`). -pub const CL_1_SIGMA: f64 = 68.268_949_213_708_58; +pub use neopdf::uncertainty::CL_1_SIGMA; /// The type of PDF set (space-like for PDFs, time-like for FFs). #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] @@ -374,47 +373,20 @@ impl PdfSetBackend for NeopdfSet { .collect()) } - fn uncertainty(&self, values: &[f64], cl: f64, _alternative: bool) -> Result { - let central = values[0]; - - let (errminus, errplus) = if self.error_type.to_lowercase().contains("replicas") - || self.error_type.to_lowercase().contains("monte carlo") - { - let n = values.len() as f64; - let mean: f64 = values.iter().skip(1).sum::() / (n - 1.0); - let variance: f64 = values - .iter() - .skip(1) - .map(|&v| (v - mean).powi(2)) - .sum::() - / (n - 1.0); - let std_dev = variance.sqrt(); - - let scale = if (cl - 68.27).abs() < 0.1 { - 1.0 - } else if (cl - 95.45).abs() < 0.1 { - 2.0 - } else { - cl / 100.0 * 1.645 // approximate - }; - - (std_dev * scale, std_dev * scale) - } else { - let mut sum_sq = 0.0; - for pair in values[1..].chunks(2) { - if pair.len() == 2 { - let diff = (pair[0] - pair[1]).abs() / 2.0; - sum_sq += diff.powi(2); - } - } - let err = sum_sq.sqrt(); - (err, err) - }; + fn uncertainty(&self, values: &[f64], cl: f64, alternative: bool) -> Result { + let unc = neopdf::uncertainty::uncertainty( + values, + &self.error_type, + neopdf::uncertainty::CL_1_SIGMA, + cl, + alternative, + ) + .map_err(|e| anyhow::anyhow!(e))?; Ok(Uncertainty { - central, - errminus, - errplus, + central: unc.central, + errminus: unc.errminus, + errplus: unc.errplus, }) } } diff --git a/pineappl_cli/tests/convolve.rs b/pineappl_cli/tests/convolve.rs index 3be6f7cf..d96954a6 100644 --- a/pineappl_cli/tests/convolve.rs +++ b/pineappl_cli/tests/convolve.rs @@ -490,3 +490,51 @@ fn neopdf_backend() { .success() .stdout(str::contains(DEFAULT_STR)); } + +#[test] +fn integrated_neopdf_backend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--pdf-backend=neopdf", + "convolve", + "--integrated", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed", + ]) + .assert() + .success() + .stdout(INTEGRATED_STR); +} + +#[test] +fn bins_13567_neopdf_backend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--pdf-backend=neopdf", + "convolve", + "--bins=1,3,5-7", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed", + ]) + .assert() + .success() + .stdout(BINS_13567_STR); +} + +#[test] +fn force_positive_neopdf_backend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--force-positive", + "--pdf-backend=neopdf", + "convolve", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed", + ]) + .assert() + .success() + .stdout(FORCE_POSITIVE_STR); +} diff --git a/pineappl_cli/tests/uncert.rs b/pineappl_cli/tests/uncert.rs index b0bfcd63..6e1483ce 100644 --- a/pineappl_cli/tests/uncert.rs +++ b/pineappl_cli/tests/uncert.rs @@ -1,6 +1,7 @@ #![allow(missing_docs)] use assert_cmd::Command; +use predicates::str; use std::num::NonZeroUsize; use std::thread; @@ -204,6 +205,28 @@ const SCALE_ENV_9_STR: &str = "b etal dsig/detal 9pt-svar (env) 7 4 4.5 2.7517266e1 -5.36 5.22 "; +const NEOPDF_CONV_FUN_STR: &str = "-+----+----+-----------+-----------+---------+--------- +0 2 2.25 7.5459110e2 7.5461655e2 -1.14 1.14 +1 2.25 2.5 6.9028342e2 6.9027941e2 -1.16 1.16 +2 2.5 2.75 6.0025198e2 6.0022595e2 -1.18 1.18 +3 2.75 3 4.8552235e2 4.8548211e2 -1.22 1.22 +4 3 3.25 3.6195456e2 3.6191001e2 -1.27 1.27 +5 3.25 3.5 2.4586691e2 2.4582640e2 -1.35 1.35 +6 3.5 4 1.1586851e2 1.1584074e2 -1.51 1.51 +7 4 4.5 2.7517266e1 2.7504644e1 -2.77 2.77 +"; + +const NEOPDF_CONV_FUN_CL_90_STR: &str = "-+----+----+-----------+-----------+---------+--------- +0 2 2.25 7.5459110e2 7.5461655e2 -1.87 1.87 +1 2.25 2.5 6.9028342e2 6.9027941e2 -1.90 1.90 +2 2.5 2.75 6.0025198e2 6.0022595e2 -1.95 1.95 +3 2.75 3 4.8552235e2 4.8548211e2 -2.00 2.00 +4 3 3.25 3.6195456e2 3.6191001e2 -2.08 2.08 +5 3.25 3.5 2.4586691e2 2.4582640e2 -2.22 2.22 +6 3.5 4 1.1586851e2 1.1584074e2 -2.48 2.48 +7 4 4.5 2.7517266e1 2.7504644e1 -4.56 4.56 +"; + #[test] fn help() { Command::cargo_bin("pineappl") @@ -437,3 +460,88 @@ fn scale_env_9() { .success() .stdout(SCALE_ENV_9_STR); } + +#[test] +fn conv_fun_neopdf_backend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--pdf-backend=neopdf", + "uncert", + "--conv-fun", + "--threads=1", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed", + ]) + .assert() + .success() + .stdout(str::contains(NEOPDF_CONV_FUN_STR)); +} + +#[test] +fn conv_fun_cl_90_neopdf_backend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--pdf-backend=neopdf", + "uncert", + "--conv-fun", + "--cl=90", + "--threads=1", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed", + ]) + .assert() + .success() + .stdout(str::contains(NEOPDF_CONV_FUN_CL_90_STR)); +} + +#[test] +fn scale_env_neopdf_backend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--pdf-backend=neopdf", + "uncert", + "--scale-env", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed", + ]) + .assert() + .success() + .stdout(str::contains(SCALE_ENV_STR)); +} + +#[test] +fn conv_fun_orders_a2_as1a2_neopdf_beckend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--pdf-backend=neopdf", + "uncert", + "--conv-fun=0", + "--orders=a2,as1a2", + "--threads=1", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed", + ]) + .assert() + .success() + .stdout(ORDERS_A2_AS1A2_STR); +} + +#[test] +fn scale_abs_9_neopdf_backend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--pdf-backend=neopdf", + "uncert", + "--scale-abs=9", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed", + ]) + .assert() + .success() + .stdout(SCALE_ABS_9_STR); +} From 888b5e49cb15a4c7fed03fb8f38e6a3b08806b3d Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Sun, 29 Mar 2026 22:37:11 +0200 Subject: [PATCH 09/21] Update NeoPDF to `v0.3.2` --- Cargo.lock | 6 +++--- pineappl_cli/Cargo.toml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index faa7df66..35a0a501 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1369,9 +1369,9 @@ dependencies = [ [[package]] name = "neopdf" -version = "0.3.1" +version = "0.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9dd15e470d0b80e5b5bf4383a8a78b4f3f661a186f599b1f9bbd16a8f40eed33" +checksum = "7fdd7706b693c097a2ca6b59e897d3ed2f6b91c0d2870fdbb9e256f7692a51a4" dependencies = [ "bincode", "flate2", @@ -1629,7 +1629,7 @@ dependencies = [ "managed-lhapdf", "ndarray 0.16.1", "ndarray-npy", - "neopdf 0.3.1", + "neopdf 0.3.2", "pineappl 1.3.3", "pineappl_applgrid", "pineappl_fastnlo", diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml index 566cf542..1902ae27 100644 --- a/pineappl_cli/Cargo.toml +++ b/pineappl_cli/Cargo.toml @@ -30,7 +30,7 @@ lhapdf = { package = "managed-lhapdf", version = "0.3.4" } lz4_flex = { optional = true, version = "0.11.6" } ndarray = "0.16.1" ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.9.1" } -neopdf = "0.3.1" +neopdf = "0.3.2" pineappl = { path = "../pineappl", version = "=1.3.3" } pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.3.3" } pineappl_fastnlo = { optional = true, path = "../pineappl_fastnlo", version = "=1.3.3" } From 32baafc7f1307f1e3dcdcfbd83437c24a19748ec Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Mon, 30 Mar 2026 09:30:55 +0200 Subject: [PATCH 10/21] Add NeoPDF Path to CLI --- .github/workflows/rust.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml index 2a089d1e..192888b4 100644 --- a/.github/workflows/rust.yml +++ b/.github/workflows/rust.yml @@ -35,6 +35,7 @@ jobs: # `-C link-dead-code` is needed to prevent 'warning: XX functions have mismatched data' warnings RUSTFLAGS: '-Cinstrument-coverage -Clink-dead-code' run: | + export NEOPDF_DATA_PATH=/usr/local/share/LHAPDF # 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) # from https://stackoverflow.com/a/51141872/812178 From 6f18ace84b3eb5380e168b92f0253dfbe71d7131 Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Mon, 30 Mar 2026 14:05:36 +0200 Subject: [PATCH 11/21] Test three convolutions --- pineappl_cli/tests/convolve.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pineappl_cli/tests/convolve.rs b/pineappl_cli/tests/convolve.rs index d96954a6..44fa5fbd 100644 --- a/pineappl_cli/tests/convolve.rs +++ b/pineappl_cli/tests/convolve.rs @@ -507,6 +507,23 @@ fn integrated_neopdf_backend() { .stdout(INTEGRATED_STR); } +#[test] +fn three_pdfs_neopdf_backend() { + Command::cargo_bin("pineappl") + .unwrap() + .args([ + "--pdf-backend=neopdf", + "convolve", + "../test-data/LHCB_WP_7TEV_opt.pineappl.lz4", + "NNPDF31_nlo_as_0118_luxqed/0", + "NNPDF31_nlo_as_0118_luxqed/1", + "NNPDF31_nlo_as_0118_luxqed/2", + ]) + .assert() + .success() + .stdout(THREE_PDFS_STR); +} + #[test] fn bins_13567_neopdf_backend() { Command::cargo_bin("pineappl") From e44052fe8326c36fa6306f14a986d5ee2f4b92f1 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Mon, 11 May 2026 18:01:14 +0200 Subject: [PATCH 12/21] Remove some unnecessary dependencies --- Cargo.lock | 738 ++++++++++------------------------------------------- 1 file changed, 128 insertions(+), 610 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 4c712c60..21ea0ef7 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,16 +19,15 @@ dependencies = [ [[package]] name = "anstream" -version = "1.0.0" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is_terminal_polyfill", "utf8parse", ] @@ -40,31 +39,30 @@ checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "1.0.0" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.5" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.11" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -90,9 +88,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert_cmd" -version = "2.2.1" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39bae1d3fa576f7c6519514180a72559268dd7d1fe104070956cb687bc6673bd" +checksum = "9a686bbee5efb88a82df0621b236e74d925f470e5445d3220a5648b892ec99c9" dependencies = [ "anstyle", "bstr", @@ -159,9 +157,15 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.11.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" dependencies = [ "serde_core", ] @@ -206,9 +210,9 @@ checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" [[package]] name = "cc" -version = "1.2.62" +version = "1.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" +checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" dependencies = [ "find-msvc-tools", "shlex", @@ -228,9 +232,9 @@ checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" [[package]] name = "clap" -version = "4.6.1" +version = "4.5.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" +checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" dependencies = [ "clap_builder", "clap_derive", @@ -238,9 +242,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.0" +version = "4.5.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" dependencies = [ "anstream", "anstyle", @@ -250,9 +254,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.1" +version = "4.5.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" +checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" dependencies = [ "heck", "proc-macro2", @@ -284,7 +288,7 @@ checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681" dependencies = [ "serde", "termcolor", - "unicode-width 0.2.2", + "unicode-width 0.1.11", ] [[package]] @@ -387,7 +391,7 @@ dependencies = [ "cxxbridge-cmd", "cxxbridge-flags", "cxxbridge-macro", - "foldhash 0.2.0", + "foldhash", "link-cplusplus", ] @@ -507,17 +511,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "doc-comment" version = "0.3.4" @@ -570,7 +563,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -581,12 +574,14 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "filetime" -version = "0.2.28" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5b2eef6fafbf69f877e55509ce5b11a760690ac9700a2921be067aa6afaef6" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -611,12 +606,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "foldhash" version = "0.2.0" @@ -725,24 +714,11 @@ dependencies = [ "cfg-if", "js-sys", "libc", - "r-efi 5.3.0", + "r-efi", "wasip2", "wasm-bindgen", ] -[[package]] -name = "getrandom" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" -dependencies = [ - "cfg-if", - "libc", - "r-efi 6.0.0", - "wasip2", - "wasip3", -] - [[package]] name = "git-version" version = "0.3.9" @@ -782,25 +758,16 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags", + "bitflags 2.11.0", "ignore", "walkdir", ] [[package]] name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash 0.1.5", -] - -[[package]] -name = "hashbrown" -version = "0.17.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "heck" @@ -912,94 +879,6 @@ dependencies = [ "tracing", ] -[[package]] -name = "icu_collections" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" -dependencies = [ - "displaydoc", - "potential_utf", - "utf8_iter", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locale_core" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_normalizer" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" -dependencies = [ - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" - -[[package]] -name = "icu_properties" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" -dependencies = [ - "icu_collections", - "icu_locale_core", - "icu_properties_data", - "icu_provider", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" - -[[package]] -name = "icu_provider" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" -dependencies = [ - "displaydoc", - "icu_locale_core", - "writeable", - "yoke", - "zerofrom", - "zerotrie", - "zerovec", -] - -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "idna" version = "1.1.0" @@ -1013,13 +892,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" -dependencies = [ - "icu_normalizer", - "icu_properties", -] +checksum = "cfdf4f5d937a025381f5ab13624b1c5f51414bfe5c9885663226eae8d6d39560" [[package]] name = "ignore" @@ -1039,14 +914,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" dependencies = [ "equivalent", - "hashbrown 0.17.1", - "serde", - "serde_core", + "hashbrown", ] [[package]] @@ -1076,15 +949,9 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - [[package]] name = "itertools" version = "0.13.0" @@ -1127,23 +994,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" -version = "0.2.186" +version = "0.2.184" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" [[package]] name = "libredox" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" dependencies = [ "libc", ] @@ -1159,15 +1020,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.12.1" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] -name = "litemap" -version = "0.8.2" +name = "linux-raw-sys" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "log" @@ -1192,9 +1053,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.13.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e" +checksum = "db9a0d582c2874f68138a16ce1867e0ffde6c0bb0a0df85e1f36d04146db488a" dependencies = [ "twox-hash", ] @@ -1428,12 +1289,6 @@ version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - [[package]] name = "option-ext" version = "0.2.0" @@ -1502,12 +1357,12 @@ dependencies = [ "anyhow", "arrayvec", "bincode", - "bitflags", + "bitflags 2.11.0", "enum_dispatch", "float-cmp", "git-version", "itertools 0.14.0", - "lz4_flex 0.13.1", + "lz4_flex 0.13.0", "managed-lhapdf", "ndarray 0.17.2", "num-complex", @@ -1556,7 +1411,7 @@ dependencies = [ "float-cmp", "git-version", "itertools 0.14.0", - "lz4_flex 0.13.1", + "lz4_flex 0.13.0", "managed-lhapdf", "ndarray 0.17.2", "ndarray-npy", @@ -1606,9 +1461,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portable-atomic" @@ -1618,22 +1473,13 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "portable-atomic-util" -version = "0.2.7" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" +checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3" dependencies = [ "portable-atomic", ] -[[package]] -name = "potential_utf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" -dependencies = [ - "zerovec", -] - [[package]] name = "ppv-lite86" version = "0.2.21" @@ -1670,16 +1516,6 @@ dependencies = [ "termtree", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "prettytable-rs" version = "0.10.0" @@ -1690,7 +1526,7 @@ dependencies = [ "is-terminal", "lazy_static", "term", - "unicode-width 0.1.14", + "unicode-width 0.1.11", ] [[package]] @@ -1825,7 +1661,7 @@ dependencies = [ "once_cell", "socket2", "tracing", - "windows-sys 0.60.2", + "windows-sys 0.52.0", ] [[package]] @@ -1843,12 +1679,6 @@ version = "5.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" -[[package]] -name = "r-efi" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" - [[package]] name = "rand" version = "0.9.4" @@ -1865,7 +1695,7 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ - "rand_core 0.10.1", + "rand_core 0.10.0", ] [[package]] @@ -1889,17 +1719,17 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" [[package]] name = "rand_pcg" -version = "0.10.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" +checksum = "2a36dd10a879f5c16e363eed24471b321b114ce3112c2d5d8df06545fcf48152" dependencies = [ - "rand_core 0.10.1", + "rand_core 0.10.0", ] [[package]] @@ -1910,9 +1740,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -1928,6 +1758,15 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.6" @@ -2036,24 +1875,37 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.11.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.52.0", +] + [[package]] name = "rustix" version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags", + "bitflags 2.11.0", "errno", "libc", - "linux-raw-sys", - "windows-sys 0.61.2", + "linux-raw-sys 0.12.1", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" dependencies = [ "log", "once_cell", @@ -2066,9 +1918,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" dependencies = [ "web-time", "zeroize", @@ -2112,12 +1964,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2" -[[package]] -name = "semver" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" - [[package]] name = "serde" version = "1.0.228" @@ -2184,9 +2030,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.34+deprecated" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" dependencies = [ "indexmap", "itoa", @@ -2240,12 +2086,6 @@ dependencies = [ "windows-sys 0.61.2", ] -[[package]] -name = "stable_deref_trait" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" - [[package]] name = "strsim" version = "0.11.1" @@ -2278,17 +2118,6 @@ dependencies = [ "futures-core", ] -[[package]] -name = "synstructure" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tar" version = "0.4.45" @@ -2308,15 +2137,15 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "tempfile" -version = "3.27.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" dependencies = [ + "cfg-if", "fastrand", - "getrandom 0.4.2", "once_cell", - "rustix", - "windows-sys 0.61.2", + "rustix 0.38.44", + "windows-sys 0.52.0", ] [[package]] @@ -2385,16 +2214,6 @@ dependencies = [ "syn", ] -[[package]] -name = "tinystr" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" -dependencies = [ - "displaydoc", - "zerovec", -] - [[package]] name = "tinyvec" version = "1.11.0" @@ -2449,9 +2268,9 @@ dependencies = [ [[package]] name = "toml" -version = "0.8.23" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", @@ -2470,24 +2289,17 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.27" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "toml_write", "winnow", ] -[[package]] -name = "toml_write" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" - [[package]] name = "tower" version = "0.5.3" @@ -2510,7 +2322,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51" dependencies = [ "async-compression", - "bitflags", + "bitflags 2.11.0", "bytes", "futures-core", "futures-util", @@ -2571,9 +2383,9 @@ checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" [[package]] name = "typenum" -version = "1.20.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-trie" @@ -2589,9 +2401,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-width" -version = "0.1.14" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-width" @@ -2599,12 +2411,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -2630,7 +2436,7 @@ dependencies = [ "rustls", "rustls-pki-types", "url", - "webpki-roots 0.26.11", + "webpki-roots 0.26.1", ] [[package]] @@ -2704,16 +2510,7 @@ version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", + "wit-bindgen", ] [[package]] @@ -2771,28 +2568,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - [[package]] name = "wasm-streams" version = "0.4.2" @@ -2806,18 +2581,6 @@ dependencies = [ "web-sys", ] -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - [[package]] name = "web-sys" version = "0.3.98" @@ -2840,11 +2603,11 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.11" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" dependencies = [ - "webpki-roots 1.0.7", + "rustls-pki-types", ] [[package]] @@ -2878,7 +2641,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2920,15 +2683,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.60.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" -dependencies = [ - "windows-targets 0.53.5", -] - [[package]] name = "windows-sys" version = "0.61.2" @@ -2962,30 +2716,13 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm 0.52.6", + "windows_i686_gnullvm", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] -[[package]] -name = "windows-targets" -version = "0.53.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" -dependencies = [ - "windows-link", - "windows_aarch64_gnullvm 0.53.1", - "windows_aarch64_msvc 0.53.1", - "windows_i686_gnu 0.53.1", - "windows_i686_gnullvm 0.53.1", - "windows_i686_msvc 0.53.1", - "windows_x86_64_gnu 0.53.1", - "windows_x86_64_gnullvm 0.53.1", - "windows_x86_64_msvc 0.53.1", -] - [[package]] name = "windows_aarch64_gnullvm" version = "0.48.5" @@ -2998,12 +2735,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" -[[package]] -name = "windows_aarch64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" - [[package]] name = "windows_aarch64_msvc" version = "0.48.5" @@ -3016,12 +2747,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" -[[package]] -name = "windows_aarch64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" - [[package]] name = "windows_i686_gnu" version = "0.48.5" @@ -3034,24 +2759,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" -[[package]] -name = "windows_i686_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" - [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" -[[package]] -name = "windows_i686_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" - [[package]] name = "windows_i686_msvc" version = "0.48.5" @@ -3064,12 +2777,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" -[[package]] -name = "windows_i686_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" - [[package]] name = "windows_x86_64_gnu" version = "0.48.5" @@ -3082,12 +2789,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" -[[package]] -name = "windows_x86_64_gnu" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" - [[package]] name = "windows_x86_64_gnullvm" version = "0.48.5" @@ -3100,12 +2801,6 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" -[[package]] -name = "windows_x86_64_gnullvm" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" - [[package]] name = "windows_x86_64_msvc" version = "0.48.5" @@ -3118,121 +2813,21 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" -[[package]] -name = "windows_x86_64_msvc" -version = "0.53.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" - [[package]] name = "winnow" -version = "0.7.15" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" +checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28" dependencies = [ "memchr", ] -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - [[package]] name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - -[[package]] -name = "writeable" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" - [[package]] name = "xattr" version = "1.6.1" @@ -3240,7 +2835,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "rustix", + "rustix 1.1.4", ] [[package]] @@ -3254,29 +2849,6 @@ dependencies = [ "pineappl_cli", ] -[[package]] -name = "yoke" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" -dependencies = [ - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "zerocopy" version = "0.8.48" @@ -3297,66 +2869,12 @@ dependencies = [ "syn", ] -[[package]] -name = "zerofrom" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69faa1f2a1ea75661980b013019ed6687ed0e83d069bc1114e2cc74c6c04c4df" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "zeroize" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" -[[package]] -name = "zerotrie" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "zip" version = "6.0.0" From 105d7ca9eade1570339cda13d4752ce3a2a67c54 Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Tue, 12 May 2026 15:50:50 +0200 Subject: [PATCH 13/21] Update README and CHANGELOGS --- CHANGELOG.md | 5 +++++ README.md | 4 +++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index df97b4e6..eb9f8d2d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +### Changed + +- Isolate PDF interpolation backend, current suppored backends include + LHAPDF and NeoPDF + ## [1.4.0] - 12/05/2026 Starting with this version, PineAPPL has an official logo! diff --git a/README.md b/README.md index 08cbc86e..3fa243d7 100644 --- a/README.md +++ b/README.md @@ -45,7 +45,8 @@ If you use PineAPPL, please cite By using PineAPPL, you're probably also using - [APPLgrid], -- [fastNLO] and/or +- [fastNLO], +- [NeoPDF] and/or - [LHAPDF]. If that is the case, please cite these accordingly. @@ -53,6 +54,7 @@ If that is the case, please cite these accordingly. [APPLgrid]: https://applgrid.hepforge.org [fastNLO]: https://fastnlo.hepforge.org [LHAPDF]: https://lhapdf.hepforge.org +[NeoPDF]: https://qcdlab.github.io/neopdf/ [zenodo DOI]: https://zenodo.org/badge/latestdoi/248306479 [paper]: https://inspirehep.net/literature/1814432 From 3c4dd36a2e2f101b64fdb8a2860f4b62c81d7fa5 Mon Sep 17 00:00:00 2001 From: Radonirinaunimi Date: Tue, 12 May 2026 16:13:48 +0200 Subject: [PATCH 14/21] Bump `neopdf` to version `v0.3.3` --- Cargo.lock | 1119 ++++++++++++++++----------------------- pineappl_cli/Cargo.toml | 2 +- 2 files changed, 463 insertions(+), 658 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 77d8d339..db056e95 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,15 +19,16 @@ dependencies = [ [[package]] name = "anstream" -version = "0.6.11" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", + "is_terminal_polyfill", "utf8parse", ] @@ -39,30 +40,31 @@ checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "0.2.7" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.0.2" +version = "1.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] name = "anstyle-wincon" -version = "3.0.2" +version = "3.0.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" dependencies = [ "anstyle", - "windows-sys 0.52.0", + "once_cell_polyfill", + "windows-sys 0.61.2", ] [[package]] @@ -88,9 +90,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert_cmd" -version = "2.2.0" +version = "2.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a686bbee5efb88a82df0621b236e74d925f470e5445d3220a5648b892ec99c9" +checksum = "2aa3a22042e45de04255c7bf3626e239f450200fd0493c1e382263544b20aea6" dependencies = [ "anstyle", "bstr", @@ -116,24 +118,6 @@ dependencies = [ "tempfile", ] -[[package]] -name = "async-compression" -version = "0.4.42" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e79b3f8a79cccc2898f31920fc69f304859b3bd567490f75ebf51ae1c792a9ac" -dependencies = [ - "compression-codecs", - "compression-core", - "pin-project-lite", - "tokio", -] - -[[package]] -name = "atomic-waker" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0" - [[package]] name = "autocfg" version = "1.5.0" @@ -157,15 +141,9 @@ dependencies = [ [[package]] name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bitflags" -version = "2.11.0" +version = "2.11.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" dependencies = [ "serde_core", ] @@ -202,17 +180,11 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" -[[package]] -name = "bytes" -version = "1.11.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33" - [[package]] name = "cc" -version = "1.2.59" +version = "1.2.62" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" +checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" dependencies = [ "find-msvc-tools", "shlex", @@ -224,17 +196,11 @@ version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" -[[package]] -name = "cfg_aliases" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" - [[package]] name = "clap" -version = "4.5.60" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" +checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" dependencies = [ "clap_builder", "clap_derive", @@ -242,9 +208,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.5.60" +version = "4.6.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" dependencies = [ "anstream", "anstyle", @@ -254,9 +220,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.55" +version = "4.6.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" +checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" dependencies = [ "heck", "proc-macro2", @@ -288,7 +254,7 @@ checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681" dependencies = [ "serde", "termcolor", - "unicode-width 0.1.11", + "unicode-width 0.2.2", ] [[package]] @@ -297,23 +263,6 @@ version = "1.0.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" -[[package]] -name = "compression-codecs" -version = "0.4.38" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce2548391e9c1929c21bf6aa2680af86fe4c1b33e6cea9ac1cfeec0bd11218cf" -dependencies = [ - "compression-core", - "flate2", - "memchr", -] - -[[package]] -name = "compression-core" -version = "0.4.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cc14f565cf027a105f7a44ccf9e5b424348421a1d8952a8fc9d499d313107789" - [[package]] name = "console" version = "0.15.11" @@ -391,7 +340,7 @@ dependencies = [ "cxxbridge-cmd", "cxxbridge-flags", "cxxbridge-macro", - "foldhash", + "foldhash 0.2.0", "link-cplusplus", ] @@ -511,6 +460,17 @@ dependencies = [ "winapi", ] +[[package]] +name = "displaydoc" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "doc-comment" version = "0.3.4" @@ -563,7 +523,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -574,14 +534,12 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "filetime" -version = "0.2.23" +version = "0.2.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" +checksum = "2d5b2eef6fafbf69f877e55509ce5b11a760690ac9700a2921be067aa6afaef6" dependencies = [ "cfg-if", "libc", - "redox_syscall", - "windows-sys 0.52.0", ] [[package]] @@ -606,6 +564,12 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foldhash" version = "0.2.0" @@ -621,45 +585,12 @@ dependencies = [ "percent-encoding", ] -[[package]] -name = "futures-channel" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "07bbe89c50d7a535e539b8c17bc0b49bdb77747034daa8087407d655f3f7cc1d" -dependencies = [ - "futures-core", - "futures-sink", -] - [[package]] name = "futures-core" version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7e3450815272ef58cec6d564423f6e755e25379b217b0bc688e295ba24df6b1d" -[[package]] -name = "futures-io" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cecba35d7ad927e23624b22ad55235f2239cfa44fd10428eecbeba6d6a717718" - -[[package]] -name = "futures-macro" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e835b70203e41293343137df5c0664546da5745f82ec9b84d40be8336958447b" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "futures-sink" -version = "0.3.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c39754e157331b013978ec91992bde1ac089843443c49cbc7f46150b0fad0893" - [[package]] name = "futures-task" version = "0.3.32" @@ -673,11 +604,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "389ca41296e6190b48053de0321d02a77f32f8a5d2461dd38762c0593805c6d6" dependencies = [ "futures-core", - "futures-io", - "futures-macro", - "futures-sink", "futures-task", - "memchr", "pin-project-lite", "slab", ] @@ -699,24 +626,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff2abc00be7fca6ebc474524697ae276ad847ad0a6b3faa4bcb027e9a4614ad0" dependencies = [ "cfg-if", - "js-sys", "libc", "wasi", - "wasm-bindgen", ] [[package]] name = "getrandom" -version = "0.3.4" +version = "0.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "899def5c37c4fd7b2664648c28120ecec138e4d395b459e5ca34f9cce2dd77fd" +checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" dependencies = [ "cfg-if", - "js-sys", "libc", "r-efi", "wasip2", - "wasm-bindgen", + "wasip3", ] [[package]] @@ -758,16 +682,25 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags 2.11.0", + "bitflags", "ignore", "walkdir", ] [[package]] name = "hashbrown" -version = "0.16.1" +version = "0.15.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash 0.1.5", +] + +[[package]] +name = "hashbrown" +version = "0.17.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" +checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" [[package]] name = "heck" @@ -782,103 +715,93 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" [[package]] -name = "http" -version = "1.4.0" +name = "icu_collections" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e3ba2a386d7f85a81f119ad7498ebe444d2e22c2af0b86b069416ace48b3311a" +checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" dependencies = [ - "bytes", - "itoa", + "displaydoc", + "potential_utf", + "utf8_iter", + "yoke", + "zerofrom", + "zerovec", ] [[package]] -name = "http-body" -version = "1.0.1" +name = "icu_locale_core" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1efedce1fb8e6913f23e0c92de8e62cd5b772a67e7b3946df930a62566c93184" +checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" dependencies = [ - "bytes", - "http", + "displaydoc", + "litemap", + "tinystr", + "writeable", + "zerovec", ] [[package]] -name = "http-body-util" -version = "0.1.3" +name = "icu_normalizer" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b021d93e26becf5dc7e1b75b1bed1fd93124b374ceb73f43d4d4eafec896a64a" +checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" dependencies = [ - "bytes", - "futures-core", - "http", - "http-body", - "pin-project-lite", + "icu_collections", + "icu_normalizer_data", + "icu_properties", + "icu_provider", + "smallvec", + "zerovec", ] [[package]] -name = "httparse" -version = "1.10.1" +name = "icu_normalizer_data" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87" +checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" [[package]] -name = "hyper" -version = "1.9.0" +name = "icu_properties" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6299f016b246a94207e63da54dbe807655bf9e00044f73ded42c3ac5305fbcca" +checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" dependencies = [ - "atomic-waker", - "bytes", - "futures-channel", - "futures-core", - "http", - "http-body", - "httparse", - "itoa", - "pin-project-lite", - "smallvec", - "tokio", - "want", + "icu_collections", + "icu_locale_core", + "icu_properties_data", + "icu_provider", + "zerotrie", + "zerovec", ] [[package]] -name = "hyper-rustls" -version = "0.27.9" +name = "icu_properties_data" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33ca68d021ef39cf6463ab54c1d0f5daf03377b70561305bb89a8f83aab66e0f" -dependencies = [ - "http", - "hyper", - "hyper-util", - "rustls", - "tokio", - "tokio-rustls", - "tower-service", - "webpki-roots 1.0.7", -] +checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" [[package]] -name = "hyper-util" -version = "0.1.20" +name = "icu_provider" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96547c2556ec9d12fb1578c4eaf448b04993e7fb79cbaad930a656880a6bdfa0" +checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" dependencies = [ - "base64", - "bytes", - "futures-channel", - "futures-util", - "http", - "http-body", - "hyper", - "ipnet", - "libc", - "percent-encoding", - "pin-project-lite", - "socket2", - "tokio", - "tower-service", - "tracing", + "displaydoc", + "icu_locale_core", + "writeable", + "yoke", + "zerofrom", + "zerotrie", + "zerovec", ] +[[package]] +name = "id-arena" +version = "2.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" + [[package]] name = "idna" version = "1.1.0" @@ -892,9 +815,13 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.0.0" +version = "1.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cfdf4f5d937a025381f5ab13624b1c5f51414bfe5c9885663226eae8d6d39560" +checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" +dependencies = [ + "icu_normalizer", + "icu_properties", +] [[package]] name = "ignore" @@ -914,12 +841,14 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.13.1" +version = "2.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" +checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" dependencies = [ "equivalent", - "hashbrown", + "hashbrown 0.17.1", + "serde", + "serde_core", ] [[package]] @@ -935,12 +864,6 @@ dependencies = [ "web-time", ] -[[package]] -name = "ipnet" -version = "2.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d98f6fed1fde3f8c21bc40a1abb88dd75e67924f9cffc3ef95607bad8017f8e2" - [[package]] name = "is-terminal" version = "0.4.17" @@ -949,9 +872,15 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] +[[package]] +name = "is_terminal_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + [[package]] name = "itertools" version = "0.13.0" @@ -994,17 +923,23 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" +[[package]] +name = "leb128fmt" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" + [[package]] name = "libc" -version = "0.2.184" +version = "0.2.186" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" +checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" [[package]] name = "libredox" -version = "0.1.15" +version = "0.1.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" +checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" dependencies = [ "libc", ] @@ -1020,15 +955,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.4.15" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] -name = "linux-raw-sys" -version = "0.12.1" +name = "litemap" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" +checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" [[package]] name = "log" @@ -1036,12 +971,6 @@ version = "0.4.29" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "5e5032e24019045c762d3c0f28f5b6b8bbf38563a65908389bf7978758920897" -[[package]] -name = "lru-slab" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "112b39cec0b298b6c1999fee3e31427f74f676e4cb9879ed1a121b43661a4154" - [[package]] name = "lz4_flex" version = "0.11.6" @@ -1053,9 +982,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db9a0d582c2874f68138a16ce1867e0ffde6c0bb0a0df85e1f36d04146db488a" +checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e" dependencies = [ "twox-hash", ] @@ -1074,7 +1003,7 @@ dependencies = [ "pkg-config", "serde", "tar", - "thiserror 1.0.69", + "thiserror", "toml", "ureq", "url", @@ -1106,17 +1035,6 @@ dependencies = [ "simd-adler32", ] -[[package]] -name = "mio" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50b7e5b27aa02a74bac8c3f23f448f8d87ff11f92d3aac1a6ed369ee08cc56c1" -dependencies = [ - "libc", - "wasi", - "windows-sys 0.61.2", -] - [[package]] name = "ndarray" version = "0.16.1" @@ -1164,9 +1082,9 @@ dependencies = [ [[package]] name = "neopdf" -version = "0.2.0" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "61b0aaca320ec52a7b70f90e14b5046b194db82fcdf59d0692e539aff111e816" +checksum = "b3960d3d8f81b41ee953c7d899491c5588454bbfa442ccb88547c0672c28bc03" dependencies = [ "bincode", "flate2", @@ -1175,22 +1093,23 @@ dependencies = [ "itertools 0.13.0", "lz4_flex 0.11.6", "ndarray 0.16.1", + "neopdf_legacy", "ninterp", "rayon", "regex", - "reqwest", "serde", "serde_yaml", "tar", "tempfile", - "thiserror 1.0.69", + "thiserror", + "ureq", ] [[package]] -name = "neopdf" -version = "0.3.2" +name = "neopdf_legacy" +version = "0.3.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7fdd7706b693c097a2ca6b59e897d3ed2f6b91c0d2870fdbb9e256f7692a51a4" +checksum = "1377fafc63af93eb63758599b8330174734aaaa9e41c38a47c4e11a735b1d76f" dependencies = [ "bincode", "flate2", @@ -1199,16 +1118,15 @@ dependencies = [ "itertools 0.13.0", "lz4_flex 0.11.6", "ndarray 0.16.1", - "neopdf 0.2.0", "ninterp", "rayon", "regex", - "reqwest", "serde", "serde_yaml", "tar", "tempfile", - "thiserror 1.0.69", + "thiserror", + "ureq", ] [[package]] @@ -1221,7 +1139,7 @@ dependencies = [ "itertools 0.13.0", "ndarray 0.16.1", "num-traits", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1289,6 +1207,12 @@ version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" + [[package]] name = "option-ext" version = "0.2.0" @@ -1357,22 +1281,22 @@ dependencies = [ "anyhow", "arrayvec", "bincode", - "bitflags 2.11.0", + "bitflags", "enum_dispatch", "float-cmp", "git-version", "itertools 0.14.0", - "lz4_flex 0.13.0", + "lz4_flex 0.13.1", "managed-lhapdf", "ndarray 0.17.2", "num-complex", "pineappl_v0", - "rand 0.10.1", + "rand", "rand_pcg", "rayon", "rustc-hash", "serde", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1411,11 +1335,11 @@ dependencies = [ "float-cmp", "git-version", "itertools 0.14.0", - "lz4_flex 0.13.0", + "lz4_flex 0.13.1", "managed-lhapdf", "ndarray 0.17.2", "ndarray-npy", - "neopdf 0.3.2", + "neopdf", "pineappl", "pineappl_applgrid", "pineappl_fastnlo", @@ -1434,7 +1358,7 @@ dependencies = [ "cxx", "cxx-build", "pkg-config", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1456,14 +1380,14 @@ dependencies = [ "enum_dispatch", "ndarray 0.17.2", "serde", - "thiserror 1.0.69", + "thiserror", ] [[package]] name = "pkg-config" -version = "0.3.32" +version = "0.3.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" +checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" [[package]] name = "portable-atomic" @@ -1473,20 +1397,20 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "portable-atomic-util" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3" +checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" dependencies = [ "portable-atomic", ] [[package]] -name = "ppv-lite86" -version = "0.2.21" +name = "potential_utf" +version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "85eae3c4ed2f50dcfe72643da4befc30deadb458a9b590d720cde2f2b1e97da9" +checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" dependencies = [ - "zerocopy", + "zerovec", ] [[package]] @@ -1516,6 +1440,16 @@ dependencies = [ "termtree", ] +[[package]] +name = "prettyplease" +version = "0.2.37" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" +dependencies = [ + "proc-macro2", + "syn", +] + [[package]] name = "prettytable-rs" version = "0.10.0" @@ -1526,7 +1460,7 @@ dependencies = [ "is-terminal", "lazy_static", "term", - "unicode-width 0.1.11", + "unicode-width 0.1.14", ] [[package]] @@ -1609,61 +1543,6 @@ dependencies = [ "syn", ] -[[package]] -name = "quinn" -version = "0.11.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20" -dependencies = [ - "bytes", - "cfg_aliases", - "pin-project-lite", - "quinn-proto", - "quinn-udp", - "rustc-hash", - "rustls", - "socket2", - "thiserror 2.0.18", - "tokio", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-proto" -version = "0.11.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "434b42fec591c96ef50e21e886936e66d3cc3f737104fdb9b737c40ffb94c098" -dependencies = [ - "bytes", - "getrandom 0.3.4", - "lru-slab", - "rand 0.9.4", - "ring", - "rustc-hash", - "rustls", - "rustls-pki-types", - "slab", - "thiserror 2.0.18", - "tinyvec", - "tracing", - "web-time", -] - -[[package]] -name = "quinn-udp" -version = "0.5.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd" -dependencies = [ - "cfg_aliases", - "libc", - "once_cell", - "socket2", - "tracing", - "windows-sys 0.52.0", -] - [[package]] name = "quote" version = "1.0.45" @@ -1675,19 +1554,9 @@ dependencies = [ [[package]] name = "r-efi" -version = "5.3.0" +version = "6.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "69cdb34c158ceb288df11e18b4bd39de994f6657d83847bdffdbd7f346754b0f" - -[[package]] -name = "rand" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "44c5af06bb1b7d3216d91932aed5265164bf384dc89cd6ba05cf59a35f5f76ea" -dependencies = [ - "rand_chacha", - "rand_core 0.9.5", -] +checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" [[package]] name = "rand" @@ -1695,41 +1564,22 @@ version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d2e8e8bcc7961af1fdac401278c6a831614941f6164ee3bf4ce61b7edb162207" dependencies = [ - "rand_core 0.10.0", -] - -[[package]] -name = "rand_chacha" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3022b5f1df60f26e1ffddd6c66e8aa15de382ae63b3a0c1bfc0e4d3e3f325cb" -dependencies = [ - "ppv-lite86", - "rand_core 0.9.5", + "rand_core", ] [[package]] name = "rand_core" -version = "0.9.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "76afc826de14238e6e8c374ddcc1fa19e374fd8dd986b0d2af0d02377261d83c" -dependencies = [ - "getrandom 0.3.4", -] - -[[package]] -name = "rand_core" -version = "0.10.0" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" +checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" [[package]] name = "rand_pcg" -version = "0.10.1" +version = "0.10.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2a36dd10a879f5c16e363eed24471b321b114ce3112c2d5d8df06545fcf48152" +checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" dependencies = [ - "rand_core 0.10.0", + "rand_core", ] [[package]] @@ -1740,9 +1590,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.11.0" +version = "1.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" +checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" dependencies = [ "either", "rayon-core", @@ -1758,15 +1608,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "redox_syscall" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" -dependencies = [ - "bitflags 1.3.2", -] - [[package]] name = "redox_users" version = "0.4.6" @@ -1775,7 +1616,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom 0.2.17", "libredox", - "thiserror 1.0.69", + "thiserror", ] [[package]] @@ -1807,48 +1648,6 @@ version = "0.8.10" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dc897dd8d9e8bd1ed8cdad82b5966c3e0ecae09fb1907d58efaa013543185d0a" -[[package]] -name = "reqwest" -version = "0.12.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eddd3ca559203180a307f12d114c268abf583f59b03cb906fd0b3ff8646c1147" -dependencies = [ - "base64", - "bytes", - "futures-channel", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "hyper", - "hyper-rustls", - "hyper-util", - "js-sys", - "log", - "percent-encoding", - "pin-project-lite", - "quinn", - "rustls", - "rustls-pki-types", - "serde", - "serde_json", - "serde_urlencoded", - "sync_wrapper", - "tokio", - "tokio-rustls", - "tokio-util", - "tower", - "tower-http", - "tower-service", - "url", - "wasm-bindgen", - "wasm-bindgen-futures", - "wasm-streams", - "web-sys", - "webpki-roots 1.0.7", -] - [[package]] name = "ring" version = "0.17.14" @@ -1875,37 +1674,24 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" -[[package]] -name = "rustix" -version = "0.38.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" -dependencies = [ - "bitflags 2.11.0", - "errno", - "libc", - "linux-raw-sys 0.4.15", - "windows-sys 0.52.0", -] - [[package]] name = "rustix" version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags 2.11.0", + "bitflags", "errno", "libc", - "linux-raw-sys 0.12.1", - "windows-sys 0.52.0", + "linux-raw-sys", + "windows-sys 0.61.2", ] [[package]] name = "rustls" -version = "0.23.37" +version = "0.23.40" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" +checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" dependencies = [ "log", "once_cell", @@ -1918,11 +1704,10 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.0" +version = "1.14.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" +checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" dependencies = [ - "web-time", "zeroize", ] @@ -1964,6 +1749,12 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2" +[[package]] +name = "semver" +version = "1.0.28" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" + [[package]] name = "serde" version = "1.0.228" @@ -2016,23 +1807,11 @@ dependencies = [ "serde", ] -[[package]] -name = "serde_urlencoded" -version = "0.7.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d3491c14715ca2294c4d6a88f15e84739788c1d030eed8c110436aafdaa2f3fd" -dependencies = [ - "form_urlencoded", - "itoa", - "ryu", - "serde", -] - [[package]] name = "serde_yaml" -version = "0.9.33" +version = "0.9.34+deprecated" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" +checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" dependencies = [ "indexmap", "itoa", @@ -2077,14 +1856,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" [[package]] -name = "socket2" -version = "0.6.3" +name = "stable_deref_trait" +version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3a766e1110788c36f4fa1c2b71b387a7815aa65f88ce0229841826633d93723e" -dependencies = [ - "libc", - "windows-sys 0.61.2", -] +checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" [[package]] name = "strsim" @@ -2110,12 +1885,14 @@ dependencies = [ ] [[package]] -name = "sync_wrapper" -version = "1.0.2" +name = "synstructure" +version = "0.13.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0bf256ce5efdfa370213c1dabab5935a12e49f2c58d15e9eac2870d3b4f27263" +checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" dependencies = [ - "futures-core", + "proc-macro2", + "quote", + "syn", ] [[package]] @@ -2137,15 +1914,15 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "tempfile" -version = "3.11.0" +version = "3.27.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" +checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" dependencies = [ - "cfg-if", "fastrand", + "getrandom 0.4.2", "once_cell", - "rustix 0.38.44", - "windows-sys 0.52.0", + "rustix", + "windows-sys 0.61.2", ] [[package]] @@ -2180,16 +1957,7 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl 1.0.69", -] - -[[package]] -name = "thiserror" -version = "2.0.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4288b5bcbc7920c07a1149a35cf9590a2aa808e0bc1eafaade0b80947865fbc4" -dependencies = [ - "thiserror-impl 2.0.18", + "thiserror-impl", ] [[package]] @@ -2204,73 +1972,20 @@ dependencies = [ ] [[package]] -name = "thiserror-impl" -version = "2.0.18" +name = "tinystr" +version = "0.8.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc4ee7f67670e9b64d05fa4253e753e016c6c95ff35b89b7941d6b856dec1d5" +checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "tinyvec" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61e67053d25a4e82c844e8424039d9745781b3fc4f32b8d55ed50f5f667ef3" -dependencies = [ - "tinyvec_macros", -] - -[[package]] -name = "tinyvec_macros" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20" - -[[package]] -name = "tokio" -version = "1.52.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc7f01b389ac15039e4dc9531aa973a135d7a4135281b12d7c1bc79fd57fffe" -dependencies = [ - "bytes", - "libc", - "mio", - "pin-project-lite", - "socket2", - "windows-sys 0.61.2", -] - -[[package]] -name = "tokio-rustls" -version = "0.26.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61" -dependencies = [ - "rustls", - "tokio", -] - -[[package]] -name = "tokio-util" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ae9cec805b01e8fc3fd2fe289f89149a9b66dd16786abd8b19cfa7b48cb0098" -dependencies = [ - "bytes", - "futures-core", - "futures-sink", - "pin-project-lite", - "tokio", + "displaydoc", + "zerovec", ] [[package]] name = "toml" -version = "0.8.12" +version = "0.8.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" +checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" dependencies = [ "serde", "serde_spanned", @@ -2289,91 +2004,23 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.9" +version = "0.22.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" +checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", + "toml_write", "winnow", ] [[package]] -name = "tower" -version = "0.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebe5ef63511595f1344e2d5cfa636d973292adc0eec1f0ad45fae9f0851ab1d4" -dependencies = [ - "futures-core", - "futures-util", - "pin-project-lite", - "sync_wrapper", - "tokio", - "tower-layer", - "tower-service", -] - -[[package]] -name = "tower-http" -version = "0.6.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68d6fdd9f81c2819c9a8b0e0cd91660e7746a8e6ea2ba7c6b2b057985f6bcb51" -dependencies = [ - "async-compression", - "bitflags 2.11.0", - "bytes", - "futures-core", - "futures-util", - "http", - "http-body", - "http-body-util", - "pin-project-lite", - "tokio", - "tokio-util", - "tower", - "tower-layer", - "tower-service", - "url", -] - -[[package]] -name = "tower-layer" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e" - -[[package]] -name = "tower-service" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3" - -[[package]] -name = "tracing" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63e71662fa4b2a2c3a26f570f037eb95bb1f85397f3cd8076caed2f026a6d100" -dependencies = [ - "pin-project-lite", - "tracing-core", -] - -[[package]] -name = "tracing-core" -version = "0.1.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "db97caf9d906fbde555dd62fa95ddba9eecfd14cb388e4f491a66d74cd5fb79a" -dependencies = [ - "once_cell", -] - -[[package]] -name = "try-lock" -version = "0.2.5" +name = "toml_write" +version = "0.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b" +checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" [[package]] name = "twox-hash" @@ -2383,9 +2030,9 @@ checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" [[package]] name = "typenum" -version = "1.19.0" +version = "1.20.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" +checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" [[package]] name = "ucd-trie" @@ -2401,9 +2048,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-width" -version = "0.1.11" +version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" +checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" [[package]] name = "unicode-width" @@ -2411,6 +2058,12 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" +[[package]] +name = "unicode-xid" +version = "0.2.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" + [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -2436,7 +2089,7 @@ dependencies = [ "rustls", "rustls-pki-types", "url", - "webpki-roots 0.26.1", + "webpki-roots 0.26.11", ] [[package]] @@ -2489,15 +2142,6 @@ dependencies = [ "winapi-util", ] -[[package]] -name = "want" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bfa7760aed19e106de2c7c0b581b509f2f25d3dacaf737cb82ac61bc6d760b0e" -dependencies = [ - "try-lock", -] - [[package]] name = "wasi" version = "0.11.1+wasi-snapshot-preview1" @@ -2510,7 +2154,16 @@ version = "1.0.3+wasi-0.2.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" dependencies = [ - "wit-bindgen", + "wit-bindgen 0.57.1", +] + +[[package]] +name = "wasip3" +version = "0.4.0+wasi-0.3.0-rc-2026-01-06" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" +dependencies = [ + "wit-bindgen 0.51.0", ] [[package]] @@ -2526,16 +2179,6 @@ dependencies = [ "wasm-bindgen-shared", ] -[[package]] -name = "wasm-bindgen-futures" -version = "0.4.71" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96492d0d3ffba25305a7dc88720d250b1401d7edca02cc3bcd50633b424673b8" -dependencies = [ - "js-sys", - "wasm-bindgen", -] - [[package]] name = "wasm-bindgen-macro" version = "0.2.121" @@ -2569,26 +2212,37 @@ dependencies = [ ] [[package]] -name = "wasm-streams" -version = "0.4.2" +name = "wasm-encoder" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "15053d8d85c7eccdbefef60f06769760a563c7f0a9d6902a13d35c7800b0ad65" +checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" dependencies = [ - "futures-util", - "js-sys", - "wasm-bindgen", - "wasm-bindgen-futures", - "web-sys", + "leb128fmt", + "wasmparser", ] [[package]] -name = "web-sys" -version = "0.3.98" +name = "wasm-metadata" +version = "0.244.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4b572dff8bcf38bad0fa19729c89bb5748b2b9b1d8be70cf90df697e3a8f32aa" +checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" dependencies = [ - "js-sys", - "wasm-bindgen", + "anyhow", + "indexmap", + "wasm-encoder", + "wasmparser", +] + +[[package]] +name = "wasmparser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" +dependencies = [ + "bitflags", + "hashbrown 0.15.5", + "indexmap", + "semver", ] [[package]] @@ -2603,11 +2257,11 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.1" +version = "0.26.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" +checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" dependencies = [ - "rustls-pki-types", + "webpki-roots 1.0.7", ] [[package]] @@ -2641,7 +2295,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.52.0", + "windows-sys 0.61.2", ] [[package]] @@ -2815,19 +2469,113 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.6.26" +version = "0.7.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28" +checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" dependencies = [ "memchr", ] +[[package]] +name = "wit-bindgen" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" +dependencies = [ + "wit-bindgen-rust-macro", +] + [[package]] name = "wit-bindgen" version = "0.57.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" +[[package]] +name = "wit-bindgen-core" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" +dependencies = [ + "anyhow", + "heck", + "wit-parser", +] + +[[package]] +name = "wit-bindgen-rust" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" +dependencies = [ + "anyhow", + "heck", + "indexmap", + "prettyplease", + "syn", + "wasm-metadata", + "wit-bindgen-core", + "wit-component", +] + +[[package]] +name = "wit-bindgen-rust-macro" +version = "0.51.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" +dependencies = [ + "anyhow", + "prettyplease", + "proc-macro2", + "quote", + "syn", + "wit-bindgen-core", + "wit-bindgen-rust", +] + +[[package]] +name = "wit-component" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" +dependencies = [ + "anyhow", + "bitflags", + "indexmap", + "log", + "serde", + "serde_derive", + "serde_json", + "wasm-encoder", + "wasm-metadata", + "wasmparser", + "wit-parser", +] + +[[package]] +name = "wit-parser" +version = "0.244.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" +dependencies = [ + "anyhow", + "id-arena", + "indexmap", + "log", + "semver", + "serde", + "serde_derive", + "serde_json", + "unicode-xid", + "wasmparser", +] + +[[package]] +name = "writeable" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" + [[package]] name = "xattr" version = "1.6.1" @@ -2835,7 +2583,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "rustix 1.1.4", + "rustix", ] [[package]] @@ -2850,23 +2598,47 @@ dependencies = [ ] [[package]] -name = "zerocopy" -version = "0.8.48" +name = "yoke" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" +dependencies = [ + "stable_deref_trait", + "yoke-derive", + "zerofrom", +] + +[[package]] +name = "yoke-derive" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" +dependencies = [ + "proc-macro2", + "quote", + "syn", + "synstructure", +] + +[[package]] +name = "zerofrom" +version = "0.1.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eed437bf9d6692032087e337407a86f04cd8d6a16a37199ed57949d415bd68e9" +checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" dependencies = [ - "zerocopy-derive", + "zerofrom-derive", ] [[package]] -name = "zerocopy-derive" -version = "0.8.48" +name = "zerofrom-derive" +version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70e3cd084b1788766f53af483dd21f93881ff30d7320490ec3ef7526d203bad4" +checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" dependencies = [ "proc-macro2", "quote", "syn", + "synstructure", ] [[package]] @@ -2875,6 +2647,39 @@ version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" +[[package]] +name = "zerotrie" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" +dependencies = [ + "displaydoc", + "yoke", + "zerofrom", +] + +[[package]] +name = "zerovec" +version = "0.11.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" +dependencies = [ + "yoke", + "zerofrom", + "zerovec-derive", +] + +[[package]] +name = "zerovec-derive" +version = "0.11.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "zip" version = "6.0.0" diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml index 981c321a..06a10240 100644 --- a/pineappl_cli/Cargo.toml +++ b/pineappl_cli/Cargo.toml @@ -30,7 +30,7 @@ lhapdf.workspace = true lz4_flex = { optional = true, workspace = true } ndarray.workspace = true ndarray-npy = { optional = true, workspace = true } -neopdf = "0.3.2" +neopdf = "0.3.3" pineappl.workspace = true pineappl_applgrid = { optional = true, workspace = true } pineappl_fastnlo = { optional = true, workspace = true } From fb9db40a4cd47e429b3ec3e4cdcc150e686edd51 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Wed, 13 May 2026 20:12:20 +0200 Subject: [PATCH 15/21] Minimize `Cargo.lock` changes --- Cargo.lock | 710 +++++++++-------------------------------------------- 1 file changed, 122 insertions(+), 588 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index db056e95..126ffa67 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -19,16 +19,15 @@ dependencies = [ [[package]] name = "anstream" -version = "1.0.0" +version = "0.6.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" +checksum = "6e2e1ebcb11de5c03c67de28a7df593d32191b44939c482e97702baaaa6ab6a5" dependencies = [ "anstyle", "anstyle-parse", "anstyle-query", "anstyle-wincon", "colorchoice", - "is_terminal_polyfill", "utf8parse", ] @@ -40,31 +39,30 @@ checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" [[package]] name = "anstyle-parse" -version = "1.0.0" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" +checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2" dependencies = [ "utf8parse", ] [[package]] name = "anstyle-query" -version = "1.1.5" +version = "1.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] name = "anstyle-wincon" -version = "3.0.11" +version = "3.0.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7" dependencies = [ "anstyle", - "once_cell_polyfill", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -90,9 +88,9 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50" [[package]] name = "assert_cmd" -version = "2.2.2" +version = "2.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2aa3a22042e45de04255c7bf3626e239f450200fd0493c1e382263544b20aea6" +checksum = "9a686bbee5efb88a82df0621b236e74d925f470e5445d3220a5648b892ec99c9" dependencies = [ "anstyle", "bstr", @@ -141,9 +139,15 @@ dependencies = [ [[package]] name = "bitflags" -version = "2.11.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4512299f36f043ab09a583e57bceb5a5aab7a73db1805848e8fef3c9e8c78b3" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" + +[[package]] +name = "bitflags" +version = "2.11.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" dependencies = [ "serde_core", ] @@ -182,9 +186,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b" [[package]] name = "cc" -version = "1.2.62" +version = "1.2.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1dce859f0832a7d088c4f1119888ab94ef4b5d6795d1ce05afb7fe159d79f98" +checksum = "b7a4d3ec6524d28a329fc53654bbadc9bdd7b0431f5d65f1a56ffb28a1ee5283" dependencies = [ "find-msvc-tools", "shlex", @@ -198,9 +202,9 @@ checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801" [[package]] name = "clap" -version = "4.6.1" +version = "4.5.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ddb117e43bbf7dacf0a4190fef4d345b9bad68dfc649cb349e7d17d28428e51" +checksum = "2797f34da339ce31042b27d23607e051786132987f595b02ba4f6a6dffb7030a" dependencies = [ "clap_builder", "clap_derive", @@ -208,9 +212,9 @@ dependencies = [ [[package]] name = "clap_builder" -version = "4.6.0" +version = "4.5.60" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +checksum = "24a241312cea5059b13574bb9b3861cabf758b879c15190b37b6d6fd63ab6876" dependencies = [ "anstream", "anstyle", @@ -220,9 +224,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.6.1" +version = "4.5.55" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2ce8604710f6733aa641a2b3731eaa1e8b3d9973d5e3565da11800813f997a9" +checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5" dependencies = [ "heck", "proc-macro2", @@ -254,7 +258,7 @@ checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681" dependencies = [ "serde", "termcolor", - "unicode-width 0.2.2", + "unicode-width 0.1.11", ] [[package]] @@ -340,7 +344,7 @@ dependencies = [ "cxxbridge-cmd", "cxxbridge-flags", "cxxbridge-macro", - "foldhash 0.2.0", + "foldhash", "link-cplusplus", ] @@ -460,17 +464,6 @@ dependencies = [ "winapi", ] -[[package]] -name = "displaydoc" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "doc-comment" version = "0.3.4" @@ -523,7 +516,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -534,12 +527,14 @@ checksum = "9f1f227452a390804cdb637b74a86990f2a7d7ba4b7d5693aac9b4dd6defd8d6" [[package]] name = "filetime" -version = "0.2.28" +version = "0.2.23" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d5b2eef6fafbf69f877e55509ce5b11a760690ac9700a2921be067aa6afaef6" +checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd" dependencies = [ "cfg-if", "libc", + "redox_syscall", + "windows-sys 0.52.0", ] [[package]] @@ -564,12 +559,6 @@ version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b09cf3155332e944990140d967ff5eceb70df778b34f77d8075db46e4704e6d8" -[[package]] -name = "foldhash" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" - [[package]] name = "foldhash" version = "0.2.0" @@ -630,19 +619,6 @@ dependencies = [ "wasi", ] -[[package]] -name = "getrandom" -version = "0.4.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0de51e6874e94e7bf76d726fc5d13ba782deca734ff60d5bb2fb2607c7406555" -dependencies = [ - "cfg-if", - "libc", - "r-efi", - "wasip2", - "wasip3", -] - [[package]] name = "git-version" version = "0.3.9" @@ -682,25 +658,16 @@ version = "0.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0bf760ebf69878d9fd8f110c89703d90ce35095324d1f1edcb595c63945ee757" dependencies = [ - "bitflags", + "bitflags 2.11.0", "ignore", "walkdir", ] [[package]] name = "hashbrown" -version = "0.15.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" -dependencies = [ - "foldhash 0.1.5", -] - -[[package]] -name = "hashbrown" -version = "0.17.1" +version = "0.16.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" [[package]] name = "heck" @@ -714,94 +681,6 @@ version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fc0fef456e4baa96da950455cd02c081ca953b141298e41db3fc7e36b1da849c" -[[package]] -name = "icu_collections" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2984d1cd16c883d7935b9e07e44071dca8d917fd52ecc02c04d5fa0b5a3f191c" -dependencies = [ - "displaydoc", - "potential_utf", - "utf8_iter", - "yoke", - "zerofrom", - "zerovec", -] - -[[package]] -name = "icu_locale_core" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92219b62b3e2b4d88ac5119f8904c10f8f61bf7e95b640d25ba3075e6cac2c29" -dependencies = [ - "displaydoc", - "litemap", - "tinystr", - "writeable", - "zerovec", -] - -[[package]] -name = "icu_normalizer" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c56e5ee99d6e3d33bd91c5d85458b6005a22140021cc324cea84dd0e72cff3b4" -dependencies = [ - "icu_collections", - "icu_normalizer_data", - "icu_properties", - "icu_provider", - "smallvec", - "zerovec", -] - -[[package]] -name = "icu_normalizer_data" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da3be0ae77ea334f4da67c12f149704f19f81d1adf7c51cf482943e84a2bad38" - -[[package]] -name = "icu_properties" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bee3b67d0ea5c2cca5003417989af8996f8604e34fb9ddf96208a033901e70de" -dependencies = [ - "icu_collections", - "icu_locale_core", - "icu_properties_data", - "icu_provider", - "zerotrie", - "zerovec", -] - -[[package]] -name = "icu_properties_data" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e2bbb201e0c04f7b4b3e14382af113e17ba4f63e2c9d2ee626b720cbce54a14" - -[[package]] -name = "icu_provider" -version = "2.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "139c4cf31c8b5f33d7e199446eff9c1e02decfc2f0eec2c8d71f65befa45b421" -dependencies = [ - "displaydoc", - "icu_locale_core", - "writeable", - "yoke", - "zerofrom", - "zerotrie", - "zerovec", -] - -[[package]] -name = "id-arena" -version = "2.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d3067d79b975e8844ca9eb072e16b31c3c1c36928edf9c6789548c524d0d954" - [[package]] name = "idna" version = "1.1.0" @@ -815,13 +694,9 @@ dependencies = [ [[package]] name = "idna_adapter" -version = "1.2.2" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cb68373c0d6620ef8105e855e7745e18b0d00d3bdb07fb532e434244cdb9a714" -dependencies = [ - "icu_normalizer", - "icu_properties", -] +checksum = "cfdf4f5d937a025381f5ab13624b1c5f51414bfe5c9885663226eae8d6d39560" [[package]] name = "ignore" @@ -841,14 +716,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "2.14.0" +version = "2.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d466e9454f08e4a911e14806c24e16fba1b4c121d1ea474396f396069cf949d9" +checksum = "45a8a2b9cb3e0b0c1803dbb0758ffac5de2f425b23c28f518faabd9d805342ff" dependencies = [ "equivalent", - "hashbrown 0.17.1", - "serde", - "serde_core", + "hashbrown", ] [[package]] @@ -872,15 +745,9 @@ checksum = "3640c1c38b8e4e43584d8df18be5fc6b0aa314ce6ebf51b53313d4306cca8e46" dependencies = [ "hermit-abi", "libc", - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] -[[package]] -name = "is_terminal_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" - [[package]] name = "itertools" version = "0.13.0" @@ -923,23 +790,17 @@ version = "1.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe" -[[package]] -name = "leb128fmt" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "09edd9e8b54e49e587e4f6295a7d29c3ea94d469cb40ab8ca70b288248a81db2" - [[package]] name = "libc" -version = "0.2.186" +version = "0.2.184" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "68ab91017fe16c622486840e4c83c9a37afeff978bd239b5293d61ece587de66" +checksum = "48f5d2a454e16a5ea0f4ced81bd44e4cfc7bd3a507b61887c99fd3538b28e4af" [[package]] name = "libredox" -version = "0.1.16" +version = "0.1.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02f3bb43d335493c96bf3fd3a321600bf6bd07ed34bc64118e9293bdffea46c" +checksum = "7ddbf48fd451246b1f8c2610bd3b4ac0cc6e149d89832867093ab69a17194f08" dependencies = [ "libc", ] @@ -955,15 +816,15 @@ dependencies = [ [[package]] name = "linux-raw-sys" -version = "0.12.1" +version = "0.4.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" +checksum = "d26c52dbd32dccf2d10cac7725f8eae5296885fb5703b261f7d0a0739ec807ab" [[package]] -name = "litemap" -version = "0.8.2" +name = "linux-raw-sys" +version = "0.12.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "92daf443525c4cce67b150400bc2316076100ce0b3686209eb8cf3c31612e6f0" +checksum = "32a66949e030da00e8c7d4434b251670a91556f4144941d37452769c25d58a53" [[package]] name = "log" @@ -982,9 +843,9 @@ dependencies = [ [[package]] name = "lz4_flex" -version = "0.13.1" +version = "0.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef0d4ed8669f8f8826eb00dc878084aa8f253506c4fd5e8f58f5bce72ddb97e" +checksum = "db9a0d582c2874f68138a16ce1867e0ffde6c0bb0a0df85e1f36d04146db488a" dependencies = [ "twox-hash", ] @@ -1207,12 +1068,6 @@ version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" -[[package]] -name = "once_cell_polyfill" -version = "1.70.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" - [[package]] name = "option-ext" version = "0.2.0" @@ -1281,12 +1136,12 @@ dependencies = [ "anyhow", "arrayvec", "bincode", - "bitflags", + "bitflags 2.11.0", "enum_dispatch", "float-cmp", "git-version", "itertools 0.14.0", - "lz4_flex 0.13.1", + "lz4_flex 0.13.0", "managed-lhapdf", "ndarray 0.17.2", "num-complex", @@ -1335,7 +1190,7 @@ dependencies = [ "float-cmp", "git-version", "itertools 0.14.0", - "lz4_flex 0.13.1", + "lz4_flex 0.13.0", "managed-lhapdf", "ndarray 0.17.2", "ndarray-npy", @@ -1385,9 +1240,9 @@ dependencies = [ [[package]] name = "pkg-config" -version = "0.3.33" +version = "0.3.32" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19f132c84eca552bf34cab8ec81f1c1dcc229b811638f9d283dceabe58c5569e" +checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c" [[package]] name = "portable-atomic" @@ -1397,22 +1252,13 @@ checksum = "c33a9471896f1c69cecef8d20cbe2f7accd12527ce60845ff44c153bb2a21b49" [[package]] name = "portable-atomic-util" -version = "0.2.7" +version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2a106d1259c23fac8e543272398ae0e3c0b8d33c88ed73d0cc71b0f1d902618" +checksum = "091397be61a01d4be58e7841595bd4bfedb15f1cd54977d79b8271e94ed799a3" dependencies = [ "portable-atomic", ] -[[package]] -name = "potential_utf" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0103b1cef7ec0cf76490e969665504990193874ea05c85ff9bab8b911d0a0564" -dependencies = [ - "zerovec", -] - [[package]] name = "predicates" version = "3.1.4" @@ -1440,16 +1286,6 @@ dependencies = [ "termtree", ] -[[package]] -name = "prettyplease" -version = "0.2.37" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "479ca8adacdd7ce8f1fb39ce9ecccbfe93a3f1344b3d0d97f20bc0196208f62b" -dependencies = [ - "proc-macro2", - "syn", -] - [[package]] name = "prettytable-rs" version = "0.10.0" @@ -1460,7 +1296,7 @@ dependencies = [ "is-terminal", "lazy_static", "term", - "unicode-width 0.1.14", + "unicode-width 0.1.11", ] [[package]] @@ -1552,12 +1388,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "r-efi" -version = "6.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8dcc9c7d52a811697d2151c701e0d08956f92b0e24136cf4cf27b57a6a0d9bf" - [[package]] name = "rand" version = "0.10.1" @@ -1569,15 +1399,15 @@ dependencies = [ [[package]] name = "rand_core" -version = "0.10.1" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "63b8176103e19a2643978565ca18b50549f6101881c443590420e4dc998a3c69" +checksum = "0c8d0fd677905edcbeedbf2edb6494d676f0e98d54d5cf9bda0b061cb8fb8aba" [[package]] name = "rand_pcg" -version = "0.10.2" +version = "0.10.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "caa0f4137e1c0a72f4c651489402276c8e8e1cf081f3b0ba156d2cbeef09e86a" +checksum = "2a36dd10a879f5c16e363eed24471b321b114ce3112c2d5d8df06545fcf48152" dependencies = [ "rand_core", ] @@ -1590,9 +1420,9 @@ checksum = "60a357793950651c4ed0f3f52338f53b2f809f32d83a07f72909fa13e4c6c1e3" [[package]] name = "rayon" -version = "1.12.0" +version = "1.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fb39b166781f92d482534ef4b4b1b2568f42613b53e5b6c160e24cfbfa30926d" +checksum = "368f01d005bf8fd9b1206fb6fa653e6c4a81ceb1466406b81792d87c5677a58f" dependencies = [ "either", "rayon-core", @@ -1608,13 +1438,22 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "redox_syscall" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa" +dependencies = [ + "bitflags 1.3.2", +] + [[package]] name = "redox_users" version = "0.4.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ - "getrandom 0.2.17", + "getrandom", "libredox", "thiserror", ] @@ -1656,7 +1495,7 @@ checksum = "a4689e6c2294d81e88dc6261c768b63bc4fcdb852be6d1352498b114f61383b7" dependencies = [ "cc", "cfg-if", - "getrandom 0.2.17", + "getrandom", "libc", "untrusted", "windows-sys 0.52.0", @@ -1674,24 +1513,37 @@ version = "2.1.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "94300abf3f1ae2e2b8ffb7b58043de3d399c73fa6f4b73826402a5c457614dbe" +[[package]] +name = "rustix" +version = "0.38.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fdb5bc1ae2baa591800df16c9ca78619bf65c0488b41b96ccec5d11220d8c154" +dependencies = [ + "bitflags 2.11.0", + "errno", + "libc", + "linux-raw-sys 0.4.15", + "windows-sys 0.52.0", +] + [[package]] name = "rustix" version = "1.1.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6fe4565b9518b83ef4f91bb47ce29620ca828bd32cb7e408f0062e9930ba190" dependencies = [ - "bitflags", + "bitflags 2.11.0", "errno", "libc", - "linux-raw-sys", - "windows-sys 0.61.2", + "linux-raw-sys 0.12.1", + "windows-sys 0.52.0", ] [[package]] name = "rustls" -version = "0.23.40" +version = "0.23.37" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ef86cd5876211988985292b91c96a8f2d298df24e75989a43a3c73f2d4d8168b" +checksum = "758025cb5fccfd3bc2fd74708fd4682be41d99e5dff73c377c0646c6012c73a4" dependencies = [ "log", "once_cell", @@ -1704,9 +1556,9 @@ dependencies = [ [[package]] name = "rustls-pki-types" -version = "1.14.1" +version = "1.14.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "30a7197ae7eb376e574fe940d068c30fe0462554a3ddbe4eca7838e049c937a9" +checksum = "be040f8b0a225e40375822a563fa9524378b9d63112f53e19ffff34df5d33fdd" dependencies = [ "zeroize", ] @@ -1749,12 +1601,6 @@ version = "1.0.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2" -[[package]] -name = "semver" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a7852d02fc848982e0c167ef163aaff9cd91dc640ba85e263cb1ce46fae51cd" - [[package]] name = "serde" version = "1.0.228" @@ -1785,19 +1631,6 @@ dependencies = [ "syn", ] -[[package]] -name = "serde_json" -version = "1.0.149" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "83fc039473c5595ace860d8c4fafa220ff474b3fc6bfdb4293327f1a37e94d86" -dependencies = [ - "itoa", - "memchr", - "serde", - "serde_core", - "zmij", -] - [[package]] name = "serde_spanned" version = "0.6.9" @@ -1809,9 +1642,9 @@ dependencies = [ [[package]] name = "serde_yaml" -version = "0.9.34+deprecated" +version = "0.9.33" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a8b1a1a2ebf674015cc02edccce75287f1a0130d394307b36743c2f5d504b47" +checksum = "a0623d197252096520c6f2a5e1171ee436e5af99a5d7caa2891e55e61950e6d9" dependencies = [ "indexmap", "itoa", @@ -1855,12 +1688,6 @@ version = "1.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03" -[[package]] -name = "stable_deref_trait" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596" - [[package]] name = "strsim" version = "0.11.1" @@ -1884,17 +1711,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "synstructure" -version = "0.13.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "728a70f3dbaf5bab7f0c4b1ac8d7ae5ea60a4b5549c8a5914361c99147a709d2" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "tar" version = "0.4.45" @@ -1914,15 +1730,15 @@ checksum = "adb6935a6f5c20170eeceb1a3835a49e12e19d792f6dd344ccc76a985ca5a6ca" [[package]] name = "tempfile" -version = "3.27.0" +version = "3.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32497e9a4c7b38532efcdebeef879707aa9f794296a4f0244f6f69e9bc8574bd" +checksum = "b8fcd239983515c23a32fb82099f97d0b11b8c72f654ed659363a95c3dad7a53" dependencies = [ + "cfg-if", "fastrand", - "getrandom 0.4.2", "once_cell", - "rustix", - "windows-sys 0.61.2", + "rustix 0.38.44", + "windows-sys 0.52.0", ] [[package]] @@ -1971,21 +1787,11 @@ dependencies = [ "syn", ] -[[package]] -name = "tinystr" -version = "0.8.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c8323304221c2a851516f22236c5722a72eaa19749016521d6dff0824447d96d" -dependencies = [ - "displaydoc", - "zerovec", -] - [[package]] name = "toml" -version = "0.8.23" +version = "0.8.12" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dc1beb996b9d83529a9e75c17a1686767d148d70663143c7854d8b4a09ced362" +checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3" dependencies = [ "serde", "serde_spanned", @@ -2004,24 +1810,17 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.22.27" +version = "0.22.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "41fe8c660ae4257887cf66394862d21dbca4a6ddd26f04a3560410406a2f819a" +checksum = "8e40bb779c5187258fd7aad0eb68cb8706a0a81fa712fbea808ab43c4b8374c4" dependencies = [ "indexmap", "serde", "serde_spanned", "toml_datetime", - "toml_write", "winnow", ] -[[package]] -name = "toml_write" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5d99f8c9a7727884afe522e9bd5edbfc91a3312b36a77b5fb8926e4c31a41801" - [[package]] name = "twox-hash" version = "2.1.2" @@ -2030,9 +1829,9 @@ checksum = "9ea3136b675547379c4bd395ca6b938e5ad3c3d20fad76e7fe85f9e0d011419c" [[package]] name = "typenum" -version = "1.20.0" +version = "1.19.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "40ce102ab67701b8526c123c1bab5cbe42d7040ccfd0f64af1a385808d2f43de" +checksum = "562d481066bde0658276a35467c4af00bdc6ee726305698a55b86e61d7ad82bb" [[package]] name = "ucd-trie" @@ -2048,9 +1847,9 @@ checksum = "e6e4313cd5fcd3dad5cafa179702e2b244f760991f45397d14d4ebf38247da75" [[package]] name = "unicode-width" -version = "0.1.14" +version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85" [[package]] name = "unicode-width" @@ -2058,12 +1857,6 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" -[[package]] -name = "unicode-xid" -version = "0.2.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" - [[package]] name = "unsafe-libyaml" version = "0.2.11" @@ -2089,7 +1882,7 @@ dependencies = [ "rustls", "rustls-pki-types", "url", - "webpki-roots 0.26.11", + "webpki-roots", ] [[package]] @@ -2148,24 +1941,6 @@ version = "0.11.1+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" -[[package]] -name = "wasip2" -version = "1.0.3+wasi-0.2.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "20064672db26d7cdc89c7798c48a0fdfac8213434a1186e5ef29fd560ae223d6" -dependencies = [ - "wit-bindgen 0.57.1", -] - -[[package]] -name = "wasip3" -version = "0.4.0+wasi-0.3.0-rc-2026-01-06" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5428f8bf88ea5ddc08faddef2ac4a67e390b88186c703ce6dbd955e1c145aca5" -dependencies = [ - "wit-bindgen 0.51.0", -] - [[package]] name = "wasm-bindgen" version = "0.2.121" @@ -2211,40 +1986,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "wasm-encoder" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "990065f2fe63003fe337b932cfb5e3b80e0b4d0f5ff650e6985b1048f62c8319" -dependencies = [ - "leb128fmt", - "wasmparser", -] - -[[package]] -name = "wasm-metadata" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bb0e353e6a2fbdc176932bbaab493762eb1255a7900fe0fea1a2f96c296cc909" -dependencies = [ - "anyhow", - "indexmap", - "wasm-encoder", - "wasmparser", -] - -[[package]] -name = "wasmparser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47b807c72e1bac69382b3a6fb3dbe8ea4c0ed87ff5629b8685ae6b9a611028fe" -dependencies = [ - "bitflags", - "hashbrown 0.15.5", - "indexmap", - "semver", -] - [[package]] name = "web-time" version = "1.1.0" @@ -2257,18 +1998,9 @@ dependencies = [ [[package]] name = "webpki-roots" -version = "0.26.11" +version = "0.26.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9" -dependencies = [ - "webpki-roots 1.0.7", -] - -[[package]] -name = "webpki-roots" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52f5ee44c96cf55f1b349600768e3ece3a8f26010c05265ab73f945bb1a2eb9d" +checksum = "b3de34ae270483955a94f4b21bdaaeb83d508bb84a01435f393818edb0012009" dependencies = [ "rustls-pki-types", ] @@ -2295,7 +2027,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.61.2", + "windows-sys 0.52.0", ] [[package]] @@ -2304,12 +2036,6 @@ version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" -[[package]] -name = "windows-link" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" - [[package]] name = "windows-sys" version = "0.48.0" @@ -2337,15 +2063,6 @@ dependencies = [ "windows-targets 0.52.6", ] -[[package]] -name = "windows-sys" -version = "0.61.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ae137229bcbd6cdf0f7b80a31df61766145077ddf49416a728b02cb3921ff3fc" -dependencies = [ - "windows-link", -] - [[package]] name = "windows-targets" version = "0.48.5" @@ -2469,113 +2186,13 @@ checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" [[package]] name = "winnow" -version = "0.7.15" +version = "0.6.26" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" +checksum = "1e90edd2ac1aa278a5c4599b1d89cf03074b610800f866d4026dc199d7929a28" dependencies = [ "memchr", ] -[[package]] -name = "wit-bindgen" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5" -dependencies = [ - "wit-bindgen-rust-macro", -] - -[[package]] -name = "wit-bindgen" -version = "0.57.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ebf944e87a7c253233ad6766e082e3cd714b5d03812acc24c318f549614536e" - -[[package]] -name = "wit-bindgen-core" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ea61de684c3ea68cb082b7a88508a8b27fcc8b797d738bfc99a82facf1d752dc" -dependencies = [ - "anyhow", - "heck", - "wit-parser", -] - -[[package]] -name = "wit-bindgen-rust" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7c566e0f4b284dd6561c786d9cb0142da491f46a9fbed79ea69cdad5db17f21" -dependencies = [ - "anyhow", - "heck", - "indexmap", - "prettyplease", - "syn", - "wasm-metadata", - "wit-bindgen-core", - "wit-component", -] - -[[package]] -name = "wit-bindgen-rust-macro" -version = "0.51.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0c0f9bfd77e6a48eccf51359e3ae77140a7f50b1e2ebfe62422d8afdaffab17a" -dependencies = [ - "anyhow", - "prettyplease", - "proc-macro2", - "quote", - "syn", - "wit-bindgen-core", - "wit-bindgen-rust", -] - -[[package]] -name = "wit-component" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9d66ea20e9553b30172b5e831994e35fbde2d165325bec84fc43dbf6f4eb9cb2" -dependencies = [ - "anyhow", - "bitflags", - "indexmap", - "log", - "serde", - "serde_derive", - "serde_json", - "wasm-encoder", - "wasm-metadata", - "wasmparser", - "wit-parser", -] - -[[package]] -name = "wit-parser" -version = "0.244.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ecc8ac4bc1dc3381b7f59c34f00b67e18f910c2c0f50015669dde7def656a736" -dependencies = [ - "anyhow", - "id-arena", - "indexmap", - "log", - "semver", - "serde", - "serde_derive", - "serde_json", - "unicode-xid", - "wasmparser", -] - -[[package]] -name = "writeable" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4" - [[package]] name = "xattr" version = "1.6.1" @@ -2583,7 +2200,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32e45ad4206f6d2479085147f02bc2ef834ac85886624a23575ae137c8aa8156" dependencies = [ "libc", - "rustix", + "rustix 1.1.4", ] [[package]] @@ -2597,89 +2214,12 @@ dependencies = [ "pineappl_cli", ] -[[package]] -name = "yoke" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "abe8c5fda708d9ca3df187cae8bfb9ceda00dd96231bed36e445a1a48e66f9ca" -dependencies = [ - "stable_deref_trait", - "yoke-derive", - "zerofrom", -] - -[[package]] -name = "yoke-derive" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de844c262c8848816172cef550288e7dc6c7b7814b4ee56b3e1553f275f1858e" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - -[[package]] -name = "zerofrom" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ec05a11813ea801ff6d75110ad09cd0824ddba17dfe17128ea0d5f68e6c5272" -dependencies = [ - "zerofrom-derive", -] - -[[package]] -name = "zerofrom-derive" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11532158c46691caf0f2593ea8358fed6bbf68a0315e80aae9bd41fbade684a1" -dependencies = [ - "proc-macro2", - "quote", - "syn", - "synstructure", -] - [[package]] name = "zeroize" version = "1.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0" -[[package]] -name = "zerotrie" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f9152d31db0792fa83f70fb2f83148effb5c1f5b8c7686c3459e361d9bc20bf" -dependencies = [ - "displaydoc", - "yoke", - "zerofrom", -] - -[[package]] -name = "zerovec" -version = "0.11.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90f911cbc359ab6af17377d242225f4d75119aec87ea711a880987b18cd7b239" -dependencies = [ - "yoke", - "zerofrom", - "zerovec-derive", -] - -[[package]] -name = "zerovec-derive" -version = "0.11.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "625dc425cab0dca6dc3c3319506e6593dcb08a9f387ea3b284dbd52a92c40555" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "zip" version = "6.0.0" @@ -2691,9 +2231,3 @@ dependencies = [ "indexmap", "memchr", ] - -[[package]] -name = "zmij" -version = "1.0.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b8848ee67ecc8aedbaf3e4122217aff892639231befc6a1b58d29fff4c2cabaa" From 7b8547962b27af30ec68fc8a634351c89534cdf8 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Wed, 13 May 2026 20:28:32 +0200 Subject: [PATCH 16/21] Move `neopdf` dependency to workspace --- Cargo.toml | 1 + pineappl_cli/Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/Cargo.toml b/Cargo.toml index 3eaed0d9..f5498dbc 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -40,6 +40,7 @@ lhapdf = { package = "managed-lhapdf", version = "0.4.1" } lz4_flex = "0.13.0" ndarray = { version = "0.17.2" } ndarray-npy = { default-features = false, features = ["npz"], version = "0.10.0" } +neopdf = "0.3.3" num-complex = "0.4.4" numpy = "0.28.0" pkg-config = "0.3.26" diff --git a/pineappl_cli/Cargo.toml b/pineappl_cli/Cargo.toml index 06a10240..854cca95 100644 --- a/pineappl_cli/Cargo.toml +++ b/pineappl_cli/Cargo.toml @@ -30,7 +30,7 @@ lhapdf.workspace = true lz4_flex = { optional = true, workspace = true } ndarray.workspace = true ndarray-npy = { optional = true, workspace = true } -neopdf = "0.3.3" +neopdf.workspace = true pineappl.workspace = true pineappl_applgrid = { optional = true, workspace = true } pineappl_fastnlo = { optional = true, workspace = true } From 13597b897385bd2d27149ccc469ca4d5a9793369 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 14 May 2026 08:58:55 +0200 Subject: [PATCH 17/21] Downgrade `itertools` to avoid crate duplication --- Cargo.lock | 23 +++++++---------------- Cargo.toml | 2 +- 2 files changed, 8 insertions(+), 17 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 126ffa67..cb5b4fca 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -757,15 +757,6 @@ dependencies = [ "either", ] -[[package]] -name = "itertools" -version = "0.14.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2b192c782037fadd9cfa75548310488aabdbf3d2da73885b31bd0abd03351285" -dependencies = [ - "either", -] - [[package]] name = "itoa" version = "1.0.18" @@ -951,7 +942,7 @@ dependencies = [ "flate2", "git-version", "indicatif", - "itertools 0.13.0", + "itertools", "lz4_flex 0.11.6", "ndarray 0.16.1", "neopdf_legacy", @@ -976,7 +967,7 @@ dependencies = [ "flate2", "git-version", "indicatif", - "itertools 0.13.0", + "itertools", "lz4_flex 0.11.6", "ndarray 0.16.1", "ninterp", @@ -997,7 +988,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "2b9a8917fb3e2ae0574a15c14f29d1855cb53f483edfde819bc218238830ca11" dependencies = [ "dyn-clone", - "itertools 0.13.0", + "itertools", "ndarray 0.16.1", "num-traits", "thiserror", @@ -1140,7 +1131,7 @@ dependencies = [ "enum_dispatch", "float-cmp", "git-version", - "itertools 0.14.0", + "itertools", "lz4_flex 0.13.0", "managed-lhapdf", "ndarray 0.17.2", @@ -1169,7 +1160,7 @@ dependencies = [ name = "pineappl_capi" version = "1.4.0" dependencies = [ - "itertools 0.14.0", + "itertools", "ndarray 0.17.2", "pineappl", ] @@ -1189,7 +1180,7 @@ dependencies = [ "flate2", "float-cmp", "git-version", - "itertools 0.14.0", + "itertools", "lz4_flex 0.13.0", "managed-lhapdf", "ndarray 0.17.2", @@ -1220,7 +1211,7 @@ dependencies = [ name = "pineappl_py" version = "1.4.0" dependencies = [ - "itertools 0.14.0", + "itertools", "ndarray 0.17.2", "numpy", "pineappl", diff --git a/Cargo.toml b/Cargo.toml index f5498dbc..3ffe8a1e 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -35,7 +35,7 @@ enum_dispatch = "0.3.7" flate2 = "1.0.22" float-cmp = { default-features = false, version = "0.10.0" } git-version = "0.3.5" -itertools = "0.14.0" +itertools = "0.13.0" lhapdf = { package = "managed-lhapdf", version = "0.4.1" } lz4_flex = "0.13.0" ndarray = { version = "0.17.2" } From fa4c0d54d25cb8559bcd2faac3d644fce79ba30f Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 14 May 2026 10:56:00 +0200 Subject: [PATCH 18/21] Rewrite NeoPDF changelog entry --- CHANGELOG.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index eb9f8d2d..834d6604 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,10 +7,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] -### Changed +### Added -- Isolate PDF interpolation backend, current suppored backends include - LHAPDF and NeoPDF +- added support for the [NeoPDF](https://qcdlab.github.io/neopdf/) library as + an alternative to LHAPDF in the CLI; using `--backend=neopdf` one can use it. ## [1.4.0] - 12/05/2026 From 924874a3a80e9d9a615dfedc3394d3e992aaaac6 Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 14 May 2026 10:58:32 +0200 Subject: [PATCH 19/21] Synchronize error messages --- pineappl_cli/src/pdf_backend.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pineappl_cli/src/pdf_backend.rs b/pineappl_cli/src/pdf_backend.rs index f5050582..60cff11d 100644 --- a/pineappl_cli/src/pdf_backend.rs +++ b/pineappl_cli/src/pdf_backend.rs @@ -421,7 +421,7 @@ pub fn create_pdf_set(name: &str, backend: Backend) -> Result() { lhapdf::lookup_pdf(lhaid) .map(|(set, _)| set) - .ok_or_else(|| anyhow!("no PDF set found for LHAID = {lhaid}"))? + .ok_or_else(|| anyhow!("no convolution function for LHAID = `{lhaid}` found"))? } else { name.to_owned() }; From a788300989f3b477c97c97d08b35254faf8c97ae Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 14 May 2026 10:59:16 +0200 Subject: [PATCH 20/21] Comment out unneeded backend functionality --- pineappl_cli/src/pdf_backend.rs | 168 ++++++++++++++++---------------- 1 file changed, 84 insertions(+), 84 deletions(-) diff --git a/pineappl_cli/src/pdf_backend.rs b/pineappl_cli/src/pdf_backend.rs index 60cff11d..b652315e 100644 --- a/pineappl_cli/src/pdf_backend.rs +++ b/pineappl_cli/src/pdf_backend.rs @@ -5,29 +5,29 @@ //! and provides type-safe access to PDF metadata. use anyhow::{Context, Result, anyhow}; -use std::fmt; +// use std::fmt; use std::str::FromStr; pub use neopdf::uncertainty::CL_1_SIGMA; -/// The type of PDF set (space-like for PDFs, time-like for FFs). -#[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] -pub enum SetType { - /// Space-like PDF (standard parton distribution function). - #[default] - SpaceLike, - /// Time-like PDF (fragmentation function). - TimeLike, -} - -impl fmt::Display for SetType { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match self { - Self::SpaceLike => write!(f, "SpaceLike"), - Self::TimeLike => write!(f, "TimeLike"), - } - } -} +// /// The type of PDF set (space-like for PDFs, time-like for FFs). +// #[derive(Clone, Copy, Debug, Default, PartialEq, Eq)] +// pub enum SetType { +// /// Space-like PDF (standard parton distribution function). +// #[default] +// SpaceLike, +// /// Time-like PDF (fragmentation function). +// TimeLike, +// } + +// impl fmt::Display for SetType { +// fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { +// match self { +// Self::SpaceLike => write!(f, "SpaceLike"), +// Self::TimeLike => write!(f, "TimeLike"), +// } +// } +// } /// Method for handling negative PDF values. #[derive(Clone, Copy, Debug, Default)] @@ -64,14 +64,14 @@ impl FromStr for Backend { } } -impl fmt::Display for Backend { - fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - match self { - Self::Lhapdf => write!(f, "lhapdf"), - Self::Neopdf => write!(f, "neopdf"), - } - } -} +// impl fmt::Display for Backend { +// fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { +// match self { +// Self::Lhapdf => write!(f, "lhapdf"), +// Self::Neopdf => write!(f, "neopdf"), +// } +// } +// } /// Unified PDF backend interface. /// @@ -104,23 +104,23 @@ pub trait PdfBackend: Send { /// Returns the hadron particle ID (PDG code). fn particle_id(&self) -> i32; - /// Returns whether this is a polarized PDF. - fn is_polarized(&self) -> bool; + // /// Returns whether this is a polarized PDF. + // fn is_polarized(&self) -> bool; - /// Returns the PDF set type (space-like or time-like). - fn set_type(&self) -> SetType; + // /// Returns the PDF set type (space-like or time-like). + // fn set_type(&self) -> SetType; /// Sets the method for handling negative PDF values. fn set_force_positive(&mut self, method: ForcePositive); - /// Returns the error type of the PDF set (e.g., "replicas", "hessian"). - fn error_type(&self) -> String; + // /// Returns the error type of the PDF set (e.g., "replicas", "hessian"). + // fn error_type(&self) -> String; } /// Unified PDF set interface for uncertainty calculations. pub trait PdfSetBackend { - /// Returns the number of members in this set. - fn num_members(&self) -> usize; + // /// Returns the number of members in this set. + // fn num_members(&self) -> usize; /// Creates all PDF members in the set. fn mk_pdfs(&self) -> Result>>; @@ -193,25 +193,25 @@ impl PdfBackend for LhapdfPdf { .unwrap_or(2212) } - fn is_polarized(&self) -> bool { - self.pdf - .set() - .entry("Polarized") - .is_some_and(|s| s.eq_ignore_ascii_case("true")) - } - - fn set_type(&self) -> SetType { - self.pdf - .set() - .entry("SetType") - .map_or(SetType::SpaceLike, |s| { - if s.eq_ignore_ascii_case("timelike") { - SetType::TimeLike - } else { - SetType::SpaceLike - } - }) - } + // fn is_polarized(&self) -> bool { + // self.pdf + // .set() + // .entry("Polarized") + // .is_some_and(|s| s.eq_ignore_ascii_case("true")) + // } + + // fn set_type(&self) -> SetType { + // self.pdf + // .set() + // .entry("SetType") + // .map_or(SetType::SpaceLike, |s| { + // if s.eq_ignore_ascii_case("timelike") { + // SetType::TimeLike + // } else { + // SetType::SpaceLike + // } + // }) + // } fn set_force_positive(&mut self, method: ForcePositive) { match method { @@ -220,13 +220,13 @@ impl PdfBackend for LhapdfPdf { } } - fn error_type(&self) -> String { - self.pdf - .set() - .entry("ErrorType") - .map(|s| s.to_owned()) - .unwrap_or_default() - } + // fn error_type(&self) -> String { + // self.pdf + // .set() + // .entry("ErrorType") + // .map(|s| s.to_owned()) + // .unwrap_or_default() + // } } /// LHAPDF set wrapper. @@ -245,12 +245,12 @@ impl LhapdfSet { } impl PdfSetBackend for LhapdfSet { - fn num_members(&self) -> usize { - self.set - .entry("NumMembers") - .and_then(|s| s.parse().ok()) - .unwrap_or(1) - } + // fn num_members(&self) -> usize { + // self.set + // .entry("NumMembers") + // .and_then(|s| s.parse().ok()) + // .unwrap_or(1) + // } fn mk_pdfs(&self) -> Result>> { let pdfs = self.set.mk_pdfs()?; @@ -309,16 +309,16 @@ impl PdfBackend for NeopdfPdf { self.pdf.metadata().hadron_pid } - fn is_polarized(&self) -> bool { - self.pdf.metadata().polarised - } + // fn is_polarized(&self) -> bool { + // self.pdf.metadata().polarised + // } - fn set_type(&self) -> SetType { - match self.pdf.metadata().set_type { - neopdf::metadata::SetType::SpaceLike => SetType::SpaceLike, - neopdf::metadata::SetType::TimeLike => SetType::TimeLike, - } - } + // fn set_type(&self) -> SetType { + // match self.pdf.metadata().set_type { + // neopdf::metadata::SetType::SpaceLike => SetType::SpaceLike, + // neopdf::metadata::SetType::TimeLike => SetType::TimeLike, + // } + // } fn set_force_positive(&mut self, method: ForcePositive) { match method { @@ -333,15 +333,15 @@ impl PdfBackend for NeopdfPdf { } } - fn error_type(&self) -> String { - self.pdf.metadata().error_type.clone() - } + // fn error_type(&self) -> String { + // self.pdf.metadata().error_type.clone() + // } } /// `NeoPDF` set wrapper. pub struct NeopdfSet { pdf_name: String, - num_members: usize, + // num_members: usize, error_type: String, } @@ -354,16 +354,16 @@ impl NeopdfSet { Self { pdf_name: pdf_name.to_owned(), - num_members: metadata.num_members as usize, + // num_members: metadata.num_members as usize, error_type: metadata.error_type.clone(), } } } impl PdfSetBackend for NeopdfSet { - fn num_members(&self) -> usize { - self.num_members - } + // fn num_members(&self) -> usize { + // self.num_members + // } fn mk_pdfs(&self) -> Result>> { let pdfs = neopdf::pdf::PDF::load_pdfs(&self.pdf_name); From a148573128565f6d6c6f0f2f675c7c61de847bfc Mon Sep 17 00:00:00 2001 From: Christopher Schwan Date: Thu, 14 May 2026 11:01:12 +0200 Subject: [PATCH 21/21] Migrate most direct LHAPDF calls to new backend code --- pineappl_cli/src/analyze.rs | 7 +- pineappl_cli/src/channels.rs | 5 +- pineappl_cli/src/diff.rs | 11 +-- pineappl_cli/src/evolve.rs | 15 ++-- pineappl_cli/src/orders.rs | 5 +- pineappl_cli/src/pull.rs | 160 ++++++++++++++++++----------------- 6 files changed, 108 insertions(+), 95 deletions(-) diff --git a/pineappl_cli/src/analyze.rs b/pineappl_cli/src/analyze.rs index 66dda726..b85062f5 100644 --- a/pineappl_cli/src/analyze.rs +++ b/pineappl_cli/src/analyze.rs @@ -64,7 +64,8 @@ pub struct CkfOpts { impl Subcommand for CkfOpts { fn run(&self, cfg: &GlobalConfiguration) -> Result { let grid = helpers::read_grid(&self.input)?; - let mut conv_funs = helpers::create_conv_funs(&self.conv_funs)?; + let mut conv_funs = + helpers::create_conv_funs_with_backend(&self.conv_funs, cfg.pdf_backend)?; let orders_den = if self.orders_den.is_empty() { grid.orders() @@ -84,7 +85,7 @@ impl Subcommand for CkfOpts { .map(|lumi| { let mut lumi_mask = vec![false; grid.channels().len()]; lumi_mask[lumi] = true; - helpers::convolve( + helpers::convolve_with_backend( &grid, &mut conv_funs, &self.conv_funs.conv_types, @@ -101,7 +102,7 @@ impl Subcommand for CkfOpts { .map(|lumi| { let mut lumi_mask = vec![false; grid.channels().len()]; lumi_mask[lumi] = true; - helpers::convolve( + helpers::convolve_with_backend( &grid, &mut conv_funs, &self.conv_funs.conv_types, diff --git a/pineappl_cli/src/channels.rs b/pineappl_cli/src/channels.rs index 991d5db4..292e4ace 100644 --- a/pineappl_cli/src/channels.rs +++ b/pineappl_cli/src/channels.rs @@ -64,7 +64,8 @@ pub struct Opts { impl Subcommand for Opts { fn run(&self, cfg: &GlobalConfiguration) -> Result { let grid = helpers::read_grid(&self.input)?; - let mut conv_funs = helpers::create_conv_funs(&self.conv_funs)?; + let mut conv_funs = + helpers::create_conv_funs_with_backend(&self.conv_funs, cfg.pdf_backend)?; let mut channels: Vec<_> = self.channels.iter().cloned().flatten().collect(); channels.sort_unstable(); @@ -90,7 +91,7 @@ impl Subcommand for Opts { .map(|channel| { let mut channel_mask = vec![false; grid.channels().len()]; channel_mask[channel] = true; - helpers::convolve( + helpers::convolve_with_backend( &grid, &mut conv_funs, &self.conv_funs.conv_types, diff --git a/pineappl_cli/src/diff.rs b/pineappl_cli/src/diff.rs index b64e3945..19a7cc9c 100644 --- a/pineappl_cli/src/diff.rs +++ b/pineappl_cli/src/diff.rs @@ -120,7 +120,8 @@ impl Subcommand for Opts { bail!("channels differ"); } - let mut conv_funs = helpers::create_conv_funs(&self.conv_funs)?; + let mut conv_funs = + helpers::create_conv_funs_with_backend(&self.conv_funs, cfg.pdf_backend)?; let mut table = helpers::create_table(); let mut title = Row::empty(); @@ -140,7 +141,7 @@ impl Subcommand for Opts { table.set_titles(title); - let results1 = helpers::convolve( + let results1 = helpers::convolve_with_backend( &grid1, &mut conv_funs, &self.conv_funs.conv_types, @@ -151,7 +152,7 @@ impl Subcommand for Opts { ConvoluteMode::Normal, cfg, ); - let results2 = helpers::convolve( + let results2 = helpers::convolve_with_backend( &grid2, &mut conv_funs, &self.conv_funs.conv_types, @@ -206,7 +207,7 @@ impl Subcommand for Opts { let order_results1: Vec> = orders .iter() .map(|&order| { - helpers::convolve( + helpers::convolve_with_backend( &grid1, &mut conv_funs, &self.conv_funs.conv_types, @@ -222,7 +223,7 @@ impl Subcommand for Opts { let order_results2: Vec> = orders .iter() .map(|&order| { - helpers::convolve( + helpers::convolve_with_backend( &grid2, &mut conv_funs, &self.conv_funs.conv_types, diff --git a/pineappl_cli/src/evolve.rs b/pineappl_cli/src/evolve.rs index 454c79bf..29ffb2b4 100644 --- a/pineappl_cli/src/evolve.rs +++ b/pineappl_cli/src/evolve.rs @@ -1,8 +1,8 @@ use super::helpers::{self, ConvFuns, ConvoluteMode}; +use super::pdf_backend::PdfBackend; use super::{GlobalConfiguration, Subcommand}; use anyhow::{Result, anyhow}; use clap::{Parser, ValueHint}; -use lhapdf::Pdf; use pineappl::fk_table::FkTable; use pineappl::grid::Grid; use std::path::{Path, PathBuf}; @@ -497,7 +497,7 @@ mod eko { fn evolve_grid( grid: &Grid, ekos: &[&Path], - use_alphas_from: &Pdf, + use_alphas_from: &dyn PdfBackend, orders: &[(u8, u8)], xir: f64, xif: f64, @@ -531,7 +531,7 @@ fn evolve_grid( fn evolve_grid( _: &Grid, _: &[&Path], - _: &Pdf, + _: &dyn PdfBackend, _: &[(u8, u8)], _: f64, _: f64, @@ -590,8 +590,9 @@ impl Subcommand for Opts { use prettytable::row; let grid = helpers::read_grid(&self.input)?; - let mut conv_funs = helpers::create_conv_funs(&self.conv_funs)?; - let results = helpers::convolve_scales( + let mut conv_funs = + helpers::create_conv_funs_with_backend(&self.conv_funs, cfg.pdf_backend)?; + let results = helpers::convolve_scales_with_backend( &grid, &mut conv_funs, &self.conv_funs.conv_types, @@ -607,14 +608,14 @@ impl Subcommand for Opts { let fk_table = evolve_grid( &grid, &eko_paths, - &conv_funs[cfg.use_alphas_from], + &*conv_funs[cfg.use_alphas_from], &self.orders, self.xir, self.xif, self.xia, )?; - let evolved_results = helpers::convolve_scales( + let evolved_results = helpers::convolve_scales_with_backend( fk_table.grid(), &mut conv_funs, &self.conv_funs.conv_types, diff --git a/pineappl_cli/src/orders.rs b/pineappl_cli/src/orders.rs index 7000d738..efc42a87 100644 --- a/pineappl_cli/src/orders.rs +++ b/pineappl_cli/src/orders.rs @@ -41,7 +41,8 @@ pub struct Opts { impl Subcommand for Opts { fn run(&self, cfg: &GlobalConfiguration) -> Result { let grid = helpers::read_grid(&self.input)?; - let mut conv_funs = helpers::create_conv_funs(&self.conv_funs)?; + let mut conv_funs = + helpers::create_conv_funs_with_backend(&self.conv_funs, cfg.pdf_backend)?; let mut orders: Vec<_> = grid .orders() @@ -63,7 +64,7 @@ impl Subcommand for Opts { let results: Vec> = orders .iter() .map(|order| { - helpers::convolve( + helpers::convolve_with_backend( &grid, &mut conv_funs, &self.conv_funs.conv_types, diff --git a/pineappl_cli/src/pull.rs b/pineappl_cli/src/pull.rs index 0b40586d..6dd7e959 100644 --- a/pineappl_cli/src/pull.rs +++ b/pineappl_cli/src/pull.rs @@ -1,8 +1,8 @@ use super::helpers::{self, ConvFuns, ConvoluteMode}; +use super::pdf_backend::{PdfBackend, PdfSetBackend}; use super::{GlobalConfiguration, Subcommand}; use anyhow::{Error, Result}; use clap::{Parser, ValueHint}; -use lhapdf::{Pdf, PdfSet}; use prettytable::{Row, cell}; use rayon::{ThreadPoolBuilder, prelude::*}; use std::num::NonZeroUsize; @@ -52,10 +52,16 @@ impl Subcommand for Opts { fn run(&self, cfg: &GlobalConfiguration) -> Result { let grid = helpers::read_grid(&self.input)?; - let (set1, mut conv_funs1) = - helpers::create_conv_funs_for_set(&self.conv_funs1, self.pull_from)?; - let (set2, mut conv_funs2) = - helpers::create_conv_funs_for_set(&self.conv_funs2, self.pull_from)?; + let (set1, mut conv_funs1) = helpers::create_conv_funs_for_set_with_backend( + &self.conv_funs1, + self.pull_from, + cfg.pdf_backend, + )?; + let (set2, mut conv_funs2) = helpers::create_conv_funs_for_set_with_backend( + &self.conv_funs2, + self.pull_from, + cfg.pdf_backend, + )?; ThreadPoolBuilder::new() .num_threads(self.threads) @@ -67,7 +73,7 @@ impl Subcommand for Opts { let results1: Vec<_> = conv_funs1 .par_iter_mut() .map(|funs| { - Ok::<_, Error>(helpers::convolve( + Ok::<_, Error>(helpers::convolve_with_backend( &grid, funs, &self.conv_funs1.conv_types, @@ -86,7 +92,7 @@ impl Subcommand for Opts { let results2: Vec<_> = conv_funs2 .par_iter_mut() .map(|funs| { - Ok::<_, Error>(helpers::convolve( + Ok::<_, Error>(helpers::convolve_with_backend( &grid, funs, &self.conv_funs2.conv_types, @@ -141,79 +147,81 @@ impl Subcommand for Opts { (diff / unc1.hypot(unc2), unc1, unc2) }; - let channel_results = - |conv_funs: &ConvFuns, pdfset: &mut [Vec], set: &PdfSet| -> Vec { - if let Some(member) = conv_funs.members[self.pull_from] { - (0..grid.channels().len()) - .map(|channel| { - let mut channel_mask = vec![false; grid.channels().len()]; - channel_mask[channel] = true; - match helpers::convolve( - &grid, - &mut pdfset[member], - &conv_funs.conv_types, - &self.orders, - &[bin], - &channel_mask, - 1, - ConvoluteMode::Normal, - cfg, - ) - .as_slice() - { - [value] => *value, - _ => unreachable!(), - } - }) - .collect() - } else { - let results: Vec<_> = pdfset - .iter_mut() - .flat_map(|fun| { - (0..grid.channels().len()) - .map(|channel| { - let mut channel_mask = vec![false; grid.channels().len()]; - channel_mask[channel] = true; - match helpers::convolve( - &grid, - fun, - &conv_funs.conv_types, - &self.orders, - &[bin], - &channel_mask, - 1, - ConvoluteMode::Normal, - cfg, - ) - .as_slice() - { - [value] => *value, - _ => unreachable!(), - } - }) - .collect::>() - }) - .collect(); - - (0..grid.channels().len()) - .map(|channel| { - let central: Vec<_> = results - .iter() - .skip(channel) - .step_by(grid.channels().len()) - .copied() - .collect(); - set.uncertainty(¢ral, self.cl, false).unwrap().central - }) - .collect() - } - }; + let channel_results = |conv_funs: &ConvFuns, + pdfset: &mut [Vec>], + set: &dyn PdfSetBackend| + -> Vec { + if let Some(member) = conv_funs.members[self.pull_from] { + (0..grid.channels().len()) + .map(|channel| { + let mut channel_mask = vec![false; grid.channels().len()]; + channel_mask[channel] = true; + match helpers::convolve_with_backend( + &grid, + &mut pdfset[member], + &conv_funs.conv_types, + &self.orders, + &[bin], + &channel_mask, + 1, + ConvoluteMode::Normal, + cfg, + ) + .as_slice() + { + [value] => *value, + _ => unreachable!(), + } + }) + .collect() + } else { + let results: Vec<_> = pdfset + .iter_mut() + .flat_map(|fun| { + (0..grid.channels().len()) + .map(|channel| { + let mut channel_mask = vec![false; grid.channels().len()]; + channel_mask[channel] = true; + match helpers::convolve_with_backend( + &grid, + fun, + &conv_funs.conv_types, + &self.orders, + &[bin], + &channel_mask, + 1, + ConvoluteMode::Normal, + cfg, + ) + .as_slice() + { + [value] => *value, + _ => unreachable!(), + } + }) + .collect::>() + }) + .collect(); + + (0..grid.channels().len()) + .map(|channel| { + let central: Vec<_> = results + .iter() + .skip(channel) + .step_by(grid.channels().len()) + .copied() + .collect(); + set.uncertainty(¢ral, self.cl, false).unwrap().central + }) + .collect() + } + }; let mut pull_tuples = if self.limit == 0 { Vec::new() } else { - let channel_results1 = channel_results(&self.conv_funs1, &mut conv_funs1, &set1); - let channel_results2 = channel_results(&self.conv_funs2, &mut conv_funs2, &set2); + let channel_results1 = channel_results(&self.conv_funs1, &mut conv_funs1, &*set1); + let channel_results2 = channel_results(&self.conv_funs2, &mut conv_funs2, &*set2); let pull_tuples: Vec<_> = channel_results2 .iter()