Skip to content
New issue

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

Sign up for GitHub

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

Already on GitHub? Sign in to your account

Dependency update: ndarray. #546

Open
wants to merge 6 commits into
base: main
Choose a base branch
from
Open

Dependency update: ndarray. #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
cde27d9
[*] ndarray updated.
npatsakula Dec 13, 2024
f9a1730
[*] argmin-math: ndarray 16 tests added.
npatsakula Dec 14, 2024
2d6fd26
Additional fixes
amfaber Jan 4, 2025
3fa84c5
Bump ndarray-linalg to 0.17, ndarray to 0.16 in missing places
amfaber Jan 29, 2025
8117a12
Need to force rand version now that 0.9 is out
amfaber Jan 29, 2025
71ced29
[*] Post-rebase cleanup: redundant features removed; finitediff versi…
npatsakula Feb 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,8 @@ jobs:
# ndarray without linalg
- name: argmin-math (ndarray_latest-nolinalg)
run: cargo test -p argmin-math --no-default-features --features "ndarray_latest-nolinalg"
- name: argmin-math (ndarray_v0_16-nolinalg)
run: cargo test -p argmin-math --no-default-features --features "ndarray_v0_16-nolinalg"
- name: argmin-math (ndarray_v0_15-nolinalg)
run: cargo test -p argmin-math --no-default-features --features "ndarray_v0_15-nolinalg"
- name: argmin-math (ndarray_v0_14-nolinalg)
Expand All @@ -116,6 +118,8 @@ jobs:
# ndarray with linalg
- name: argmin-math (ndarray_latest)
run: cargo test --manifest-path ./crates/argmin-math/ndarray-linalg-tests/ndarray_latest/Cargo.toml
- name: argmin-math (ndarray_v0_16)
run: cargo test --manifest-path ./crates/argmin-math/ndarray-linalg-tests/ndarray_0_16/Cargo.toml
- name: argmin-math (ndarray_v0_15)
run: cargo test --manifest-path ./crates/argmin-math/ndarray-linalg-tests/ndarray_0_15/Cargo.toml
# nalgebra
Expand Down
8 changes: 6 additions & 2 deletions crates/argmin-math/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@ nalgebra_0_30 = { package = "nalgebra", version = "0.30", optional = true }
nalgebra_0_29 = { package = "nalgebra", version = "0.29", optional = true }

# ndarray
ndarray_0_16 = { package = "ndarray", version = "0.16", optional = true }
ndarray-linalg_0_17 = { package = "ndarray-linalg", version = "0.17", optional = true }
## v0.15
ndarray_0_15 = { package = "ndarray", version = "0.15", optional = true }
ndarray-linalg_0_16 = { package = "ndarray-linalg", version = "0.16", optional = true }
Expand Down Expand Up @@ -67,13 +69,15 @@ nalgebra_v0_29 = ["nalgebra_0_29", "num-complex_0_4", "nalgebra_all"]

# ndarray
ndarray_all = ["primitives"]
ndarray_latest = ["ndarray_v0_15"]
ndarray_latest = ["ndarray_v0_16"]

## With `ndarray-linalg`
ndarray_v0_16 = ["ndarray_0_16", "ndarray-linalg_0_17", "num-complex_0_4", "ndarray_all"]
ndarray_v0_15 = ["ndarray_0_15", "ndarray-linalg_0_16", "num-complex_0_4", "ndarray_all"]

## Without `ndarray-linalg`
ndarray_latest-nolinalg = ["ndarray_v0_15-nolinalg"]
ndarray_latest-nolinalg = ["ndarray_v0_16-nolinalg"]
ndarray_v0_16-nolinalg = ["ndarray_0_16", "num-complex_0_4", "ndarray_all"]
ndarray_v0_15-nolinalg = ["ndarray_0_15", "num-complex_0_4", "ndarray_all"]
ndarray_v0_14-nolinalg = ["ndarray_0_14", "num-complex_0_3", "ndarray_all"]
ndarray_v0_13-nolinalg = ["ndarray_0_13", "num-complex_0_2", "ndarray_all"]
Expand Down
2 changes: 1 addition & 1 deletion crates/argmin-math/ndarray-linalg-tests/ndarray_0_15/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ num-traits = { version = "0.2", default-features = false }
num-integer = { version = "0.1", default-features = false }
paste = "1"
approx = "0.5.0"
rand = "*" # Should unify with whatever is currently used in argmin itself
rand = "0.8"

