Skip to content

Commit 9c14169

Browse files
authored
Merge pull request #1408 from rust-ndarray/simplify
Organize tests in workspace (cont.)
2 parents a7fbf38 + 7f93048 commit 9c14169

File tree

14 files changed

+33
-34
lines changed

14 files changed

+33
-34
lines changed

Cargo.toml

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -80,9 +80,14 @@ portable-atomic-util = { version = "0.2.0", features = [ "alloc" ] }
8080
[workspace]
8181
members = [
8282
"ndarray-rand",
83-
"extra-tests/serialization",
84-
"extra-tests/blas",
85-
"extra-tests/numeric",
83+
"crates/*",
84+
]
85+
default-members = [
86+
".",
87+
"ndarray-rand",
88+
"crates/numeric-tests",
89+
"crates/serialization-tests",
90+
# exclude blas-tests that depends on BLAS install
8691
]
8792

8893
[workspace.dependencies]

README.rst

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ How to use with cargo
107107
::
108108

109109
[dependencies]
110-
ndarray = "0.15.0"
110+
ndarray = "0.16.0"
111111

112112
How to enable BLAS integration
113113
------------------------------
@@ -127,8 +127,8 @@ An example configuration using system openblas is shown below. Note that only
127127
end-user projects (not libraries) should select provider::
128128

129129
[dependencies]
130-
ndarray = { version = "0.15.0", features = ["blas"] }
131-
blas-src = { version = "0.8", features = ["openblas"] }
130+
ndarray = { version = "0.16.0", features = ["blas"] }
131+
blas-src = { version = "0.10", features = ["openblas"] }
132132
openblas-src = { version = "0.10", features = ["cblas", "system"] }
133133

134134
Using system-installed dependencies can save a long time building dependencies.
@@ -149,6 +149,7 @@ there is no tight coupling to the ``blas-src`` version, so version selection is
149149
=========== ============ ================ ==============
150150
``ndarray`` ``blas-src`` ``openblas-src`` ``netlib-src``
151151
=========== ============ ================ ==============
152+
0.16 0.10 0.10 0.8
152153
0.15 0.8 0.10 0.8
153154
0.15 0.7 0.9 0.8
154155
0.14 0.6.1 0.9.0
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

extra-tests/serialization/Cargo.toml renamed to crates/serialization-tests/Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,11 @@ test = false
1212
ndarray = { workspace = true, features = ["serde"] }
1313

1414
serde = { version = "1.0.100", default-features = false }
15-
ron = { version = "0.8.1", optional = true }
15+
ron = { version = "0.8.1" }
1616

1717
[dev-dependencies]
1818
serde_json = { version = "1.0.40" }
1919
# Old version to work with Rust 1.64+
2020
rmp = { version = "=0.8.10" }
2121
# Old version to work with Rust 1.64+
2222
rmp-serde = { version = "0.14" }
23-
24-
[features]
25-
default = ["ron"]
26-

0 commit comments

Comments
 (0)