Skip to content

Commit feca3fc

Browse files
committed
Merge remote-tracking branch 'origin/main' into lukim/upgrade-candle
2 parents 2ae7bbe + 60252cc commit feca3fc

28 files changed

Lines changed: 956 additions & 777 deletions

File tree

Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ image = { version = "0.25.2", default-features = false, features = [
7777
imageproc = { version = "0.24.0", default-features = false }
7878
intel-mkl-src = { version = "0.8.1", features = ["mkl-static-lp64-iomp"] }
7979
libc = { version = "0.2.147" }
80+
libm = { version = "0.2.15" }
8081
log = "0.4"
8182
memmap2 = { version = "0.9.3", features = ["stable_deref_trait"] }
8283
num_cpus = "1.15.0"

candle-core/Cargo.toml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ half = { workspace = true }
2222
float8 = { workspace = true }
2323
intel-mkl-src = { workspace = true, optional = true }
2424
libc = { workspace = true, optional = true }
25+
libm = { workspace = true }
2526
memmap2 = { workspace = true }
2627
num-traits = { workspace = true }
2728
num_cpus = { workspace = true }

candle-core/benches/benchmarks/affine.rs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,7 @@ fn criterion_benchmark(c: &mut Criterion) {
3838
run_affine_benchmark(c, &device, DType::F32, "affine_f32");
3939
run_affine_benchmark(c, &device, DType::F16, "affine_f16");
4040
run_affine_benchmark(c, &device, DType::BF16, "affine_bf16");
41-
#[cfg(feature = "metal")]
42-
continue;
41+
#[cfg(not(feature = "metal"))]
4342
run_affine_benchmark(c, &device, DType::F8E4M3, "affine_fp8");
4443
}
4544
}

candle-core/benches/benchmarks/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ impl BenchDevice for Device {
3232
}
3333
Device::Metal(device) => {
3434
#[cfg(feature = "metal")]
35-
return Ok(device.wait_until_completed()?);
35+
return device.wait_until_completed();
3636
#[cfg(not(feature = "metal"))]
3737
panic!("Metal device without metal feature enabled: {:?}", device)
3838
}

0 commit comments

Comments
 (0)