Skip to content

Commit 7da5396

Browse files
Bump ndarray version to 0.16.1
1 parent 16145b6 commit 7da5396

6 files changed

Lines changed: 56 additions & 21 deletions

File tree

Cargo.lock

Lines changed: 50 additions & 15 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pineappl/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ float-cmp = { default-features = false, version = "0.9.0" }
2525
git-version = "0.3.5"
2626
itertools = "0.10.1"
2727
lz4_flex = "0.9.2"
28-
ndarray = { features = ["serde"], version = "0.15.4" }
28+
ndarray = { features = ["serde"], version = "0.16.1" }
2929
# TODO: opt out of default features in this crate to match line above
3030
pineappl-v0 = { package = "pineappl", version = "0.8.2" }
3131
rayon = "1.5.1"

pineappl/src/evolution.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -489,7 +489,7 @@ pub(crate) fn evolve_slice(
489489

490490
Ok((
491491
Array1::from_iter(sub_fk_tables)
492-
.into_shape((1, grid.bwfl().len(), channels0.len()))
492+
.into_shape_with_order((1, grid.bwfl().len(), channels0.len()))
493493
.unwrap(),
494494
channels0
495495
.into_iter()

pineappl_capi/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ workspace = true
2121
[dependencies]
2222
pineappl = { path = "../pineappl", version = "=1.3.0" }
2323
itertools = "0.10.1"
24-
ndarray = "0.15.4"
24+
ndarray = "0.16.1"
2525

2626
[features]
2727
capi = []

pineappl_cli/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@ itertools = "0.10.1"
2929
lhapdf = { package = "managed-lhapdf", version = "0.3.4" }
3030
lz4_flex = { optional = true, version = "0.9.2" }
3131
neopdf = "=0.3.0-alpha2"
32-
ndarray = "0.15.4"
33-
ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.8.1" }
32+
ndarray = "0.16.1"
33+
ndarray-npy = { default-features = false, features = ["npz"], optional = true, version = "0.9.0" }
3434
pineappl = { path = "../pineappl", version = "=1.3.0" }
3535
pineappl_applgrid = { optional = true, path = "../pineappl_applgrid", version = "=1.3.0" }
3636
pineappl_fastnlo = { optional = true, path = "../pineappl_fastnlo", version = "=1.3.0" }

pineappl_py/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ crate-type = ["cdylib"]
2929

3030
[dependencies]
3131
itertools = "0.10.1"
32-
ndarray = "0.15.4"
32+
ndarray = "0.16.1"
3333
numpy = "0.26.0"
3434
pineappl = { path = "../pineappl", version = "=1.3.0" }
3535
pyo3 = { features = ["extension-module"], version = "0.26.0" }

0 commit comments

Comments
 (0)