Skip to content

Commit

Permalink
DRY dependencies
Browse files Browse the repository at this point in the history
  • Loading branch information
@relf
relf committed Jan 2, 2025
1 parent 1fd2c7e commit 5558af5
Show file tree
Hide file tree
Showing 7 changed files with 124 additions and 110 deletions.
16 changes: 0 additions & 16 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,32 @@ exclude = [".github/"]
[workspace.metadata.release]
shared-version = true
tag-name = "{{version}}"

[workspace.dependencies]
linfa = { version = "0.7", default-features = false }

ndarray = { version = "0.15", features = ["rayon", "approx"] }
ndarray-rand = "0.14"
ndarray-stats = "0.5"
ndarray-npy = "0.8"

num-traits = "0.2"

thiserror = "1"
anyhow = "1"
rayon = "1"

rand_xoshiro = "0.6"
finitediff = { version = "0.1.4", features = ["ndarray"] }
env_logger = "0.11"
log = "0.4"

serde = "1"
serde_json = "1"

ctrlc = "3.4"

# dev dependencies
criterion = "0.5"
approx = "0.4"
argmin_testfunctions = "0.2"
31 changes: 16 additions & 15 deletions crates/doe/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,38 +1,39 @@
[package]
name = "egobox-doe"
version = "0.25.0"
authors = ["Rémi Lafage <[email protected]>"]
edition = "2021"
authors.workspace = true
version.workspace = true
license.workspace = true
edition.workspace = true
homepage.workspace = true
description = "A library for design of experiments"
license = "Apache-2.0"
repository = "https://github.com/relf/egobox"
repository = "https://github.com/relf/egobox/crates/doe"
keywords = [
"machine-learning",
"design",
"experiments",
"lhs",
"full-factorial",
]
categories = ["algorithms", "mathematics", "science"]
readme = "README.md"

[features]
default = []

serializable = ["serde", "rand_xoshiro/serde1"]

[dependencies]
linfa = { version = "0.7", default-features = false }
ndarray = { version = "0.15", features = ["rayon", "approx"] }
ndarray-stats = "0.5"
ndarray-rand = "0.14"
rand_xoshiro = "0.6"
num-traits = "0.2"
linfa.workspace = true
ndarray.workspace = true
ndarray-rand.workspace = true
ndarray-stats.workspace = true
num-traits.workspace = true
rand_xoshiro.workspace = true
serde = { version = "1", optional = true }

[dev-dependencies]
criterion = "0.5"
serde_json = "1"
approx = "0.4"
criterion.workspace = true
serde_json.workspace = true
approx.workspace = true

[[bench]]
name = "lhs"
Expand Down
42 changes: 21 additions & 21 deletions crates/ego/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "egobox-ego"
version = "0.25.0"
authors = ["Rémi Lafage <[email protected]>"]
edition = "2021"
authors.workspace = true
version.workspace = true
license.workspace = true
edition.workspace = true
homepage.workspace = true
description = "A library for efficient global optimization"
license = "Apache-2.0"
repository = "https://github.com/relf/egobox"
repository = "https://github.com/relf/egobox/crates/ego"
keywords = ["machine-learning", "bayesian", "optimization"]
categories = ["algorithms", "mathematics", "science"]

Expand All @@ -24,16 +25,16 @@ egobox-moe = { version = "0.25.0", path = "../moe", features = [
"serializable",
] }

linfa = { version = "0.7", default-features = false }
linfa.workspace = true
linfa-pls = { version = "0.7", default-features = false }
linfa-linalg = { version = "0.1", default-features = false }

ndarray = { version = "0.15", features = ["rayon", "approx"] }
ndarray.workspace = true
ndarray-linalg = { version = "0.15", optional = true }
ndarray-stats = "0.5"
ndarray-rand = "0.14"
ndarray-npy = "0.8"
rayon = "1"
ndarray-stats.workspace = true
ndarray-rand.workspace = true
ndarray-npy.workspace = true
rayon.workspace = true

cobyla = { version = "0.6" }
slsqp = { version = "0.1" }
Expand All @@ -44,25 +45,24 @@ argmin = { version = "0.10.0", features = ["serde1", "ctrlc"] }
bincode = { version = "1.3.0" }
web-time = "1.1.0"
libm = "0.2.6"
finitediff = { version = "0.1", features = ["ndarray"] }
finitediff.workspace = true
# sort-axis
rawpointer = { version = "0.2" }
log = "0.4"
env_logger = "0.11.3"
thiserror = "1"
anyhow = "1"
log.workspace = true
env_logger.workspace = true
thiserror.workspace = true
anyhow.workspace = true
clap = { version = "4", features = ["derive"] }

serde = { version = "1", features = ["derive", "rc"] }
serde_json = "1"
serde_json.workspace = true
typetag = { version = "0.2" }
dyn-clonable = { version = "0.9" }


[dev-dependencies]
criterion = "0.5"
approx = "0.4"
argmin_testfunctions = "0.2"
criterion.workspace = true
approx.workspace = true
argmin_testfunctions.workspace = true
serial_test = "3.1.0"

