Merge pull request #2 from amfaber/ndarray_update

argmin-rs · Jan 30, 2025 · 7e030d7 · 7e030d7
2 parents 888ce17 + f64c963
commit 7e030d7
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 29 deletions.
diff --git a/crates/argmin-math/Cargo.toml b/crates/argmin-math/Cargo.toml
@@ -22,6 +22,7 @@ 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 }
@@ -71,7 +72,7 @@ ndarray_all = ["primitives"]
 ndarray_latest = ["ndarray_v0_16"]
 
 ## With `ndarray-linalg`
-ndarray_v0_16 = ["ndarray_0_16", "ndarray-linalg_0_16", "num-complex_0_4", "ndarray_all"]
+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"]
 ndarray_v0_14 = ["ndarray_0_14", "ndarray-linalg_0_13", "num-complex_0_3", "ndarray_all"]
 ndarray_v0_13 = ["ndarray_0_13", "ndarray-linalg_0_12", "num-complex_0_2", "ndarray_all"]

diff --git a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_13/Cargo.toml b/crates/argmin-math/ndarray-linalg-tests/ndarray_0_13/Cargo.toml
@@ -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]
 

diff --git a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_14/Cargo.toml b/crates/argmin-math/ndarray-linalg-tests/ndarray_0_14/Cargo.toml
@@ -19,7 +19,7 @@ num-integer = { version = "0.1" }
 anyhow = { version = "<=1.0.48" }
 paste = "1"
 approx = "0.5.0"
-rand = "*" # Should unify with whatever is currently used in argmin itself
+rand = "0.8"
 
 [features]
 

diff --git a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_15/Cargo.toml b/crates/argmin-math/ndarray-linalg-tests/ndarray_0_15/Cargo.toml
@@ -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]
 

diff --git a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_16/Cargo.toml b/crates/argmin-math/ndarray-linalg-tests/ndarray_0_16/Cargo.toml
@@ -11,13 +11,13 @@ argmin-math = { path = "../../", version = "*", features = [
     "ndarray_v0_16",
 ] }
 ndarray = { version = "0.16", default-features = false }
-ndarray-linalg = { version = "0.16", default-features = false, features = ["intel-mkl-static"] }
+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]
 

diff --git a/crates/argmin-math/ndarray-linalg-tests/ndarray_latest/Cargo.toml b/crates/argmin-math/ndarray-linalg-tests/ndarray_latest/Cargo.toml
@@ -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]
 

diff --git a/crates/argmin-math/src/lib.rs b/crates/argmin-math/src/lib.rs
@@ -175,7 +175,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;
     } else if #[cfg(feature = "ndarray-linalg_0_13")] {
         extern crate ndarray_linalg_0_13 as ndarray_linalg;

diff --git a/crates/argmin-math/src/ndarray_m/mod.rs b/crates/argmin-math/src/ndarray_m/mod.rs
@@ -15,7 +15,8 @@ mod eye;
 #[cfg(any(
     feature = "ndarray-linalg_0_12",
     feature = "ndarray-linalg_0_13",
-    feature = "ndarray-linalg_0_16"
+    feature = "ndarray-linalg_0_16",
+    feature = "ndarray-linalg_0_17",
 ))]
 mod inv;
 mod l1norm;
@@ -38,7 +39,8 @@ pub use eye::*;
 #[cfg(any(
     feature = "ndarray-linalg_0_12",
     feature = "ndarray-linalg_0_13",
-    feature = "ndarray-linalg_0_16"
+    feature = "ndarray-linalg_0_16",
+    feature = "ndarray-linalg_0_17",
 ))]
 pub use inv::*;
 pub use l1norm::*;

diff --git a/crates/argmin/Cargo.toml b/crates/argmin/Cargo.toml
@@ -34,7 +34,7 @@ approx = "0.5.0"
 finitediff = { version = "0.1.4", features = ["ndarray"] }
 argmin_testfunctions = { version = "0.2.0", path = "../argmin-testfunctions" }
 ndarray = { version = "0.16", features = ["serde-1"] }
-ndarray-linalg = { version = "0.16", features = ["intel-mkl-static"] }
+ndarray-linalg = { version = "0.17", features = ["intel-mkl-static"] }
 argmin-math = { path = "../argmin-math", version = "0.3", features = ["vec"] }
 argmin-observer-slog = { path = "../argmin-observer-slog" }
 argmin-observer-paramwriter = { path = "../argmin-observer-paramwriter" }

diff --git a/examples/bfgs/Cargo.toml b/examples/bfgs/Cargo.toml
@@ -11,4 +11,4 @@ argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = ".
 argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
 argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
 finitediff = { version = "0.1.4", features = ["ndarray"] }
-ndarray = "0.15.6"
+ndarray = "0.16"
diff --git a/examples/dfp/Cargo.toml b/examples/dfp/Cargo.toml
@@ -11,4 +11,4 @@ argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = ".
 argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
 argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
 finitediff = { version = "0.1.4", features = ["ndarray"] }
-ndarray = "0.15.6"
+ndarray = "0.16"
diff --git a/examples/gaussnewton/Cargo.toml b/examples/gaussnewton/Cargo.toml
@@ -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"] }
diff --git a/examples/gaussnewton_linesearch/Cargo.toml b/examples/gaussnewton_linesearch/Cargo.toml
@@ -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"] }
diff --git a/examples/lbfgs/Cargo.toml b/examples/lbfgs/Cargo.toml
@@ -11,4 +11,4 @@ argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = ".
 argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
 argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
 finitediff = { version = "0.1.4", features = ["ndarray"] }
-ndarray = "0.15.6"
+ndarray = "0.16"
diff --git a/examples/neldermead/Cargo.toml b/examples/neldermead/Cargo.toml
@@ -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"
diff --git a/examples/newton/Cargo.toml b/examples/newton/Cargo.toml
@@ -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"] }
diff --git a/examples/newton_cg/Cargo.toml b/examples/newton_cg/Cargo.toml
@@ -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"
diff --git a/examples/owl_qn/Cargo.toml b/examples/owl_qn/Cargo.toml
@@ -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"
diff --git a/examples/sr1/Cargo.toml b/examples/sr1/Cargo.toml
@@ -11,4 +11,4 @@ argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = ".
 argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
 argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
 finitediff = { version = "0.1.4", features = ["ndarray"] }
-ndarray = "0.15.6"
+ndarray = "0.16"
diff --git a/examples/sr1_trustregion/Cargo.toml b/examples/sr1_trustregion/Cargo.toml
@@ -11,4 +11,4 @@ argmin-math = { version = "*", features = ["ndarray_latest-nolinalg"], path = ".
 argmin-observer-slog = { version = "*", path = "../../crates/argmin-observer-slog" }
 argmin_testfunctions = { version = "*", path = "../../crates/argmin-testfunctions" }
 finitediff = { version = "0.1.4", features = ["ndarray"] }
-ndarray = "0.15.6"
+ndarray = "0.16"
diff --git a/examples/trustregion/Cargo.toml b/examples/trustregion/Cargo.toml
@@ -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"] }