From c1f9f1be44b477d1476f680c6b70f278420e5771 Mon Sep 17 00:00:00 2001 From: nathaniel Date: Wed, 8 Jan 2025 14:46:47 -0500 Subject: [PATCH] Fix --- Cargo.lock | 12 ------------ Cargo.toml | 8 ++++---- .../burn-jit/src/kernel/conv/conv2d/tune/conv2d.rs | 12 +----------- crates/burn-jit/src/kernel/conv/error.rs | 1 + 4 files changed, 6 insertions(+), 27 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3a77efca50..3e5751ed8c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1637,7 +1637,6 @@ dependencies = [ [[package]] name = "cubecl" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "cubecl-core", "cubecl-cuda", @@ -1669,7 +1668,6 @@ dependencies = [ [[package]] name = "cubecl-common" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "derive-new 0.6.0", "embassy-futures", @@ -1686,7 +1684,6 @@ dependencies = [ [[package]] name = "cubecl-core" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "bytemuck", "cubecl-common 0.4.0", @@ -1705,7 +1702,6 @@ dependencies = [ [[package]] name = "cubecl-cpp" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "bytemuck", "cubecl-common 0.4.0", @@ -1719,7 +1715,6 @@ dependencies = [ [[package]] name = "cubecl-cuda" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "bytemuck", "cubecl-common 0.4.0", @@ -1735,7 +1730,6 @@ dependencies = [ [[package]] name = "cubecl-hip" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "bytemuck", "cubecl-common 0.4.0", @@ -1761,7 +1755,6 @@ dependencies = [ [[package]] name = "cubecl-linalg" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "bytemuck", "cubecl-core", @@ -1773,7 +1766,6 @@ dependencies = [ [[package]] name = "cubecl-macros" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "cubecl-common 0.4.0", "darling", @@ -1788,7 +1780,6 @@ dependencies = [ [[package]] name = "cubecl-opt" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "cubecl-common 0.4.0", "cubecl-core", @@ -1825,7 +1816,6 @@ dependencies = [ [[package]] name = "cubecl-runtime" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "async-channel", "async-lock", @@ -1846,7 +1836,6 @@ dependencies = [ [[package]] name = "cubecl-spirv" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "cubecl-common 0.4.0", "cubecl-core", @@ -1860,7 +1849,6 @@ dependencies = [ [[package]] name = "cubecl-wgpu" version = "0.4.0" -source = "git+https://github.com/tracel-ai/cubecl?rev=29f57359dc223dfda0e7de0c63bb8c641598c3c4#29f57359dc223dfda0e7de0c63bb8c641598c3c4" dependencies = [ "ash", "async-channel", diff --git a/Cargo.toml b/Cargo.toml index 677b3e6050..463ca27f53 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -153,11 +153,11 @@ ahash = { version = "0.8.11", default-features = false } portable-atomic-util = { version = "0.2.4", features = ["alloc"] } ### For the main burn branch. ### -cubecl = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "29f57359dc223dfda0e7de0c63bb8c641598c3c4" } -cubecl-common = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "29f57359dc223dfda0e7de0c63bb8c641598c3c4" } +# cubecl = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "29f57359dc223dfda0e7de0c63bb8c641598c3c4" } +# cubecl-common = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "29f57359dc223dfda0e7de0c63bb8c641598c3c4" } ### For local development. ### -# cubecl = { path = "../cubecl/crates/cubecl", default-features = false } -# cubecl-common = { path = "../cubecl/crates/cubecl-common", default-features = false } +cubecl = { path = "../cubecl/crates/cubecl", default-features = false } +cubecl-common = { path = "../cubecl/crates/cubecl-common", default-features = false } ### For the release. ### # cubecl = { version = "0.3.0", default-features = false } # cubecl-common = { version = "0.3.0", default-features = false } diff --git a/crates/burn-jit/src/kernel/conv/conv2d/tune/conv2d.rs b/crates/burn-jit/src/kernel/conv/conv2d/tune/conv2d.rs index 93f91bf7ce..3237616be7 100644 --- a/crates/burn-jit/src/kernel/conv/conv2d/tune/conv2d.rs +++ b/crates/burn-jit/src/kernel/conv/conv2d/tune/conv2d.rs @@ -147,7 +147,6 @@ fn should_run( _ => true, }; - println!("{index} => {should_run}"); should_run } @@ -168,17 +167,8 @@ fn can_launch, R: JitRuntime, CS: ConvPrecisio let (selection, config_input) = S::select_kernel::(plane_dim); let cube_dim = ImplicitCmmaConv::cube_dim(&selection); let cube_count = ImplicitCmmaConv::cube_count(&selection, conv_problem); - - let max_cube_dim = 65535; - - if let cubecl::CubeCount::Static(x, y, z) = cube_count { - println!("({x}, {y}, {z})"); - if x > max_cube_dim || y > max_cube_dim || z > max_cube_dim { - return false; - } - } - let advanced_config = Default::default(); + let config = ImplicitCmmaConv::make_config( config_input, conv_problem, diff --git a/crates/burn-jit/src/kernel/conv/error.rs b/crates/burn-jit/src/kernel/conv/error.rs index ac9d2da7cf..2f15bc9886 100644 --- a/crates/burn-jit/src/kernel/conv/error.rs +++ b/crates/burn-jit/src/kernel/conv/error.rs @@ -12,6 +12,7 @@ impl From for ConvLaunchError { } } +#[allow(clippy::from_over_into)] impl Into for ConvLaunchError { fn into(self) -> AutotuneError { AutotuneError::Unknown(format!("{self:?}"))