From 55e10bf5036573b0181e911873fbd029961cc82d Mon Sep 17 00:00:00 2001 From: Lofty Date: Tue, 30 Sep 2025 13:05:05 +0100 Subject: [PATCH 1/3] update faer to 0.23 --- crates/argmin-math/Cargo.toml | 5 ++++- crates/argmin-math/src/faer_tests/test_helper.rs | 2 ++ crates/argmin-math/src/lib.rs | 6 ++++++ 3 files changed, 12 insertions(+), 1 deletion(-) diff --git a/crates/argmin-math/Cargo.toml b/crates/argmin-math/Cargo.toml index 4385290cf..4b208d082 100644 --- a/crates/argmin-math/Cargo.toml +++ b/crates/argmin-math/Cargo.toml @@ -36,7 +36,9 @@ ndarray_0_13 = { package = "ndarray", version = "0.13", optional = true } #faer faer_0_20 = { package = "faer", version = "0.20", optional = true} faer_0_21 = { package = "faer", version = "0.21", optional = true} +faer_0_23 = { package = "faer", version = "0.23", optional = true} faer_traits_0_21 = {package = "faer-traits", version = "0.21", optional = true} +faer_traits_0_23 = {package = "faer-traits", version = "0.23", optional = true} # general num-complex_0_4 = { package = "num-complex", version = "0.4", optional = true, default-features = false, features = ["std"] } @@ -80,9 +82,10 @@ ndarray_latest = ["ndarray_v0_16"] #faer faer_all = ["primitives"] -faer_latest = ["faer_v0_21"] +faer_latest = ["faer_v0_23"] faer_v0_20 = ["faer_0_20", "num-complex_0_4", "faer_all"] faer_v0_21 = ["faer_0_21", "num-complex_0_4", "faer_traits_0_21", "faer_all"] +faer_v0_23 = ["faer_0_23", "num-complex_0_4", "faer_traits_0_23", "faer_all"] ## With `ndarray-linalg` ndarray_v0_16 = ["ndarray_0_16", "ndarray-linalg_0_17", "num-complex_0_4", "ndarray_all"] diff --git a/crates/argmin-math/src/faer_tests/test_helper.rs b/crates/argmin-math/src/faer_tests/test_helper.rs index 8467dedb5..1dad6d216 100644 --- a/crates/argmin-math/src/faer_tests/test_helper.rs +++ b/crates/argmin-math/src/faer_tests/test_helper.rs @@ -5,6 +5,8 @@ cfg_if::cfg_if! { use faer::ComplexField; } else if #[cfg(feature = "faer_v0_21")] { use faer_traits::ComplexField; + } else if #[cfg(feature = "faer_v0_23")] { + use faer_traits::ComplexField; } } diff --git a/crates/argmin-math/src/lib.rs b/crates/argmin-math/src/lib.rs index 2ced500a1..00b52e30f 100644 --- a/crates/argmin-math/src/lib.rs +++ b/crates/argmin-math/src/lib.rs @@ -266,6 +266,8 @@ cfg_if::cfg_if! { extern crate faer_0_20 as faer; } else if #[cfg(feature = "faer_v0_21")] { extern crate faer_0_21 as faer; + } else if #[cfg(feature = "faer_v0_23")] { + extern crate faer_0_23 as faer; } } @@ -303,6 +305,10 @@ cfg_if! { extern crate faer_traits_0_21 as faer_traits; mod faer_m_0_21; use faer_m_0_21 as faer_m; + } else if #[cfg(feature = "faer_v0_23")] { + extern crate faer_traits_0_23 as faer_traits; + mod faer_m_0_21; + use faer_m_0_21 as faer_m; } } From da704b7137b9c624d4f9a30257069637d3cf1f70 Mon Sep 17 00:00:00 2001 From: Lofty Date: Tue, 30 Sep 2025 15:18:09 +0100 Subject: [PATCH 2/3] add support for faer 0.22 --- crates/argmin-math/Cargo.toml | 3 +++ crates/argmin-math/src/faer_tests/test_helper.rs | 2 ++ crates/argmin-math/src/lib.rs | 6 ++++++ 3 files changed, 11 insertions(+) diff --git a/crates/argmin-math/Cargo.toml b/crates/argmin-math/Cargo.toml index 4b208d082..584daeb89 100644 --- a/crates/argmin-math/Cargo.toml +++ b/crates/argmin-math/Cargo.toml @@ -36,8 +36,10 @@ ndarray_0_13 = { package = "ndarray", version = "0.13", optional = true } #faer faer_0_20 = { package = "faer", version = "0.20", optional = true} faer_0_21 = { package = "faer", version = "0.21", optional = true} +faer_0_22 = { package = "faer", version = "0.22", optional = true} faer_0_23 = { package = "faer", version = "0.23", optional = true} faer_traits_0_21 = {package = "faer-traits", version = "0.21", optional = true} +faer_traits_0_22 = {package = "faer-traits", version = "0.22", optional = true} faer_traits_0_23 = {package = "faer-traits", version = "0.23", optional = true} # general @@ -85,6 +87,7 @@ faer_all = ["primitives"] faer_latest = ["faer_v0_23"] faer_v0_20 = ["faer_0_20", "num-complex_0_4", "faer_all"] faer_v0_21 = ["faer_0_21", "num-complex_0_4", "faer_traits_0_21", "faer_all"] +faer_v0_22 = ["faer_0_22", "num-complex_0_4", "faer_traits_0_22", "faer_all"] faer_v0_23 = ["faer_0_23", "num-complex_0_4", "faer_traits_0_23", "faer_all"] ## With `ndarray-linalg` diff --git a/crates/argmin-math/src/faer_tests/test_helper.rs b/crates/argmin-math/src/faer_tests/test_helper.rs index 1dad6d216..56ff0aec1 100644 --- a/crates/argmin-math/src/faer_tests/test_helper.rs +++ b/crates/argmin-math/src/faer_tests/test_helper.rs @@ -5,6 +5,8 @@ cfg_if::cfg_if! { use faer::ComplexField; } else if #[cfg(feature = "faer_v0_21")] { use faer_traits::ComplexField; + } else if #[cfg(feature = "faer_v0_22")] { + use faer_traits::ComplexField; } else if #[cfg(feature = "faer_v0_23")] { use faer_traits::ComplexField; } diff --git a/crates/argmin-math/src/lib.rs b/crates/argmin-math/src/lib.rs index 00b52e30f..b63080bea 100644 --- a/crates/argmin-math/src/lib.rs +++ b/crates/argmin-math/src/lib.rs @@ -266,6 +266,8 @@ cfg_if::cfg_if! { extern crate faer_0_20 as faer; } else if #[cfg(feature = "faer_v0_21")] { extern crate faer_0_21 as faer; + } else if #[cfg(feature = "faer_v0_22")] { + extern crate faer_0_22 as faer; } else if #[cfg(feature = "faer_v0_23")] { extern crate faer_0_23 as faer; } @@ -305,6 +307,10 @@ cfg_if! { extern crate faer_traits_0_21 as faer_traits; mod faer_m_0_21; use faer_m_0_21 as faer_m; + } else if #[cfg(feature = "faer_v0_22")] { + extern crate faer_traits_0_22 as faer_traits; + mod faer_m_0_21; + use faer_m_0_21 as faer_m; } else if #[cfg(feature = "faer_v0_23")] { extern crate faer_traits_0_23 as faer_traits; mod faer_m_0_21; From 39ffe2430966fd8c2aa30d7e0eb7b144bcaffda9 Mon Sep 17 00:00:00 2001 From: Lofty Date: Tue, 30 Sep 2025 15:19:49 +0100 Subject: [PATCH 3/3] add CI for faer 0.22/0.23 --- .github/workflows/ci.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index eed148735..faa0e833b 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -143,6 +143,10 @@ jobs: # faer - name: argmin-math (faer_latest) run: cargo test -p argmin-math --no-default-features --features "faer_latest" + - name: argmin-math (faer_v0_23) + run: cargo test -p argmin-math --no-default-features --features "faer_v0_23" + - name: argmin-math (faer_v0_22) + run: cargo test -p argmin-math --no-default-features --features "faer_v0_22" - name: argmin-math (faer_v0_21) run: cargo test -p argmin-math --no-default-features --features "faer_v0_21" - name: argmin-math (faer_v0_20)