[[bench]]
Expand Down
45 changes: 25 additions & 20 deletions crates/gp/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "egobox-gp"
version = "0.25.0"
authors = ["Rémi Lafage <[email protected]>"]
edition = "2021"
authors.workspace = true
version.workspace = true
license.workspace = true
edition.workspace = true
homepage.workspace = true
description = "A library for gaussian process modeling"
license = "Apache-2.0"
repository = "https://github.com/relf/egobox"
repository = "https://github.com/relf/egobox/crates/gp"
keywords = ["machine-learning", "gaussian-process", "kriging", "surrogate"]
categories = ["algorithms", "mathematics", "science"]

Expand All @@ -20,36 +21,40 @@ blas = ["ndarray-linalg", "linfa/ndarray-linalg", "linfa-pls/blas"]
[dependencies]
egobox-doe = { version = "0.25.0", path = "../doe" }

linfa = { version = "0.7", default-features = false }
linfa.workspace = true
linfa-pls = { version = "0.7", default-features = false }
linfa-linalg = { version = "0.1", default-features = false }

ndarray = { version = "0.15", features = ["rayon", "approx"] }
ndarray.workspace = true
ndarray-stats.workspace = true
ndarray-rand.workspace = true

num-traits.workspace = true

rand_xoshiro.workspace = true
thiserror.workspace = true
log.workspace = true
rayon.workspace = true

ndarray-linalg = { version = "0.15", optional = true }
ndarray-stats = "0.5"
ndarray_einsum_beta = "0.7"
ndarray-rand = "0.14"
ndarray-npy = "0.8"

ndarray-npy.workspace = true
nlopt = { version = "0.7.0", optional = true }
cobyla = { version = "0.6" }
rand_xoshiro = "0.6"
paste = "1.0"
num-traits = "0.2"
thiserror = "1"
log = "0.4"
rayon = "1"

serde = { version = "1", features = ["derive"], optional = true }
serde_json = { version = "1", optional = true }
typetag = { version = "0.2", optional = true }

finitediff = { version = "0.1", features = ["ndarray"] }
finitediff.workspace = true

[dev-dependencies]
criterion = "0.5"
serde_json = "1"
approx = "0.4"
argmin_testfunctions = "0.2"
criterion.workspace = true
serde_json.workspace = true
approx.workspace = true
argmin_testfunctions.workspace = true

[[bench]]
name = "gp"
Expand Down
38 changes: 19 additions & 19 deletions crates/moe/Cargo.toml
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,12 @@
[package]
name = "egobox-moe"
version = "0.25.0"
authors = ["Rémi Lafage <[email protected]>"]
edition = "2021"
authors.workspace = true
version.workspace = true
license.workspace = true
edition.workspace = true
homepage.workspace = true
description = "A library for mixture of expert gaussian processes"
license = "Apache-2.0"
repository = "https://github.com/relf/egobox"
repository = "https://github.com/relf/egobox/crates/moe"
keywords = [
"machine-learning",
"mixture",
Expand All @@ -32,22 +33,22 @@ blas = ["ndarray-linalg", "linfa/ndarray-linalg", "linfa-pls/blas"]
egobox-doe = { version = "0.25.0", path = "../doe" }
egobox-gp = { version = "0.25.0", path = "../gp" }

linfa = { version = "0.7", default-features = false }
linfa.workspace = true
linfa-clustering = { version = "0.7", default-features = false }
linfa-pls = { version = "0.7", default-features = false }
linfa-linalg = { version = "0.1", default-features = false }

ndarray = { version = "0.15", features = ["rayon", "approx"] }
ndarray.workspace = true
ndarray-linalg = { version = "0.15", optional = true }
ndarray-stats = "0.5"
ndarray-rand = "0.14"
ndarray-npy = "0.8"
rand_xoshiro = "0.6"
ndarray-stats.workspace = true
ndarray-rand.workspace = true
ndarray-npy.workspace = true
rand_xoshiro.workspace = true
paste = "1.0"
bitflags = { version = "2.4.1", features = ["serde"] }
log = "0.4"
env_logger = "0.11.3"
thiserror = "1"
log.workspace = true
env_logger.workspace = true
thiserror.workspace = true

serde = { version = "1", features = ["derive"], optional = true }
serde_json = { version = "1", optional = true }
Expand All @@ -56,13 +57,12 @@ bincode = { version = "1.3.3", optional = true }
typetag = { version = "0.2", optional = true }

[dev-dependencies]
criterion = "0.5"
approx = "0.4"
ndarray-npy = "0.8"
criterion.workspace = true
approx.workspace = true
ndarray-npy.workspace = true
ndarray-csv = "0.5"
csv = "1.1"
argmin_testfunctions = "0.2"
rand_isaac = "0.3"
argmin_testfunctions.workspace = true

[[bench]]
name = "bench_find_nb_clusters"
Expand Down
Loading

0 comments on commit 5558af5

Please sign in to comment.