Skip to content

Commit 4e40ce6

Browse files
relfrelf
authored
Upgrade ndarray-linalg 0.16, argmin 0.9.0 (rust-ml#331)
1 parent 86ad712 commit 4e40ce6

File tree

10 files changed

+76
-40
lines changed

10 files changed

+76
-40
lines changed

‎Cargo.toml

+14-9
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ authors = [
55
"Luca Palmieri <[email protected]>",
66
"Lorenz Schmidt <[email protected]>",
77
"Paul Körbitz <[email protected]>",
8-
"Yuhan Lin <[email protected]>"
8+
"Yuhan Lin <[email protected]>",
99
]
1010
description = "A Machine Learning framework for Rust"
1111
edition = "2018"
@@ -41,12 +41,12 @@ rand = { version = "0.8", features = ["small_rng"] }
4141
approx = "0.4"
4242

4343
ndarray = { version = "0.15", features = ["approx"] }
44-
ndarray-linalg = { version = "0.15", optional = true }
44+
ndarray-linalg = { version = "0.16", optional = true }
4545
sprs = { version = "0.11", default-features = false }
4646

4747
thiserror = "1.0"
4848

49-
criterion = { version = "0.4.0", optional = true}
49+
criterion = { version = "0.4.0", optional = true }
5050

5151
[dependencies.serde_crate]
5252
package = "serde"
@@ -57,17 +57,22 @@ features = ["std", "derive"]
5757

5858
[dev-dependencies]
5959
ndarray-rand = "0.14"
60-
linfa-datasets = { path = "datasets", features = ["winequality", "iris", "diabetes", "generate"] }
60+
linfa-datasets = { path = "datasets", features = [
61+
"winequality",
62+
"iris",
63+
"diabetes",
64+
"generate",
65+
] }
6166
statrs = "0.16.0"
6267

6368
[target.'cfg(not(windows))'.dependencies]
64-
pprof = { version = "0.11.0", features = ["flamegraph", "criterion"], optional = true}
69+
pprof = { version = "0.11.0", features = [
70+
"flamegraph",
71+
"criterion",
72+
], optional = true }
6573

6674
[workspace]
67-
members = [
68-
"algorithms/*",
69-
"datasets",
70-
]
75+
members = ["algorithms/*", "datasets"]
7176

7277
[profile.release]
7378
opt-level = 3

‎algorithms/linfa-clustering/Cargo.toml

+13-5
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,21 @@ edition = "2018"
55
authors = [
66
"Luca Palmieri <[email protected]>",
77
"xd009642 <[email protected]>",
8-
"Rémi Lafage <[email protected]>"
8+
"Rémi Lafage <[email protected]>",
99
]
1010
description = "A collection of clustering algorithms"
1111
license = "MIT OR Apache-2.0"
1212

1313
repository = "https://github.com/rust-ml/linfa/"
1414
readme = "README.md"
1515

16-
keywords = ["clustering", "machine-learning", "linfa", "k-means", "unsupervised"]
16+
keywords = [
17+
"clustering",
18+
"machine-learning",
19+
"linfa",
20+
"k-means",
21+
"unsupervised",
22+
]
1723
categories = ["algorithms", "mathematics", "science"]
1824

1925
[features]
@@ -28,9 +34,9 @@ default-features = false
2834
features = ["std", "derive"]
2935

3036
[dependencies]
31-
ndarray = { version = "0.15", features = ["rayon", "approx"]}
37+
ndarray = { version = "0.15", features = ["rayon", "approx"] }
3238
linfa-linalg = { version = "0.1", default-features = false }
33-
ndarray-linalg = { version = "0.15", optional = true }
39+
ndarray-linalg = { version = "0.16", optional = true }
3440
ndarray-rand = "0.14"
3541
ndarray-stats = "0.5"
3642
num-traits = "0.2"
@@ -44,7 +50,9 @@ noisy_float = "0.2.0"
4450

4551
[dev-dependencies]
4652
ndarray-npy = { version = "0.8", default-features = false }
47-
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = ["generate"] }
53+
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = [
54+
"generate",
55+
] }
4856
criterion = "0.4.0"
4957
serde_json = "1"
5058
approx = "0.4"

‎algorithms/linfa-elasticnet/Cargo.toml

+7-4
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "linfa-elasticnet"
33
version = "0.7.0"
44
authors = [
55
"Paul Körbitz / Google <[email protected]>",
6-
"Lorenz Schmidt <[email protected]>"
6+
"Lorenz Schmidt <[email protected]>",
77
]
88

