Skip to content

Commit 3a2a1a8

Browse files
Chore update cubecl (tracel-ai#3764)
1 parent 1cf22e2 commit 3a2a1a8

File tree

13 files changed

+104
-96
lines changed

13 files changed

+104
-96
lines changed

Cargo.lock

Lines changed: 80 additions & 72 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -169,9 +169,9 @@ portable-atomic = { version = "1.11.1" }
169169
portable-atomic-util = { version = "0.2.4", features = ["alloc"] }
170170

171171
### For the main burn branch. ###
172-
cubecl = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "d4aec5dd7ef73068347eb688f2327be5605bd75b" }
173-
cubecl-common = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "d4aec5dd7ef73068347eb688f2327be5605bd75b" }
174-
cubecl-quant = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "d4aec5dd7ef73068347eb688f2327be5605bd75b" }
172+
cubecl = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "ad03f7892f4069d3406f936fd9fa3ac3b090c1fe" }
173+
cubecl-common = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "ad03f7892f4069d3406f936fd9fa3ac3b090c1fe" }
174+
cubecl-quant = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "ad03f7892f4069d3406f936fd9fa3ac3b090c1fe" }
175175
### For local development. ###
176176
# cubecl = { path = "../cubecl/crates/cubecl", default-features = false }
177177
# cubecl-common = { path = "../cubecl/crates/cubecl-common", default-features = false }

crates/burn-cpu/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ default = ["std", "fusion", "autotune", "burn-cubecl/default", "cubecl/default"]
2121
doc = ["burn-cubecl/doc"]
2222
fusion = ["burn-fusion", "burn-cubecl/fusion"]
2323
std = ["burn-cubecl/std", "cubecl/std"]
24-
compilation-cache = ["cubecl/compilation-cache"]
2524

2625
[dependencies]
2726
burn-fusion = { path = "../burn-fusion", version = "0.19.0", optional = true }

