AtHeartEngineer/icicle
1
0
Fork 0
mirror of https://github.com/pseXperiments/icicle.git synced 2026-01-09 15:37:58 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix: cargo fmt

Browse Source
This commit is contained in:
Alex Xiong
2024-03-06 12:59:53 +00:00
parent b108c71bdd
commit b22aa02e91
2 changed files with 14 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/test-deploy-docs.yml vendored
View File

@@ -9,7 +9,7 @@ on:
jobs:
test-deploy:
name: Test deployment of docs webiste
name: Test deployment of docs website
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3

32
wrappers/rust/icicle-cuda-runtime/src/memory.rs
View File

@@ -1,15 +1,12 @@
use crate::bindings::{
cudaFree, cudaFreeAsync, cudaMalloc, cudaMallocAsync, cudaMemPool_t, cudaMemcpy,
cudaMemcpyAsync, cudaMemcpyKind,
cudaFree, cudaFreeAsync, cudaMalloc, cudaMallocAsync, cudaMemPool_t, cudaMemcpy, cudaMemcpyAsync, cudaMemcpyKind,
};
use crate::device::get_device;
use crate::device_context::check_device;
use crate::error::{CudaError, CudaResult, CudaResultWrap};
use crate::stream::CudaStream;
use std::mem::{size_of, MaybeUninit};
use std::ops::{
Index, IndexMut, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive,
};
use std::ops::{Index, IndexMut, Range, RangeFrom, RangeFull, RangeInclusive, RangeTo, RangeToInclusive};
use std::os::raw::c_void;
use std::slice::from_raw_parts_mut;
@@ -86,7 +83,9 @@ impl<'a, T> HostOrDeviceSlice<'a, T> {
}
pub fn cuda_malloc(count: usize) -> CudaResult<Self> {
let size = count.checked_mul(size_of::<T>()).unwrap_or(0);
let size = count
.checked_mul(size_of::<T>())
.unwrap_or(0);
if size == 0 {
return Err(CudaError::cudaErrorMemoryAllocation); //TODO: only CUDA backend should return CudaError
}
@@ -102,19 +101,16 @@ impl<'a, T> HostOrDeviceSlice<'a, T> {
}
pub fn cuda_malloc_async(count: usize, stream: &CudaStream) -> CudaResult<Self> {
let size = count.checked_mul(size_of::<T>()).unwrap_or(0);
let size = count
.checked_mul(size_of::<T>())
.unwrap_or(0);
if size == 0 {
return Err(CudaError::cudaErrorMemoryAllocation);
}
let mut device_ptr = MaybeUninit::<*mut c_void>::uninit();
unsafe {
cudaMallocAsync(
device_ptr.as_mut_ptr(),
size,
stream.handle as *mut _ as *mut _,
)
.wrap()?;
cudaMallocAsync(device_ptr.as_mut_ptr(), size, stream.handle as *mut _ as *mut _).wrap()?;
Ok(Self::Device(
from_raw_parts_mut(device_ptr.assume_init() as *mut T, count),
get_device().unwrap() as i32,
@@ -127,11 +123,7 @@ impl<'a, T> HostOrDeviceSlice<'a, T> {
check_device(*device_id);
if !s.is_empty() {
unsafe {
cudaFreeAsync(
s.as_mut_ptr() as *mut c_void,
stream.handle as *mut _ as *mut _,
)
.wrap()?;
cudaFreeAsync(s.as_mut_ptr() as *mut c_void, stream.handle as *mut _ as *mut _).wrap()?;
}
}
}
@@ -283,7 +275,9 @@ impl<'a, T> Drop for HostOrDeviceSlice<'a, T> {
}
unsafe {
cudaFree(s.as_mut_ptr() as *mut c_void).wrap().unwrap();
cudaFree(s.as_mut_ptr() as *mut c_void)
.wrap()
.unwrap();
}
}
Self::Host(_) => {}