99
description = "A Machine Learning framework for Rust"
@@ -29,9 +29,9 @@ default-features = false
2929
features = ["std", "derive"]
3030

3131
[dependencies]
32-
ndarray = { version = "0.15", features = ["approx"]}
32+
ndarray = { version = "0.15", features = ["approx"] }
3333
linfa-linalg = { version = "0.1", default-features = false }
34-
ndarray-linalg = { version = "0.15", optional = true }
34+
ndarray-linalg = { version = "0.16", optional = true }
3535

3636
num-traits = "0.2"
3737
approx = "0.4"
@@ -40,6 +40,9 @@ thiserror = "1.0"
4040
linfa = { version = "0.7.0", path = "../.." }
4141

4242
[dev-dependencies]
43-
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = ["diabetes", "linnerud"] }
43+
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = [
44+
"diabetes",
45+
"linnerud",
46+
] }
4447
ndarray-rand = "0.14"
4548
rand_xoshiro = "0.6"

‎algorithms/linfa-ftrl/Cargo.toml

+6-4
Original file line numberDiff line numberDiff line change
@@ -24,20 +24,22 @@ version = "1.0"
2424
features = ["derive"]
2525

2626
[dependencies]
27-
ndarray = { version = "0.15.4", features = ["serde"]}
27+
ndarray = { version = "0.15.4", features = ["serde"] }
2828
ndarray-rand = "0.14.0"
29-
argmin = { version = "0.8.1", default-features = false }
29+
argmin = { version = "0.9.0", default-features = false }
3030
argmin-math = { version = "0.3", features = ["ndarray_v0_15-nolinalg"] }
3131
thiserror = "1.0"
3232
rand = "0.8.5"
3333
rand_xoshiro = "0.6.0"
3434

35-
linfa = { version = "0.7.0", path = "../.."}
35+
linfa = { version = "0.7.0", path = "../.." }
3636

3737
[dev-dependencies]
3838
criterion = "0.4.0"
3939
approx = "0.4"
40-
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = ["winequality"] }
40+
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = [
41+
"winequality",
42+
] }
4143
linfa = { version = "0.7.0", path = "../..", features = ["benchmarks"] }
4244

4345
[[bench]]

‎algorithms/linfa-ica/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ features = ["std", "derive"]
2727
[dependencies]
2828
ndarray = { version = "0.15" }
2929
linfa-linalg = { version = "0.1", default-features = false }
30-
ndarray-linalg = { version = "0.15", optional = true }
30+
ndarray-linalg = { version = "0.16", optional = true }
3131
ndarray-rand = "0.14"
3232
ndarray-stats = "0.5"
3333
num-traits = "0.2"

‎algorithms/linfa-linear/Cargo.toml

+7-5
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ name = "linfa-linear"
33
version = "0.7.0"
44
authors = [
55
"Paul Körbitz / Google <[email protected]>",
6-
"VasanthakumarV <[email protected]>"
6+
"VasanthakumarV <[email protected]>",
77
]
88

99
description = "A Machine Learning framework for Rust"
@@ -31,18 +31,20 @@ features = ["std", "derive"]
3131
[dependencies]
3232
ndarray = { version = "0.15", features = ["approx"] }
3333
linfa-linalg = { version = "0.1", default-features = false }
34-
ndarray-linalg = { version = "0.15", optional = true }
34+
ndarray-linalg = { version = "0.16", optional = true }
3535
num-traits = "0.2"
36-
argmin = { version = "0.8.1", default-features = false }
36+
argmin = { version = "0.9.0", default-features = false }
3737
argmin-math = { version = "0.3", features = ["ndarray_v0_15-nolinalg"] }
3838
thiserror = "1.0"
3939

4040
linfa = { version = "0.7.0", path = "../.." }
4141

4242
[dev-dependencies]
43-
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = ["diabetes"] }
43+
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = [
44+
"diabetes",
45+
] }
4446
approx = "0.4"
45-
criterion = "0.4.0"
47+
criterion = "0.4.0"
4648
statrs = "0.16.0"
4749
linfa = { version = "0.7.0", path = "../..", features = ["benchmarks"] }
4850

‎algorithms/linfa-logistic/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ version = "1.0"
2626
ndarray = { version = "0.15", features = ["approx"] }
2727
ndarray-stats = "0.5.0"
2828
num-traits = "0.2"
29-
argmin = { version = "0.8.1", default-features = false }
29+
argmin = { version = "0.9.0", default-features = false }
3030
argmin-math = { version = "0.3", features = ["ndarray_v0_15-nolinalg"] }
3131
thiserror = "1.0"
3232

