huggingface/candle
1
0
Fork 0
mirror of https://github.com/huggingface/candle.git synced 2025-06-17 11:08:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Support for where-cond on cuda for u8 and u32. (#274)

Browse Source
This commit is contained in:
Laurent Mazare
2023-07-29 11:48:58 +01:00
committed by GitHub
parent 4bf2ebf836
commit c0a8ed19eb
2 changed files with 26 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
candle-core/src/cuda_backend.rs
View File

@ -940,16 +940,22 @@ impl<'a> Map2 for WhereCond<'a> {
dev: &CudaDevice, dev: &CudaDevice,
) -> Result<CudaSlice<T>> { ) -> Result<CudaSlice<T>> {
let ids_l = &self.1; let ids_l = &self.1;
let ids = match &self.0.slice { let (ids, name) = match &self.0.slice {
CudaStorageSlice::U32(slice) => slice.slice(ids_l.start_offset()..), CudaStorageSlice::U8(slice) => {
let ptr = *slice.slice(ids_l.start_offset()..).device_ptr();
(ptr, "where_u8")
}
CudaStorageSlice::U32(slice) => {
let ptr = *slice.slice(ids_l.start_offset()..).device_ptr();
(ptr, "where_u32")
}
_ => Err(CudaError::UnexpectedDType { _ => Err(CudaError::UnexpectedDType {
msg: "where conditions should be u32", msg: "where conditions should be u8 or u32",
expected: DType::U32, expected: DType::U32,
got: self.0.dtype(), got: self.0.dtype(),
}) })
.w()?, .w()?,
}; };
let ids = &ids;
let shape = ids_l.shape(); let shape = ids_l.shape();
let dims = shape.dims(); let dims = shape.dims();
let el = shape.elem_count(); let el = shape.elem_count();
@ -959,7 +965,7 @@ impl<'a> Map2 for WhereCond<'a> {
.w()?; .w()?;
let t = &t.slice(layout_t.start_offset()..); let t = &t.slice(layout_t.start_offset()..);
let f = &f.slice(layout_f.start_offset()..); let f = &f.slice(layout_f.start_offset()..);
let func = dev.get_or_load_func(&kernel_name::<T>("where"), kernels::TERNARY)?; let func = dev.get_or_load_func(&kernel_name::<T>(name), kernels::TERNARY)?;
// SAFETY: Set later by running the kernel. // SAFETY: Set later by running the kernel.
let out = unsafe { dev.alloc::<T>(el) }.w()?; let out = unsafe { dev.alloc::<T>(el) }.w()?;
let params = (el, dims.len(), &ds, ids, t, f, &out); let params = (el, dims.len(), &ds, ids, t, f, &out);

23
candle-kernels/src/ternary.cu
View File

@ -1,12 +1,12 @@
#include "cuda_utils.cuh" #include "cuda_utils.cuh"
#include<stdint.h> #include<stdint.h>
#define WHERE_OP(TYPENAME, FN_NAME) \ #define WHERE_OP(TYPENAME, ID_TYPENAME, FN_NAME) \
extern "C" __global__ void FN_NAME( \ extern "C" __global__ void FN_NAME( \
const size_t numel, \ const size_t numel, \
const size_t num_dims, \ const size_t num_dims, \
const size_t *info, \ const size_t *info, \
const uint32_t *ids, \ const ID_TYPENAME *ids, \
const TYPENAME *t, \ const TYPENAME *t, \
const TYPENAME *f, \ const TYPENAME *f, \
TYPENAME *out \ TYPENAME *out \
@ -33,14 +33,21 @@ extern "C" __global__ void FN_NAME( \
} \ } \
#if __CUDA_ARCH__ >= 800 #if __CUDA_ARCH__ >= 800
WHERE_OP(__nv_bfloat16, where_bf16) WHERE_OP(__nv_bfloat16, uint32_t, where_u32_bf16)
WHERE_OP(__nv_bfloat16, uint8_t, where_u8_bf16)
#endif #endif
#if __CUDA_ARCH__ >= 530 #if __CUDA_ARCH__ >= 530
WHERE_OP(__half, where_f16) WHERE_OP(__half, uint32_t, where_u32_f16)
WHERE_OP(__half, uint8_t, where_u8_f16)
#endif #endif
WHERE_OP(float, where_f32) WHERE_OP(float, uint32_t, where_u32_f32)
WHERE_OP(double, where_f64) WHERE_OP(double, uint32_t, where_u32_f64)
WHERE_OP(uint8_t, where_u8) WHERE_OP(uint8_t, uint32_t, where_u32_u8)
WHERE_OP(uint32_t, where_u32) WHERE_OP(uint32_t, uint32_t, where_u32_u32)
WHERE_OP(float, uint8_t, where_u8_f32)
WHERE_OP(double, uint8_t, where_u8_f64)
WHERE_OP(uint8_t, uint8_t, where_u8_u8)
WHERE_OP(uint8_t, uint32_t, where_u8_u32)