diff --git a/Cargo.toml b/Cargo.toml index c11110527..aaa3c74b5 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -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" } diff --git a/benchmarks/Cargo.toml b/benchmarks/Cargo.toml index 94a4ffae8..4cba0c9b6 100644 --- a/benchmarks/Cargo.toml +++ b/benchmarks/Cargo.toml @@ -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", @@ -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]] diff --git a/crates/cubek-attention/Cargo.toml b/crates/cubek-attention/Cargo.toml index 8f12b28da..c10423107 100644 --- a/crates/cubek-attention/Cargo.toml +++ b/crates/cubek-attention/Cargo.toml @@ -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" diff --git a/crates/cubek-convolution/Cargo.toml b/crates/cubek-convolution/Cargo.toml index f86e969ec..7a500cefa 100644 --- a/crates/cubek-convolution/Cargo.toml +++ b/crates/cubek-convolution/Cargo.toml @@ -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" diff --git a/crates/cubek-fft/Cargo.toml b/crates/cubek-fft/Cargo.toml index 9e282cdb5..470736564 100644 --- a/crates/cubek-fft/Cargo.toml +++ b/crates/cubek-fft/Cargo.toml @@ -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" diff --git a/crates/cubek-interpolate/Cargo.toml b/crates/cubek-interpolate/Cargo.toml index c521aee11..dc6db9741 100644 --- a/crates/cubek-interpolate/Cargo.toml +++ b/crates/cubek-interpolate/Cargo.toml @@ -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"] } diff --git a/crates/cubek-matmul/Cargo.toml b/crates/cubek-matmul/Cargo.toml index f9b3361b8..e75570e7d 100644 --- a/crates/cubek-matmul/Cargo.toml +++ b/crates/cubek-matmul/Cargo.toml @@ -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"] } @@ -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" diff --git a/crates/cubek-pool/Cargo.toml b/crates/cubek-pool/Cargo.toml index ef1271fa6..6baf1ae70 100644 --- a/crates/cubek-pool/Cargo.toml +++ b/crates/cubek-pool/Cargo.toml @@ -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"] } diff --git a/crates/cubek-quant/Cargo.toml b/crates/cubek-quant/Cargo.toml index e8e2d9093..b22683e3e 100644 --- a/crates/cubek-quant/Cargo.toml +++ b/crates/cubek-quant/Cargo.toml @@ -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 } diff --git a/crates/cubek-reduce/Cargo.toml b/crates/cubek-reduce/Cargo.toml index 229e576bf..97386c1d9 100644 --- a/crates/cubek-reduce/Cargo.toml +++ b/crates/cubek-reduce/Cargo.toml @@ -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" } diff --git a/crates/cubek-resample/Cargo.toml b/crates/cubek-resample/Cargo.toml index b6f83f9e6..434bf7359 100644 --- a/crates/cubek-resample/Cargo.toml +++ b/crates/cubek-resample/Cargo.toml @@ -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 } diff --git a/crates/cubek-std/Cargo.toml b/crates/cubek-std/Cargo.toml index db0904687..2c73c5780 100644 --- a/crates/cubek-std/Cargo.toml +++ b/crates/cubek-std/Cargo.toml @@ -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 } diff --git a/crates/cubek-test-utils/Cargo.toml b/crates/cubek-test-utils/Cargo.toml index 797128515..1f41d7c52 100644 --- a/crates/cubek-test-utils/Cargo.toml +++ b/crates/cubek-test-utils/Cargo.toml @@ -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 } diff --git a/crates/cubek-tile/Cargo.toml b/crates/cubek-tile/Cargo.toml index 04bebdc58..5d102f7ec 100644 --- a/crates/cubek-tile/Cargo.toml +++ b/crates/cubek-tile/Cargo.toml @@ -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" diff --git a/crates/cubek/Cargo.toml b/crates/cubek/Cargo.toml index e9e8a4816..cec19044d 100644 --- a/crates/cubek/Cargo.toml +++ b/crates/cubek/Cargo.toml @@ -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 }