[features]

Expand Down
25 changes: 25 additions & 0 deletions crates/argmin-math/ndarray-linalg-tests/ndarray_0_16/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
[package]
name = "ndarray_0_16"
version = "0.0.0"
edition = "2021"
publish = false

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dev-dependencies]
argmin-math = { path = "../../", version = "*", features = [
"ndarray_v0_16",
] }
ndarray = { version = "0.16", default-features = false }
ndarray-linalg = { version = "0.17", default-features = false, features = ["intel-mkl-static"] }
num-complex = { version = "0.4", default-features = false }
num-traits = { version = "0.2", default-features = false }
num-integer = { version = "0.1", default-features = false }
paste = "1"
approx = "0.5.0"
rand = "0.8"

[features]

# To make it explicit that this package is not part of the overall argmin workspace for the purpose of dependency unification
[workspace]
51 changes: 51 additions & 0 deletions crates/argmin-math/ndarray-linalg-tests/ndarray_0_16/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
mod add {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/add.rs"));
}
mod conj {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/conj.rs"));
}
mod div {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/div.rs"));
}
mod dot {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/dot.rs"));
}
mod eye {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/eye.rs"));
}
mod inv {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/inv.rs"));
}
mod l1norm {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/l1norm.rs"));
}
mod l2norm {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/l2norm.rs"));
}
mod minmax {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/minmax.rs"));
}
mod mul {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/mul.rs"));
}
mod random {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/random.rs"));
}
mod scaledadd {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/scaledadd.rs"));
}
mod scaledsub {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/scaledsub.rs"));
}
mod signum {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/signum.rs"));
}
mod sub {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/sub.rs"));
}
mod transpose {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/transpose.rs"));
}
mod zero {
include!(concat!(env!("CARGO_MANIFEST_DIR"), "/../../ndarray-tests-src/zero.rs"));
}
6 changes: 3 additions & 3 deletions crates/argmin-math/ndarray-linalg-tests/ndarray_latest/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@ publish = false
argmin-math = { path = "../../", version = "*", features = [
"ndarray_latest",
] }
ndarray = { version = "0.15", default-features = false }
ndarray-linalg = { version = "0.16", default-features = false, features = ["intel-mkl-static"] }
ndarray = { version = "0.16", default-features = false }
ndarray-linalg = { version = "0.17", default-features = false, features = ["intel-mkl-static"] }
num-complex = { version = "0.4", default-features = false }
num-traits = { version = "0.2", default-features = false }
num-integer = { version = "0.1", default-features = false }
paste = "1"
approx = "0.5.0"
rand = "*" # Should unify with whatever is currently used in argmin itself
rand = "0.8"

[features]

Expand Down
8 changes: 6 additions & 2 deletions crates/argmin-math/src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,9 @@ cfg_if::cfg_if! {
}

cfg_if::cfg_if! {
if #[cfg(feature = "ndarray_0_15")] {
if #[cfg(feature = "ndarray_0_16")] {
extern crate ndarray_0_16 as ndarray;
} else if #[cfg(feature = "ndarray_0_15")] {
extern crate ndarray_0_15 as ndarray;
} else if #[cfg(feature = "ndarray_0_14")] {
extern crate ndarray_0_14 as ndarray;
Expand All @@ -198,7 +200,9 @@ cfg_if::cfg_if! {
}

