huggingface/candle
1
0
Fork 0
mirror of https://github.com/huggingface/candle.git synced 2025-06-19 19:58:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove some prints.

Browse Source
This commit is contained in:
Nicolas Patry
2023-11-13 14:51:40 +01:00
parent 1471f98f0b
commit 4289984d32
1 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
candle-core/src/metal_backend.rs
View File

@ -4,7 +4,6 @@ use crate::op::{BinaryOpT, CmpOp, ReduceOp, UnaryOpT};
use crate::{CpuStorage, DType, Layout, Result, Shape}; use crate::{CpuStorage, DType, Layout, Result, Shape};
use candle_metal_kernels; use candle_metal_kernels;
use candle_metal_kernels::Kernels; use candle_metal_kernels::Kernels;
use core::mem;
use half::f16; use half::f16;
use metal; use metal;
use metal::{Buffer, CommandBuffer, CommandQueue, MTLResourceOptions, NSUInteger}; use metal::{Buffer, CommandBuffer, CommandQueue, MTLResourceOptions, NSUInteger};
@ -94,7 +93,7 @@ impl MetalDevice {
let option = metal::MTLResourceOptions::StorageModeManaged; let option = metal::MTLResourceOptions::StorageModeManaged;
self.device.new_buffer_with_data( self.device.new_buffer_with_data(
data.as_ptr() as *const core::ffi::c_void, data.as_ptr() as *const core::ffi::c_void,
(data.len() * mem::size_of::<T>()) as NSUInteger, core::mem::size_of_val(data) as NSUInteger,
option, option,
) )
} }
@ -123,13 +122,11 @@ impl BackendStorage for MetalStorage {
} }
fn to_cpu_storage(&self) -> Result<CpuStorage> { fn to_cpu_storage(&self) -> Result<CpuStorage> {
// let start = std::time::Instant::now();
self.device.wait_until_completed(); self.device.wait_until_completed();
// println!("Wait took {:?}", start.elapsed());
match self.dtype { match self.dtype {
DType::U8 => Ok(CpuStorage::U8( DType::U8 => Ok(CpuStorage::U8(
self.buffer.read_to_vec(self.buffer.length() as usize / 1), self.buffer.read_to_vec(self.buffer.length() as usize),
)), )),
DType::U32 => Ok(CpuStorage::U32( DType::U32 => Ok(CpuStorage::U32(
self.buffer.read_to_vec(self.buffer.length() as usize / 4), self.buffer.read_to_vec(self.buffer.length() as usize / 4),
@ -200,11 +197,11 @@ impl BackendStorage for MetalStorage {
) )
.unwrap(); .unwrap();
} }
return Ok(Self { Ok(Self {
buffer, buffer,
device: device.clone(), device: device.clone(),
dtype, dtype,
}); })
} }
fn powf(&self, _: &Layout, _: f64) -> Result<Self> { fn powf(&self, _: &Layout, _: f64) -> Result<Self> {
@ -499,10 +496,10 @@ impl BackendStorage for MetalStorage {
kernel_name, kernel_name,
lhs_l.dims(), lhs_l.dims(),
&self.buffer, &self.buffer,
&lhs_l.stride(), lhs_l.stride(),
lhs_l.start_offset() * self.dtype.size_in_bytes(), lhs_l.start_offset() * self.dtype.size_in_bytes(),
&rhs.buffer, &rhs.buffer,
&rhs_l.stride(), rhs_l.stride(),
rhs_l.start_offset() * rhs.dtype.size_in_bytes(), rhs_l.start_offset() * rhs.dtype.size_in_bytes(),
&mut buffer, &mut buffer,
) )
@ -535,7 +532,7 @@ impl BackendStorage for MetalStorage {
&command_buffer, &command_buffer,
&device.kernels, &device.kernels,
"where_u8_f32", "where_u8_f32",
&dims, dims,
&self.buffer, &self.buffer,
( (
layout.stride(), layout.stride(),
@ -853,7 +850,7 @@ impl BackendStorage for MetalStorage {
kernel_name, kernel_name,
src_l.dims(), src_l.dims(),
&self.buffer, &self.buffer,
&src_l.stride(), src_l.stride(),
src_l.start_offset() * self.dtype.size_in_bytes(), src_l.start_offset() * self.dtype.size_in_bytes(),
&mut dst.buffer, &mut dst.buffer,
dst_offset * dst.dtype.size_in_bytes(), dst_offset * dst.dtype.size_in_bytes(),