Skip to content

Define internal crates once in workspace.dependencies #520

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ThierryCantin-Demers wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Define internal crates once in workspace.dependencies #520

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 18 additions & 0 deletions Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,24 @@ cubecl-environment = { git = "https://github.com/tracel-ai/cubecl", rev = "3b3e3
# cubecl-common = { version = "=0.11.0-pre.2", default-features = false }
# cubecl-environment = { version = "=0.11.0-pre.2", default-features = false }

### Internal cubek crates ###
# Declared here so each consumer Cargo.toml can use `workspace = true` instead of
# repeating the path and version.
cubek = { path = "crates/cubek", version = "=0.3.0-pre.2", default-features = false }
cubek-attention = { path = "crates/cubek-attention", version = "=0.3.0-pre.2", default-features = false }
cubek-convolution = { path = "crates/cubek-convolution", version = "=0.3.0-pre.2", default-features = false }
cubek-fft = { path = "crates/cubek-fft", version = "=0.3.0-pre.2", default-features = false }
cubek-interpolate = { path = "crates/cubek-interpolate", version = "=0.3.0-pre.2", default-features = false }
cubek-matmul = { path = "crates/cubek-matmul", version = "=0.3.0-pre.2", default-features = false }
cubek-pool = { path = "crates/cubek-pool", version = "=0.3.0-pre.2", default-features = false }
cubek-quant = { path = "crates/cubek-quant", version = "=0.3.0-pre.2", default-features = false }
cubek-random = { path = "crates/cubek-random", version = "=0.3.0-pre.2", default-features = false }
cubek-reduce = { path = "crates/cubek-reduce", version = "=0.3.0-pre.2", default-features = false }
cubek-resample = { path = "crates/cubek-resample", version = "=0.3.0-pre.2", default-features = false }
cubek-std = { path = "crates/cubek-std", version = "=0.3.0-pre.2", default-features = false }
cubek-test-utils = { path = "crates/cubek-test-utils", version = "=0.3.0-pre.2", default-features = false }
cubek-tile = { path = "crates/cubek-tile", version = "=0.3.0-pre.2", default-features = false }

derive-new = { version = "0.7.0", default-features = false }
log = { default-features = false, version = "0.4.22" }

Expand Down
23 changes: 12 additions & 11 deletions benchmarks/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,7 @@ cpu-reference = [
path = "src/lib.rs"

[dependencies]
cubecl = { workspace = true, features = ["test-runtime", "stdlib"] }
cubek = { path = "../crates/cubek", version = "=0.3.0-pre.2", default-features = false, features = [
cubek = { workspace = true, features = [
"stdlib",
"random",
"reduce",
Expand All @@ -45,31 +44,33 @@ cubek = { path = "../crates/cubek", version = "=0.3.0-pre.2", default-features =
"fft",
"quantization",
] }
cubek-attention = { path = "../crates/cubek-attention", version = "=0.3.0-pre.2", features = [
cubek-attention = { workspace = true, default-features = true, features = [
"benchmarks",
] }
cubek-convolution = { path = "../crates/cubek-convolution", version = "=0.3.0-pre.2", features = [
cubek-convolution = { workspace = true, default-features = true, features = [
"benchmarks",
] }
cubek-fft = { path = "../crates/cubek-fft", version = "=0.3.0-pre.2", features = [
cubek-fft = { workspace = true, default-features = true, features = [
"benchmarks",
] }
cubek-interpolate = { path = "../crates/cubek-interpolate", version = "=0.3.0-pre.2", features = [
cubek-interpolate = { workspace = true, default-features = true, features = [
"benchmarks",
] }
cubek-matmul = { path = "../crates/cubek-matmul", version = "=0.3.0-pre.2", features = [
cubek-matmul = { workspace = true, default-features = true, features = [
"benchmarks",
] }
cubek-pool = { path = "../crates/cubek-pool", version = "=0.3.0-pre.2", features = [
cubek-pool = { workspace = true, default-features = true, features = [
"benchmarks",
] }
cubek-reduce = { path = "../crates/cubek-reduce", version = "=0.3.0-pre.2", features = [
cubek-reduce = { workspace = true, default-features = true, features = [
"benchmarks",
] }
cubek-std = { path = "../crates/cubek-std", version = "=0.3.0-pre.2", features = [
cubek-std = { workspace = true, default-features = true, features = [
"benchmarks",
] }
cubek-test-utils = { path = "../crates/cubek-test-utils", version = "=0.3.0-pre.2" }
cubek-test-utils = { workspace = true, default-features = true }

cubecl = { workspace = true, features = ["test-runtime", "stdlib"] }
half = { workspace = true }

[[bench]]
Expand Down
15 changes: 8 additions & 7 deletions crates/cubek-attention/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,19 +27,20 @@ cpu-reference = ["dep:cubek-test-utils"]
benchmarks = ["cpu-reference", "cubecl/test-runtime"]

[dependencies]
cubecl = { workspace = true, features = ["stdlib"] }
cubecl-common = { workspace = true }
cubek-matmul = { path = "../cubek-matmul", version = "=0.3.0-pre.2", default-features = false }
cubek-std = { path = "../cubek-std", version = "=0.3.0-pre.2", default-features = false }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-matmul = { workspace = true }
cubek-std = { workspace = true }
cubek-test-utils = { workspace = true, optional = true }

bytemuck = { workspace = true }
cubecl = { workspace = true, features = ["stdlib"] }
cubecl-common = { workspace = true }
half = { workspace = true, features = ["bytemuck"] }
serde = { workspace = true }

[dev-dependencies]
cubecl = { workspace = true, features = ["test-runtime"] }
cubek-attention = { path = ".", features = ["benchmarks"] }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false }
cubek-test-utils = { workspace = true }

cubecl = { workspace = true, features = ["test-runtime"] }
pretty_assertions = { workspace = true }
trybuild = "1"
15 changes: 8 additions & 7 deletions crates/cubek-convolution/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,21 +25,22 @@ cpu-reference = ["dep:cubek-test-utils", "cubek-matmul/cpu-reference"]
benchmarks = ["cpu-reference", "cubecl/test-runtime"]

[dependencies]
cubek-matmul = { workspace = true }
cubek-std = { workspace = true }
cubek-test-utils = { workspace = true, optional = true }

bytemuck = { workspace = true }
cubecl = { workspace = true, features = ["stdlib"] }
cubecl-common = { workspace = true }
cubek-matmul = { path = "../cubek-matmul", default-features = false, version = "=0.3.0-pre.2" }
cubek-std = { path = "../cubek-std", default-features = false, version = "=0.3.0-pre.2" }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false, optional = true }
derive-new = { workspace = true }

bytemuck = { workspace = true }
enumset = { workspace = true }
half = { workspace = true, features = ["bytemuck"] }
serde = { workspace = true }

[dev-dependencies]
cubecl = { workspace = true, features = ["test-runtime"] }
cubek-convolution = { path = ".", features = ["cpu-reference"] }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false }
cubek-test-utils = { workspace = true }

cubecl = { workspace = true, features = ["test-runtime"] }
pretty_assertions = { workspace = true }
trybuild = "1"
10 changes: 6 additions & 4 deletions crates/cubek-fft/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,15 @@ cpu-reference = ["dep:num-complex", "dep:cubek-test-utils"]
benchmarks = ["cpu-reference", "cubecl/test-runtime"]

[dependencies]
cubek-test-utils = { workspace = true, optional = true }

cubecl = { workspace = true }
cubek-test-utils = { path = "./../cubek-test-utils/", version = "=0.3.0-pre.2", default-features = false, optional = true }
num-complex = { version = "0.4.6", optional = true }

[dev-dependencies]
num-complex = "0.4.6"
cubek-fft = { path = ".", features = ["cpu-reference"] }
cubek-test-utils = { workspace = true }

cubecl = { workspace = true, features = ["test-runtime"] }
cubecl-common = { workspace = true }
cubek-fft = { path = ".", features = ["cpu-reference"] }
cubek-test-utils = { path = "./../cubek-test-utils/", version = "=0.3.0-pre.2", default-features = false }
num-complex = "0.4.6"
10 changes: 6 additions & 4 deletions crates/cubek-interpolate/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,14 +25,16 @@ cpu-reference = ["dep:cubek-test-utils"]
benchmarks = ["cpu-reference", "cubecl/test-runtime"]

[dependencies]
cubek-test-utils = { workspace = true, optional = true }

cubecl = { workspace = true }
cubecl-common = { workspace = true }
half = { workspace = true }
thiserror = { workspace = true }
cubek-test-utils = { path = "./../cubek-test-utils/", version = "=0.3.0-pre.2", default-features = false, optional = true }
serde = { workspace = true }
thiserror = { workspace = true }

[dev-dependencies]
cubecl = { workspace = true, features = ["test-runtime"] }
cubek-interpolate = { path = ".", features = ["cpu-reference"] }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false }
cubek-test-utils = { workspace = true }

cubecl = { workspace = true, features = ["test-runtime"] }
19 changes: 8 additions & 11 deletions crates/cubek-matmul/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,10 @@ cpu-reference = ["dep:cubek-test-utils", "cubek-std/testing"]
benchmarks = ["cpu-reference", "dep:cubek-quant", "cubecl/test-runtime"]

[dependencies]
cubek-quant = { path = "../cubek-quant", version = "=0.3.0-pre.2", default-features = false, features = [
"kernels",
], optional = true }
cubek-std = { path = "../cubek-std", version = "=0.3.0-pre.2", default-features = false }
cubek-tile = { path = "../cubek-tile", version = "=0.3.0-pre.2", default-features = false }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-quant = { workspace = true, features = ["kernels"], optional = true }
cubek-std = { workspace = true }
cubek-test-utils = { workspace = true, optional = true }
cubek-tile = { workspace = true }

bytemuck = { workspace = true }
cubecl = { workspace = true, features = ["stdlib"] }
Expand All @@ -39,11 +37,10 @@ half = { workspace = true, features = ["bytemuck"] }
serde = { workspace = true }

[dev-dependencies]
cubecl = { workspace = true, features = ["test-runtime"] }
cubek-matmul = { path = ".", features = ["cpu-reference"] }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false }
cubek-quant = { path = "../cubek-quant", version = "=0.3.0-pre.2", features = [
"kernels",
] }
cubek-quant = { workspace = true, default-features = true, features = ["kernels"] }
cubek-test-utils = { workspace = true }

cubecl = { workspace = true, features = ["test-runtime"] }
pretty_assertions = { workspace = true }
trybuild = "1"
8 changes: 5 additions & 3 deletions crates/cubek-pool/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,14 @@ benchmarks = ["cpu-reference", "cubecl/test-runtime"]
cpu-reference = ["dep:cubek-test-utils"]

[dependencies]
cubek-test-utils = { workspace = true, optional = true }

cubecl = { workspace = true }
cubecl-common = { workspace = true }
cubek-test-utils = { path = "./../cubek-test-utils/", version = "0.3.0-pre.1", default-features = false, optional = true }
thiserror = { workspace = true }

[dev-dependencies]
cubecl = { workspace = true, features = ["test-runtime"] }
cubek-pool = { path = ".", features = ["cpu-reference", "benchmarks"] }
cubek-test-utils = { path = "../cubek-test-utils", version = "0.3.0-pre.1", default-features = false }
cubek-test-utils = { workspace = true }

cubecl = { workspace = true, features = ["test-runtime"] }
7 changes: 4 additions & 3 deletions crates/cubek-quant/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,13 +20,14 @@ extended = ["heavy"]
full = ["extended"]

[dependencies]
cubek-tile = { workspace = true }

cubecl = { workspace = true, features = ["stdlib"] }
cubecl-common = { workspace = true, features = ["fp8"] }
cubek-tile = { path = "../cubek-tile", version = "=0.3.0-pre.2", default-features = false }

half.workspace = true
serde = { workspace = true }

[dev-dependencies]
cubek-test-utils = { workspace = true }

cubecl = { workspace = true, features = ["test-runtime"] }
cubek-test-utils = { path = "../cubek-test-utils", default-features = false }
13 changes: 7 additions & 6 deletions crates/cubek-reduce/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,18 +29,19 @@ cpu-reference = ["dep:cubek-test-utils"]
benchmarks = ["cpu-reference", "cubecl/test-runtime"]

[dependencies]
cubecl = { workspace = true }
cubek-std = { path = "../cubek-std", version = "=0.3.0-pre.2", default-features = false }
cubek-test-utils = { path = "./../cubek-test-utils/", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-std = { workspace = true }
cubek-test-utils = { workspace = true, optional = true }

cubecl = { workspace = true }
half = { workspace = true }
num-traits = "0.2.19"
pretty_assertions = { workspace = true, optional = true }
serde = { workspace = true }
half = { workspace = true }
thiserror = { workspace = true }

[dev-dependencies]
cubek-reduce = { path = ".", features = ["cpu-reference"] }
cubek-test-utils = { workspace = true, default-features = true }

cubecl = { workspace = true, features = ["test-runtime"] }
cubecl-common = { workspace = true }
cubek-reduce = { path = ".", features = ["cpu-reference"] }
cubek-test-utils = { path = "./../cubek-test-utils/", version = "=0.3.0-pre.2" }
6 changes: 4 additions & 2 deletions crates/cubek-resample/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,11 +22,13 @@ benchmarks = ["cpu-reference", "cubecl/test-runtime"]
cpu-reference = ["cubek-test-utils"]

[dependencies]
cubek-test-utils = { workspace = true, optional = true }

cubecl = { workspace = true }
cubecl-common = { workspace = true }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false, optional = true }

[dev-dependencies]
cubek-test-utils = { workspace = true }

cubecl = { workspace = true, features = ["test-runtime"] }
cubecl-common = { workspace = true }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false }
5 changes: 3 additions & 2 deletions crates/cubek-std/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,11 @@ testing = ["dep:cubek-test-utils", "cubecl/test-runtime"]
benchmarks = ["testing"]

[dependencies]
cubek-test-utils = { workspace = true, optional = true }

cubecl = { workspace = true, features = ["stdlib"] }
cubecl-common = { workspace = true }
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false, optional = true }
half = { workspace = true, features = ["bytemuck"] }

[dev-dependencies]
cubek-test-utils = { path = "../cubek-test-utils", version = "=0.3.0-pre.2", default-features = false }
cubek-test-utils = { workspace = true }
4 changes: 2 additions & 2 deletions crates/cubek-test-utils/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,14 +21,14 @@ extended = ["heavy"]
full = ["extended"]

[dependencies]
cubek-tile = { path = "../cubek-tile", version = "=0.3.0-pre.2", default-features = false }
cubek-tile = { workspace = true }

bytemuck = { workspace = true }
cubecl = { workspace = true, features = ["stdlib", "test-runtime"] }
cubecl-common = { workspace = true, features = ["fp8"] }
half = { workspace = true, features = ["bytemuck"] }
serde = { workspace = true }
rand = { workspace = true }
serde = { workspace = true }

[dev-dependencies]
pretty_assertions = { workspace = true }
Expand Down
5 changes: 3 additions & 2 deletions crates/cubek-tile/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,8 @@ half = { workspace = true, features = ["bytemuck"] }
serde = { workspace = true }

[dev-dependencies]
cubek-quant = { path = "./../cubek-quant/", default-features = false }
cubek-test-utils = { path = "./../cubek-test-utils/", default-features = false }
cubek-quant = { workspace = true }
cubek-test-utils = { workspace = true }

pretty_assertions = { workspace = true }
trybuild = "1"
25 changes: 13 additions & 12 deletions crates/cubek/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,16 +61,17 @@ resample = ["cubek-resample"]


[dependencies]
cubek-attention = { workspace = true, optional = true }
cubek-convolution = { workspace = true, optional = true }
cubek-fft = { workspace = true, optional = true }
cubek-interpolate = { workspace = true, optional = true }
cubek-matmul = { workspace = true, optional = true }
cubek-pool = { workspace = true, optional = true }
cubek-quant = { workspace = true, optional = true }
cubek-random = { workspace = true, optional = true }
cubek-reduce = { workspace = true, optional = true }
cubek-resample = { workspace = true, optional = true }
cubek-std = { workspace = true, optional = true }
cubek-tile = { workspace = true, optional = true }

cubecl = { workspace = true }
cubek-attention = { path = "../cubek-attention", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-interpolate = { path = "../cubek-interpolate", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-pool = { path = "../cubek-pool", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-convolution = { path = "../cubek-convolution", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-matmul = { path = "../cubek-matmul", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-quant = { path = "../cubek-quant", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-random = { path = "../cubek-random", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-reduce = { path = "../cubek-reduce", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-fft = { path = "../cubek-fft", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-std = { path = "../cubek-std", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-tile = { path = "../cubek-tile", version = "=0.3.0-pre.2", default-features = false, optional = true }
cubek-resample = { path = "../cubek-resample", version = "=0.3.0-pre.2", default-features = false, optional = true }
Loading