Skip to content

Commit 820b5b2

Browse files
Share the rust dependencies at the workspace level. (#227)
1 parent 43c5c54 commit 820b5b2

File tree

5 files changed

+122
-74
lines changed

5 files changed

+122
-74
lines changed

rust/Cargo.toml

+50-2
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,60 @@ repository = "https://github.com/kyutai-labs/moshi"
1616
keywords = ["machine-learning", "audio"]
1717
categories = ["science"]
1818

19-
2019
[workspace.dependencies]
20+
anyhow = "1"
21+
axum = { version = "0.7.3", features = ["ws"] }
22+
axum-server = { version = "0.6", features = ["tls-rustls"] }
23+
base64ct = { version = "1.6.0", features = ["alloc"] }
24+
bincode = "1.3.3"
25+
byteorder = "1.5.0"
2126
candle = { version = "0.8.2", package = "candle-core" }
27+
candle-flash-attn = "0.8.2"
2228
candle-nn = "0.8.2"
2329
candle-transformers = "0.8.2"
24-
candle-flash-attn = "0.8.2"
30+
clap = { version = "4.4.12", features = ["derive"] }
31+
color-eyre = "0.6.2"
32+
cpal = "0.15.3"
33+
crossterm = { version = "0.27.0", features = ["event-stream"] }
34+
env_logger = "0.10.1"
35+
futures = "0.3.28"
36+
futures-util = "0.3.30"
37+
hf-hub = { version = "0.3.2", features = ["tokio"] }
38+
http = "1.1.0"
39+
lazy_static = "1.5.0"
40+
log = "0.4.20"
41+
moshi = { path = "./moshi-core", version = "0.5.2" }
42+
native-tls = "0.2.11"
43+
numpy = "0.23.0"
44+
ogg = { version = "0.9.1", features = ["async"] }
45+
opus = "0.3.0"
46+
pyo3 = "0.23.0"
47+
rand = { version = "0.8.5", features = ["getrandom"] }
48+
rand_chacha = "0.3.1"
49+
ratatui = "0.27.0"
50+
rayon = "1.8.1"
51+
rcgen = "0.13.1"
52+
regex = "1.10.3"
53+
rubato = "0.15.0"
54+
rustls = "0.23.5"
55+
sentencepiece = "0.11.2"
56+
serde = { version = "1.0", features = ["derive"] }
57+
serde_json = "1.0.115"
58+
sha3 = "0.10.8"
59+
symphonia = { version = "0.5.3", features = ["all"] }
60+
tokenizers = "0.15.2"
61+
tokio = { version = "1.35.1", features = ["full"] }
62+
tokio-rustls = "0.24.1"
63+
tokio-tungstenite = { version = "0.21.0", features = ["rustls", "native-tls"] }
64+
toml = "0.8.19"
65+
tower = "0.4.13"
66+
tower-http = { version = "0.5", features = ["full"] }
67+
tracing = "0.1.40"
68+
tracing-appender = "0.2.3"
69+
tracing-chrome = "0.7.2"
70+
tracing-subscriber = "0.3.18"
71+
tui-logger = "0.11.2"
72+
vergen = { version = "8.3.1", features = ["build", "cargo", "git", "gitcl", "rustc", "si"] }
2573

2674
[profile.release]
2775
debug = true

rust/mimi-pyo3/Cargo.toml

+4-4
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ name = "rustymimi"
1313
crate-type = ["cdylib"]
1414

1515
[dependencies]
16-
anyhow = "1"
17-
numpy = "0.23.0"
18-
pyo3 = "0.23.0"
19-
moshi = { path = "../moshi-core", version = "0.5.2" }
16+
anyhow = { workspace = true }
17+
numpy = { workspace = true }
18+
pyo3 = { workspace = true }
19+
moshi = { workspace = true }

rust/moshi-backend/Cargo.toml

+37-37
Original file line numberDiff line numberDiff line change
@@ -9,48 +9,48 @@ categories.workspace = true
99
license.workspace = true
1010

1111
[dependencies]
12-
anyhow = "1"
13-
axum = { version = "0.7.3", features = ["ws"] }
14-
axum-server = { version = "0.6", features = ["tls-rustls"] }
15-
base64ct = { version = "1.6.0", features = ["alloc"] }
16-
bincode = "1.3.3"
17-
byteorder = "1.5.0"
12+
anyhow = { workspace = true }
13+
axum = { workspace = true }
14+
axum-server = { workspace = true }
15+
base64ct = { workspace = true }
16+
bincode = { workspace = true }
17+
byteorder = { workspace = true }
1818
candle = { workspace = true }
1919
candle-nn = { workspace = true }
2020
candle-transformers = { workspace = true }
21-
clap = { version = "4.4.12", features = ["derive"] }
22-
env_logger = "0.10.1"
23-
futures-util = "0.3.30"
24-
hf-hub = { version = "0.3.2", features = ["tokio"] }
25-
rcgen = "0.13.1"
26-
http = "1.1.0"
27-
lazy_static = "1.5.0"
28-
log = "0.4.20"
29-
moshi = { path = "../moshi-core", version = "0.5.2" }
30-
ogg = { version = "0.9.1", features = ["async"] }
31-
opus = "0.3.0"
32-
rand = { version = "0.8.5", features = ["getrandom"] }
33-
rand_chacha = "0.3.1"
34-
regex = "1.10.3"
35-
rubato = "0.15.0"
36-
sentencepiece = "0.11.2"
37-
serde = { version = "1.0", features = ["derive"] }
38-
serde_json = "1.0.115"
39-
sha3 = "0.10.8"
40-
symphonia = { version = "0.5.3", features = ["all"] }
41-
tokenizers = "0.15.2"
42-
tokio = { version = "1.35.1", features = ["full"] }
43-
tokio-rustls = "0.24.1"
44-
tower = "0.4.13"
45-
tower-http = { version = "0.5", features = ["full"] }
46-
tracing = "0.1.40"
47-
tracing-appender = "0.2.3"
48-
tracing-chrome = "0.7.2"
49-
tracing-subscriber = "0.3.18"
21+
clap = { workspace = true }
22+
env_logger = { workspace = true }
23+
futures-util = { workspace = true }
24+
hf-hub = { workspace = true }
25+
rcgen = { workspace = true }
26+
http = { workspace = true }
27+
lazy_static = { workspace = true }
28+
log = { workspace = true }
29+
moshi = { workspace = true }
30+
ogg = { workspace = true }
31+
opus = { workspace = true }
32+
rand = { workspace = true }
33+
rand_chacha = { workspace = true }
34+
regex = { workspace = true }
35+
rubato = { workspace = true }
36+
sentencepiece = { workspace = true }
37+
serde = { workspace = true }
38+
serde_json = { workspace = true }
39+
sha3 = { workspace = true }
40+
symphonia = { workspace = true }
41+
tokenizers = { workspace = true }
42+
tokio = { workspace = true }
43+
tokio-rustls = { workspace = true }
44+
tower = { workspace = true }
45+
tower-http = { workspace = true }
46+
tracing = { workspace = true }
47+
tracing-appender = { workspace = true }
48+
tracing-chrome = { workspace = true }
49+
tracing-subscriber = { workspace = true }
5050

5151
[build-dependencies]
52-
anyhow = "1"
53-
vergen = { version = "8.3.1", features = ["build", "cargo", "git", "gitcl", "rustc", "si"] }
52+
anyhow = { workspace = true }
53+
vergen = { workspace = true }
5454

5555
[features]
5656
default = []

rust/moshi-cli/Cargo.toml

+28-28
Original file line numberDiff line numberDiff line change
@@ -9,37 +9,37 @@ categories.workspace = true
99
license.workspace = true
1010

1111
[dependencies]
12-
anyhow = "1.0"
13-
byteorder = "1.5.0"
12+
anyhow = { workspace = true }
13+
byteorder = { workspace = true }
1414
candle = { workspace = true }
1515
candle-nn = { workspace = true }
1616
candle-transformers = { workspace = true }
17-
clap = { version = "4.2.4", features = ["derive"] }
18-
color-eyre = "0.6.2"
19-
cpal = "0.15.3"
20-
crossterm = { version = "0.27.0", features = ["event-stream"] }
21-
env_logger = "0.10.1"
22-
futures = "0.3.28"
23-
futures-util = "0.3.30"
24-
log = "0.4.20"
25-
moshi = { path = "../moshi-core", version = "0.5.2" }
26-
native-tls = "0.2.11"
27-
ogg = { version = "0.9.1", features = ["async"] }
28-
opus = "0.3.0"
29-
rand = "0.8.5"
30-
ratatui = "0.27.0"
31-
rubato = "0.15.0"
32-
rustls = "0.23.5"
33-
sentencepiece = "0.11.2"
34-
serde_json = "1.0.115"
35-
symphonia = { version = "0.5.3", features = ["all"] }
36-
tokio = { version = "1.0", features = ["full"] }
37-
tokio-tungstenite = { version = "0.21.0", features = ["rustls", "native-tls"] }
38-
toml = "0.8.19"
39-
tracing = "0.1.40"
40-
tracing-chrome = "0.7.1"
41-
tracing-subscriber = "0.3.18"
42-
tui-logger = "0.11.2"
17+
clap = { workspace = true }
18+
color-eyre = { workspace = true }
19+
cpal = { workspace = true }
20+
crossterm = { workspace = true }
21+
env_logger = { workspace = true }
22+
futures = { workspace = true }
23+
futures-util = { workspace = true }
24+
log = { workspace = true }
25+
moshi = { workspace = true }
26+
native-tls = { workspace = true }
27+
ogg = { workspace = true }
28+
opus = { workspace = true }
29+
rand = { workspace = true }
30+
ratatui = { workspace = true }
31+
rubato = { workspace = true }
32+
rustls = { workspace = true }
33+
sentencepiece = { workspace = true }
34+
serde_json = { workspace = true }
35+
symphonia = { workspace = true }
36+
tokio = { workspace = true }
37+
tokio-tungstenite = { workspace = true }
38+
toml = { workspace = true }
39+
tracing = { workspace = true }
40+
tracing-chrome = { workspace = true }
41+
tracing-subscriber = { workspace = true }
42+
tui-logger = { workspace = true }
4343

4444
[features]
4545
default = []

rust/moshi-core/Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@ candle-nn = { workspace = true }
1515
candle-transformers = { workspace = true }
1616
candle-flash-attn = { workspace = true, optional = true }
1717

18-
rayon = "1.8.1"
19-
serde = { version = "1.0", features = ["derive"] }
20-
tracing = "0.1.40"
18+
rayon = { workspace = true }
19+
serde = { workspace = true }
20+
tracing = { workspace = true }
2121

2222
[features]
2323
default = []

0 commit comments

Comments
 (0)