Skip to content

Commit

Permalink
Removed ndarray support which required ndarray-linalg < 0.16
Browse files Browse the repository at this point in the history
  • Loading branch information
stefan-k committed Aug 31, 2024
1 parent bb6bc57 commit 6e6fcfe
Show file tree
Hide file tree
Showing 6 changed files with 0 additions and 182 deletions.
4 changes: 0 additions & 4 deletions crates/argmin-math/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down Expand Up @@ -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"]
Expand Down
25 changes: 0 additions & 25 deletions crates/argmin-math/ndarray-linalg-tests/ndarray_0_13/Cargo.toml

This file was deleted.

51 changes: 0 additions & 51 deletions crates/argmin-math/ndarray-linalg-tests/ndarray_0_13/src/lib.rs

This file was deleted.

27 changes: 0 additions & 27 deletions crates/argmin-math/ndarray-linalg-tests/ndarray_0_14/Cargo.toml

This file was deleted.

51 changes: 0 additions & 51 deletions crates/argmin-math/ndarray-linalg-tests/ndarray_0_14/src/lib.rs

This file was deleted.

24 changes: 0 additions & 24 deletions crates/argmin-math/src/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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;
}
}

Expand Down

0 comments on commit 6e6fcfe

Please sign in to comment.