cfg_if::cfg_if! {
if #[cfg(feature = "ndarray-linalg_0_16")] {
if #[cfg(feature = "ndarray-linalg_0_17")] {
extern crate ndarray_linalg_0_17 as ndarray_linalg;
} else if #[cfg(feature = "ndarray-linalg_0_16")] {
extern crate ndarray_linalg_0_16 as ndarray_linalg;
}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/argmin-math/src/ndarray_m/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ mod conj;
mod div;
mod dot;
mod eye;
#[cfg(feature = "ndarray-linalg_0_16")]
#[cfg(any(feature = "ndarray-linalg_0_16", feature = "ndarray-linalg_0_17",))]
mod inv;
mod l1norm;
mod l2norm;
Expand All @@ -31,7 +31,7 @@ pub use conj::*;
pub use div::*;
pub use dot::*;
pub use eye::*;
#[cfg(feature = "ndarray-linalg_0_16")]
#[cfg(any(feature = "ndarray-linalg_0_16", feature = "ndarray-linalg_0_17",))]
pub use inv::*;
pub use l1norm::*;
pub use l2norm::*;
Expand Down
4 changes: 2 additions & 2 deletions crates/argmin/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@ serde = { version = "1.0", features = ["derive"], optional = true }
approx = "0.5.0"
finitediff = { version = "0.1.4", path = "../finitediff", features = ["ndarray"] }
argmin_testfunctions = { version = "0.2.0", path = "../argmin-testfunctions" }
ndarray = { version = "0.15", features = ["serde-1"] }
ndarray-linalg = { version = "0.16", features = ["intel-mkl-static"] }
ndarray = { version = "0.16", features = ["serde-1"] }
ndarray-linalg = { version = "0.17", features = ["intel-mkl-static"] }
argmin-math = { path = "../argmin-math", version = "0.4", features = ["vec"] }
argmin-observer-slog = { path = "../argmin-observer-slog" }
argmin-observer-paramwriter = { path = "../argmin-observer-paramwriter" }
Expand Down
2 changes: 1 addition & 1 deletion crates/finitediff/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,5 @@ categories = ["science"]

[dependencies]
anyhow = "1.0"
ndarray = { version = "0.15.0", optional = true }
ndarray = { version = "0.16.0", optional = true }
num = "0.4.1"
3 changes: 2 additions & 1 deletion examples/bfgs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
finitediff = { version = "0.1.4", features = ["ndarray"] }
ndarray = "0.16"
3 changes: 2 additions & 1 deletion examples/dfp/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
finitediff = { version = "0.1.4", features = ["ndarray"] }
ndarray = "0.16"
4 changes: 2 additions & 2 deletions examples/gaussnewton/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ publish = false
argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
ndarray = "0.15.6"
ndarray-linalg = { version = "0.16.0", features = ["intel-mkl"] }
ndarray = "0.16"
ndarray-linalg = { version = "0.17.0", features = ["intel-mkl"] }
4 changes: 2 additions & 2 deletions examples/gaussnewton_linesearch/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@ publish = false
argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
ndarray = "0.15.6"
ndarray-linalg = { version = "0.16.0", features = ["intel-mkl"] }
ndarray = "0.16"
ndarray-linalg = { version = "0.17.0", features = ["intel-mkl"] }
3 changes: 2 additions & 1 deletion examples/lbfgs/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
finitediff = { version = "0.1.4", features = ["ndarray"] }
ndarray = "0.16"
2 changes: 1 addition & 1 deletion examples/neldermead/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
ndarray = "0.16"
4 changes: 2 additions & 2 deletions examples/newton/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
ndarray-linalg = { version = "0.16.0", features = ["intel-mkl"] }
ndarray = "0.16"
ndarray-linalg = { version = "0.17.0", features = ["intel-mkl"] }
2 changes: 1 addition & 1 deletion examples/newton_cg/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
ndarray = "0.16"
2 changes: 1 addition & 1 deletion examples/owl_qn/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,4 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
ndarray = "0.16"
3 changes: 2 additions & 1 deletion examples/sr1/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
finitediff = { version = "0.1.4", features = ["ndarray"] }
ndarray = "0.16"
3 changes: 2 additions & 1 deletion examples/sr1_trustregion/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
finitediff = { version = "0.1.4", features = ["ndarray"] }
ndarray = "0.16"
4 changes: 2 additions & 2 deletions examples/trustregion/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,5 +10,5 @@ argmin = { version = "*", path = "../../crates/argmin" }
argmin-math = { version = "*", features = ["ndarray_latest"], path = "../../crates/argmin-math" }
argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
ndarray = "0.15.6"
ndarray-linalg = { version = "0.16.0", features = ["intel-mkl-static"] }
ndarray = "0.16"
ndarray-linalg = { version = "0.17.0", features = ["intel-mkl-static"] }
Loading