@@ -35,5 +35,7 @@ linfa = { version = "0.7.0", path = "../.." }
3535

3636
[dev-dependencies]
3737
approx = "0.4"
38-
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = ["winequality"] }
38+
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = [
39+
"winequality",
40+
] }
3941
rmp-serde = "1"

‎algorithms/linfa-pls/Cargo.toml

+4-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ features = ["std", "derive"]
2727
[dependencies]
2828
ndarray = { version = "0.15" }
2929
linfa-linalg = { version = "0.1", default-features = false }
30-
ndarray-linalg = { version = "0.15", optional = true }
30+
ndarray-linalg = { version = "0.16", optional = true }
3131
ndarray-stats = "0.5"
3232
ndarray-rand = "0.14"
3333
num-traits = "0.2"
@@ -37,7 +37,9 @@ linfa = { version = "0.7.0", path = "../.." }
3737

3838
[dev-dependencies]
3939
linfa = { version = "0.7.0", path = "../..", features = ["benchmarks"] }
40-
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = ["linnerud"] }
40+
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = [
41+
"linnerud",
42+
] }
4143
approx = "0.4"
4244
rand_xoshiro = "0.6"
4345
criterion = "0.4.0"

‎algorithms/linfa-preprocessing/Cargo.toml

+8-5
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ serde = ["serde_crate", "ndarray/serde", "serde_regex"]
2020
[dependencies]
2121
linfa = { version = "0.7.0", path = "../.." }
2222
ndarray = { version = "0.15", features = ["approx"] }
23-
ndarray-linalg = { version = "0.15", optional = true }
23+
ndarray-linalg = { version = "0.16", optional = true }
2424
linfa-linalg = { version = "0.1", default-features = false }
2525
ndarray-stats = "0.5"
2626
thiserror = "1.0"
@@ -29,7 +29,7 @@ ndarray-rand = { version = "0.14" }
2929
unicode-normalization = "0.1.8"
3030
regex = "1.4.5"
3131
encoding = "0.2"
32-
sprs = { version="0.11.0", default-features = false }
32+
sprs = { version = "0.11.0", default-features = false }
3333

3434
serde_regex = { version = "1.1", optional = true }
3535

@@ -41,9 +41,12 @@ default-features = false
4141
features = ["std", "derive"]
4242

4343
[dev-dependencies]
44-
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = ["diabetes", "winequality"] }
44+
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = [
45+
"diabetes",
46+
"winequality",
47+
] }
4548
linfa-bayes = { version = "0.7.0", path = "../linfa-bayes" }
46-
iai = "0.1"
49+
iai = "0.1"
4750
curl = "0.4.35"
4851
flate2 = "1.0.20"
4952
tar = "0.4.33"
@@ -65,4 +68,4 @@ harness = false
6568

6669
[[bench]]
6770
name = "norm_scaler_bench"
68-
harness = false
71+
harness = false

‎algorithms/linfa-reduction/Cargo.toml

+12-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,13 @@ license = "MIT OR Apache-2.0"
99
repository = "https://github.com/rust-ml/linfa"
1010
readme = "README.md"
1111

12-
keywords = ["reduction", "machine-learning", "linfa", "spectral", "unsupervised"]
12+
keywords = [
13+
"reduction",
14+
"machine-learning",
15+
"linfa",
16+
"spectral",
17+
"unsupervised",
18+
]
1319
categories = ["algorithms", "mathematics", "science"]
1420

1521
[features]
@@ -27,7 +33,7 @@ features = ["std", "derive"]
2733
[dependencies]
2834
ndarray = { version = "0.15", features = ["approx"] }
2935
linfa-linalg = { version = "0.1" }
30-
ndarray-linalg = { version = "0.15", optional = true }
36+
ndarray-linalg = { version = "0.16", optional = true }
3137
ndarray-rand = "0.14"
3238
num-traits = "0.2"
3339
thiserror = "1.0"
@@ -38,5 +44,8 @@ linfa-kernel = { version = "0.7.0", path = "../linfa-kernel" }
3844

3945
[dev-dependencies]
4046
ndarray-npy = { version = "0.8", default-features = false }
41-
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = ["iris", "generate"] }
47+
linfa-datasets = { version = "0.7.0", path = "../../datasets", features = [
48+
"iris",
49+
"generate",
50+
] }
4251
approx = { version = "0.4" }

0 commit comments

Comments
 (0)