diff --git a/crates/argmin-math/Cargo.toml b/crates/argmin-math/Cargo.toml index 654fc1ab4..46de4d025 100644 --- a/crates/argmin-math/Cargo.toml +++ b/crates/argmin-math/Cargo.toml @@ -26,10 +26,8 @@ ndarray_0_15 = { package = "ndarray", version = "0.15", optional = true } ndarray-linalg_0_16 = { package = "ndarray-linalg", version = "0.16", optional = true } ## v0.14 ndarray_0_14 = { package = "ndarray", version = "0.14", optional = true } -ndarray-linalg_0_13 = { package = "ndarray-linalg", version = "0.13", optional = true } ## v0.13 ndarray_0_13 = { package = "ndarray", version = "0.13", optional = true } -ndarray-linalg_0_12 = { package = "ndarray-linalg", version = "0.12", optional = true } # general num-complex_0_4 = { package = "num-complex", version = "0.4", optional = true, default-features = false, features = ["std"] } @@ -71,8 +69,6 @@ ndarray_latest = ["ndarray_v0_15"] ## With `ndarray-linalg` 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"] ## Without `ndarray-linalg` ndarray_latest-nolinalg = ["ndarray_v0_15-nolinalg"] 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 deleted file mode 100644 index efd3450f4..000000000 --- a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_13/Cargo.toml +++ /dev/null @@ -1,25 +0,0 @@ -[package] -name = "ndarray_0_13" -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_13", -] } -ndarray = { version = "0.13", default-features = false } -ndarray-linalg = { version = "0.12", default-features = false, features = ["intel-mkl"] } -num-complex = { version = "0.2", 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 - -[features] - -# To make it explicit that this package is not part of the overall argmin workspace for the purpose of dependency unification -[workspace] diff --git a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_13/src/lib.rs b/crates/argmin-math/ndarray-linalg-tests/ndarray_0_13/src/lib.rs deleted file mode 100644 index afd01831f..000000000 --- a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_13/src/lib.rs +++ /dev/null @@ -1,51 +0,0 @@ -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")); -} 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 deleted file mode 100644 index 140539c8a..000000000 --- a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_14/Cargo.toml +++ /dev/null @@ -1,27 +0,0 @@ -[package] -name = "ndarray_0_14" -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 = "*", default-features=false, features = [ - "ndarray_v0_14", -] } -ndarray = { version = "0.14", default-features = false } -ndarray-linalg = { version = "0.13", features = ["intel-mkl-static"] } -num-complex = { version = "0.3", default-features = false, features = ["std"] } -num-traits = { version = "0.2" } -num-integer = { version = "0.1" } -# Higher versions break intel-mkl-tool: https://github.com/rust-math/intel-mkl-src/issues/68#issue-1065394662 -anyhow = { version = "<=1.0.48" } -paste = "1" -approx = "0.5.0" -rand = "*" # Should unify with whatever is currently used in argmin itself - -[features] - -# To make it explicit that this package is not part of the overall argmin workspace for the purpose of dependency unification -[workspace] diff --git a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_14/src/lib.rs b/crates/argmin-math/ndarray-linalg-tests/ndarray_0_14/src/lib.rs deleted file mode 100644 index afd01831f..000000000 --- a/crates/argmin-math/ndarray-linalg-tests/ndarray_0_14/src/lib.rs +++ /dev/null @@ -1,51 +0,0 @@ -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")); -} diff --git a/crates/argmin-math/src/lib.rs b/crates/argmin-math/src/lib.rs index f0d72994f..b6cb9fcaf 100644 --- a/crates/argmin-math/src/lib.rs +++ b/crates/argmin-math/src/lib.rs @@ -45,9 +45,7 @@ //! | `ndarray_latest-nolinalg` | no | latest supported version without `ndarray-linalg` | //! | `ndarray_v0_15` | no | version 0.15 with ndarray-linalg 0.16 | //! | `ndarray_v0_15-nolinalg` | no | version 0.15 without `ndarray-linalg` | -//! | `ndarray_v0_14` | no | version 0.14 with ndarray-linalg 0.13 | //! | `ndarray_v0_14-nolinalg` | no | version 0.14 without `ndarray-linalg` | -//! | `ndarray_v0_13` | no | version 0.13 with ndarray-linalg 0.12 | //! | `ndarray_v0_13-nolinalg` | no | version 0.13 without `ndarray-linalg` | //! //! Note that the `*-nolinalg*` features do NOT pull in `ndarray-linalg` as a dependency. This @@ -104,24 +102,6 @@ //! features containing `*latest*`. It is therefore recommended to specify the actual version of the //! backend you are using. //! -//! # Development -//! -//! For development and running the tests a backend for `ndarray-linalg` must be chosen. Normally -//! one would add those as dev dependencies (the features would then be unified with the regular -//! dependencies). However, linking somehow fails when the non-dev `ndarra-linalg` dependency is -//! missing (which is the case for the `*-nolinalg*` features of the ndarray backend). To fix that, -//! the `_dev_linalg_*` features were introduced. When testing and developing with one of the -//! ndarray features with linalg support on, the appropriate `_dev_linalg_*` feature must be turned -//! on as well. Note that the version number in `_dev_linalg_*` is always one below the `ndarray` -//! version. For instance, for ndarray 0.15, one would use the `_dev_linalg_0_14` feature. -//! -//! | Development Feature | Comment | -//! |-----------------------|----------------------------------------------| -//! | `_dev_linalg_latest` | latest `ndarray-linalg` for latest `ndarray` | -//! | `_dev_linalg_0_16` | `ndarray-linalg` v0.16 for `ndarray` v0.15 | -//! | `_dev_linalg_0_13` | `ndarray-linalg` v0.13 for `ndarray` v0.14 | -//! | `_dev_linalg_0_12` | `ndarray-linalg` v0.12 for `ndarray` v0.13 | -//! //! # Contributing //! //! You found a bug? Your favorite backend is not supported? Feel free to open an issue or ideally @@ -175,10 +155,6 @@ cfg_if::cfg_if! { cfg_if::cfg_if! { 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; - } else if #[cfg(feature = "ndarray-linalg_0_12")] { - extern crate ndarray_linalg_0_12 as ndarray_linalg; } }