crates/burn-cubecl-fusion/src/matmul/optimization.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ use burn_ir::TensorIr;
2222
use cubecl::features::TypeUsage;
2323
use cubecl::matmul::components::AccG;
2424
use cubecl::matmul::components::AccS;
25+
use cubecl::matmul::components::tile::loader::Filled;
26+
use cubecl::matmul::kernels::layered::Selection;
2527
use cubecl::matmul::kernels::layered::double_buffering::CyclicDoubleBufferingAlgorithm;
2628
use cubecl::matmul::kernels::layered::double_buffering::DoubleBufferingArgs;
2729
use cubecl::matmul::kernels::layered::double_unit::DoubleUnitAlgorithm;
@@ -33,7 +35,6 @@ use cubecl::matmul::kernels::layered::simple::SimpleArgs;
3335
use cubecl::matmul::kernels::layered::simple_unit::SimpleUnitAlgorithm;
3436
use cubecl::matmul::kernels::layered::vecmat::DoubleVecMatAlgorithm;
3537
use cubecl::matmul::kernels::layered::vecmat::SimpleVecMatAlgorithm;
36-
use cubecl::matmul::{components::tile::reader::Filled, kernels::layered::Selection};
3738
use cubecl::matmul::{
3839
components::{LhsS, MatmulLineSizes, MatmulPrecision},
3940
kernels::layered::Algorithm,

crates/burn-cubecl-fusion/src/shared/io.rs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -248,7 +248,8 @@ pub fn input_as_linear_view<C: CubePrimitive>(
248248
#[comptime] pos: u32,
249249
) -> View<Line<C>, u32> {
250250
let slice = input_as_slice::<Line<C>>(inputs, pos);
251-
let layout = LinearLayout::new_Plain(PlainLayout::new(slice.len()));
251+
let line_size = slice.line_size();
252+
let layout = LinearLayout::new_Plain(PlainLayout::new(slice.len(), comptime!(line_size as u8)));
252253
View::new::<Slice<Line<C>>, u32>(&slice, layout)
253254
}
254255

crates/burn-cubecl/src/kernel/matmul/tune/base.rs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
use burn_tensor::DType;
22
use cubecl::{
33
matmul::{
4-
MatmulInputHandleRef, Strategy, SyncPartialReadingStrategy, SyncReadingStrategy,
4+
MatmulInputHandleRef, Strategy, SyncLoadingStrategy, SyncPartialLoadingStrategy,
55
components::{AccG, MatmulKind},
66
kernels::layered::{
77
Selection, TileSizeSelection, double_buffering::DoubleBufferingArgs,
@@ -161,7 +161,7 @@ fn matmul_simple<R: CubeRuntime, E: MatmulElement>(
161161
) -> Result<(), String> {
162162
cubecl::matmul::launch_ref::<R, E>(
163163
&Strategy::Simple(
164-
SyncReadingStrategy::Cyclic,
164+
SyncLoadingStrategy::Cyclic,
165165
Selection::Inferred(SimpleArgs { multi_rows: false }),
166166
),
167167
&lhs.client,
@@ -179,7 +179,7 @@ fn matmul_simple_multi_rows<R: CubeRuntime, E: MatmulElement>(
179179
) -> Result<(), String> {
180180
cubecl::matmul::launch_ref::<R, E>(
181181
&Strategy::Simple(
182-
SyncReadingStrategy::Cyclic,
182+
SyncLoadingStrategy::Cyclic,
183183
Selection::Inferred(SimpleArgs { multi_rows: true }),
184184
),
185185
&lhs.client,
@@ -197,7 +197,7 @@ fn matmul_double_buffering<R: CubeRuntime, E: MatmulElement>(
197197
) -> Result<(), String> {
198198
cubecl::matmul::launch_ref::<R, E>(
199199
&Strategy::DoubleBuffering(
200-
SyncPartialReadingStrategy::Tilewise,
200+
SyncPartialLoadingStrategy::Tilewise,
201201
Selection::Inferred(DoubleBufferingArgs { specialized: false }),
202202
),
203203
&lhs.client,
@@ -215,7 +215,7 @@ fn matmul_double_buffering_specialized<R: CubeRuntime, E: MatmulElement>(
215215
) -> Result<(), String> {
216216
cubecl::matmul::launch_ref::<R, E>(
217217
&Strategy::DoubleBuffering(
218-
SyncPartialReadingStrategy::Tilewise,
218+
SyncPartialLoadingStrategy::Tilewise,
219219
Selection::Inferred(DoubleBufferingArgs { specialized: true }),
220220
),
221221
&lhs.client,

crates/burn-cuda/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ default = ["std", "fusion", "autotune", "burn-cubecl/default", "cubecl/default"]
2121
doc = ["burn-cubecl/doc"]
2222
fusion = ["burn-fusion", "burn-cubecl/fusion"]
2323
std = ["burn-cubecl/std", "cubecl/std"]
24-
compilation-cache = ["cubecl/compilation-cache"]
2524

2625
[dependencies]
2726
burn-fusion = { path = "../burn-fusion", version = "0.19.0", optional = true }

crates/burn-fusion/src/stream/multi.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,12 @@ impl<R: FusionRuntime> MultiStream<R> {
311311
}
312312

313313
for id in streams_to_sync.drain() {
314+
let old = unsafe { StreamId::swap(id) };
315+
log::info!("Drain stream {id} for use in current {current}");
314316
self.resolve_stream(handles, id, nodes);
317+
unsafe {
318+
StreamId::swap(old);
319+
};
315320
}
316321
}
317322

crates/burn-rocm/Cargo.toml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ autotune = ["burn-cubecl/autotune"]
2121
autotune-checks = ["burn-cubecl/autotune-checks"]
2222
doc = ["burn-cubecl/doc"]
2323
std = ["burn-cubecl/std", "cubecl/std"]
24-
compilation-cache = ["cubecl/compilation-cache"]
2524

2625
[dependencies]
2726
cubecl = { workspace = true, features = ["hip"] }

crates/burn/Cargo.toml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -134,10 +134,6 @@ metal = ["wgpu", "burn-wgpu/metal"]
134134
wgpu = ["burn-wgpu"]
135135
cpu = ["burn-cpu"]
136136

137-
compilation-cache = [
138-
"burn-cuda?/compilation-cache",
139-
"burn-rocm?/compilation-cache",
140-
]
141137

142138
[dependencies]
143139

@@ -162,4 +158,4 @@ burn-tch = { path = "../burn-tch", version = "0.19.0", default-features = false,
162158
burn-wgpu = { path = "../burn-wgpu", version = "0.19.0", optional = true, default-features = false }
163159
burn-ir = { path = "../burn-ir", version = "0.19.0", optional = true, default-features = false }
164160

165-
cubecl = { workspace = true, default-features = false, optional = true }
161+
cubecl = { workspace = true, default-features = false, optional = true }

0 commit comments

Comments
 (0)