Skip to content

Commit b33bd24

Browse files
authored
Fix no default features flags + update cubecl (#2725)
1 parent 140ea75 commit b33bd24

File tree

14 files changed

+132
-53
lines changed

14 files changed

+132
-53
lines changed

Cargo.lock

+114-43
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+3-3
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ ratatui = "0.29.0"
101101

102102
# WGPU stuff
103103
text_placeholder = "0.5.1"
104-
wgpu = "23.0.0"
104+
wgpu = "24.0.0"
105105

106106
# Benchmarks and Burnbench
107107
arboard = "3.4.1"
@@ -153,8 +153,8 @@ ahash = { version = "0.8.11", default-features = false }
153153
portable-atomic-util = { version = "0.2.4", features = ["alloc"] }
154154

155155
### For the main burn branch. ###
156-
cubecl = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "2cc42af02671d90255ab823e29a4a3ad2e564333" }
157-
cubecl-common = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "2cc42af02671d90255ab823e29a4a3ad2e564333" }
156+
cubecl = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "dd0c2fa86bc58133cde596e13ddb1d7ad33ac44c" }
157+
cubecl-common = { git = "https://github.com/tracel-ai/cubecl", default-features = false, rev = "dd0c2fa86bc58133cde596e13ddb1d7ad33ac44c" }
158158
### For local development. ###
159159
# cubecl = { path = "../cubecl/crates/cubecl", default-features = false }
160160
# cubecl-common = { path = "../cubecl/crates/cubecl-common", default-features = false }

crates/burn-autodiff/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ std = []
1818
async = [] # Require std
1919

2020
[dependencies]
21-
burn-common = { path = "../burn-common", version = "0.17.0" }
21+
burn-common = { path = "../burn-common", version = "0.17.0", default-features = false }
2222
burn-tensor = { path = "../burn-tensor", version = "0.17.0", default-features = false }
2323
burn-tensor-testgen = { path = "../burn-tensor-testgen", version = "0.17.0", optional = true }
2424

crates/burn-core/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![cfg_attr(not(feature = "std"), no_std)]
22
#![warn(missing_docs)]
33
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
4+
#![recursion_limit = "135"]
45

56
//! The core crate of Burn.
67

crates/burn-jit/src/kernel/conv/conv2d/im2col.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,7 @@ fn im2col_kernel<F: Float>(
9999

100100
#[cfg(not(test))]
101101
pub(crate) fn batches_per_run(batch_size: usize, out_h: usize, out_w: usize) -> Option<usize> {
102-
let cube_count_per_batch = (out_h * out_w).div_ceil(cubecl::PLANE_DIM_APPROX);
102+
let cube_count_per_batch = (out_h * out_w).div_ceil(burn_common::PLANE_DIM_APPROX);
103103
let max_cube_count = u16::MAX as usize;
104104
let max_simultaneous = (max_cube_count / cube_count_per_batch).min(batch_size);
105105
if max_simultaneous == 0 {

crates/burn-jit/src/kernel/mod.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ pub use mask::*;
1515
pub(crate) use unary_float::*;
1616
pub(crate) use unary_numeric::*;
1717

18-
pub use cubecl::{Kernel, PLANE_DIM_APPROX};
18+
pub use burn_common::PLANE_DIM_APPROX;
19+
pub use cubecl::Kernel;
1920

2021
/// Convolution kernels
2122
pub mod conv;

crates/burn-jit/src/template/base.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use crate::{element::JitElement, tensor::JitTensor, JitRuntime};
2-
use cubecl::{prelude::*, Compiler, ExecutionMode, KernelId};
2+
use burn_common::ExecutionMode;
3+
use cubecl::{prelude::*, Compiler, KernelId};
34

45
use super::SourceTemplate;
56

crates/burn-ndarray/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ blas-openblas-system = [
4343

4444
# ** Please make sure all dependencies support no_std when std is disabled **
4545

46-
burn-autodiff = { path = "../burn-autodiff", version = "0.17.0", optional = true }
46+
burn-autodiff = { path = "../burn-autodiff", version = "0.17.0", default-features = false, optional = true }
4747
burn-common = { path = "../burn-common", version = "0.17.0", default-features = false }
4848
burn-tensor = { path = "../burn-tensor", version = "0.17.0", default-features = false, features = ["repr"] }
4949

crates/burn-router/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#![cfg_attr(not(feature = "std"), no_std)]
22
#![warn(missing_docs)]
33
#![cfg_attr(docsrs, feature(doc_auto_cfg))]
4+
#![recursion_limit = "138"]
45

56
//! Burn multi-backend router.
67

crates/burn-tensor/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ std = [
3232
[dependencies]
3333
burn-common = { path = "../burn-common", version = "0.17.0", default-features = false }
3434
burn-tensor-testgen = { path = "../burn-tensor-testgen", version = "0.17.0", optional = true }
35-
cubecl = { workspace = true, optional = true, default-features = true }
35+
cubecl = { workspace = true, optional = true, default-features = false }
3636

3737
bytemuck = { workspace = true, features = ["extern_crate_alloc"] }
3838
colored = { workspace = true, optional = true }

crates/burn-wgpu/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ pub use burn_jit::{
1212
pub use burn_jit::{tensor::JitTensor, JitBackend};
1313
pub use burn_jit::{BoolElement, FloatElement, IntElement};
1414
pub use cubecl::flex32;
15-
pub use cubecl::ir::CubeDim;
1615
pub use cubecl::wgpu::*;
16+
pub use cubecl::CubeDim;
1717

1818
pub type Wgsl = cubecl::wgpu::WgslCompiler;
1919
#[cfg(feature = "spirv")]

examples/guide/src/bin/infer.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
#![recursion_limit = "131"]
12
use burn::{backend::Wgpu, data::dataset::Dataset};
23
use guide::inference;
34

examples/image-classification-web/src/lib.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
#![cfg_attr(not(test), no_std)]
2+
#![recursion_limit = "135"]
23

34
pub mod model;
45
pub mod web;

examples/server/src/lib.rs

+2
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
#![recursion_limit = "141"]
2+
13
pub fn start() {
24
let port = std::env::var("REMOTE_BACKEND_PORT")
35
.map(|port| match port.parse::<u16>() {

0 commit comments

Comments
 (0)