Skip to content

remove one Vec from Tensor #31

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Human9000-bit wants to merge 1 commit into
base: main
Choose a base branch
from
+26 −11
Open

remove one Vec from Tensor #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 17 additions & 2 deletions crates/yscv-tensor/src/shape.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,32 @@
use super::tensor::{DimsVec, INLINE_CAP};

pub(crate) fn shape_element_count(shape: &[usize]) -> Option<usize> {
shape
.iter()
.try_fold(1usize, |acc, dim| acc.checked_mul(*dim))
}

pub(crate) fn compute_strides(shape: &[usize]) -> Option<Vec<usize>> {
pub(crate) fn compute_strides(shape: &[usize]) -> Option<DimsVec> {
if shape.len() <= INLINE_CAP {
let mut buf = [0usize; INLINE_CAP];
let mut stride = 1usize;
for axis in (0..shape.len()).rev() {
buf[axis] = stride;
stride = stride.checked_mul(shape[axis])?;
}
return Some(DimsVec::Inline {
buf,
len: shape.len() as u8,
});
}

let mut strides = vec![0usize; shape.len()];
let mut stride = 1usize;
for axis in (0..shape.len()).rev() {
strides[axis] = stride;
stride = stride.checked_mul(shape[axis])?;
}
Some(strides)
Some(DimsVec::Heap(strides))
}

pub(crate) fn broadcast_shape(left: &[usize], right: &[usize]) -> Option<Vec<usize>> {
Expand Down
18 changes: 9 additions & 9 deletions crates/yscv-tensor/src/tensor.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ use super::shape::{compute_strides, shape_element_count};
// ── Inline shape/strides storage (no heap alloc for ≤6D tensors) ─────────

// WHY 6: covers all common tensor ranks (scalar(0)..conv weight(5)) without heap allocation.
const INLINE_CAP: usize = 6;
pub(crate) const INLINE_CAP: usize = 6;

/// Stack-allocated small vector for tensor shape/strides.
/// Stores up to 6 dimensions inline; falls back to heap for higher ranks.
Expand Down Expand Up @@ -267,7 +267,7 @@ impl Tensor {

Ok(Self {
shape: DimsVec::from(shape),
strides: DimsVec::from(strides),
strides,
storage: Arc::new(Storage::F32(data)),
device: Device::Cpu,
layout: Layout::NCHW,
Expand All @@ -292,7 +292,7 @@ impl Tensor {

Ok(Self {
shape: DimsVec::from(shape),
strides: DimsVec::from(strides),
strides,
storage: Arc::new(Storage::F32(AlignedVec::from_vec(data))),
device: Device::Cpu,
layout: Layout::NCHW,
Expand All @@ -315,7 +315,7 @@ impl Tensor {
})?;
Ok(Self {
shape: DimsVec::from(shape),
strides: DimsVec::from(strides),
strides,
storage: Arc::new(Storage::F16(data)),
device: Device::Cpu,
layout: Layout::NCHW,
Expand All @@ -338,7 +338,7 @@ impl Tensor {
})?;
Ok(Self {
shape: DimsVec::from(shape),
strides: DimsVec::from(strides),
strides,
storage: Arc::new(Storage::BF16(data)),
device: Device::Cpu,
layout: Layout::NCHW,
Expand Down Expand Up @@ -370,7 +370,7 @@ impl Tensor {

Ok(Self {
shape: DimsVec::from(shape),
strides: DimsVec::from(strides),
strides,
storage: Arc::new(Storage::F32(AlignedVec::filled(count, value))),
device: Device::Cpu,
layout: Layout::NCHW,
Expand All @@ -391,7 +391,7 @@ impl Tensor {

Ok(Self {
shape: DimsVec::from(shape),
strides: DimsVec::from(strides),
strides,
storage: Arc::new(Storage::F32(AlignedVec::calloc(count))),
device: Device::Cpu,
layout: Layout::NCHW,
Expand Down Expand Up @@ -631,7 +631,7 @@ impl Tensor {

Ok(Self {
shape: DimsVec::from(new_shape),
strides: DimsVec::from(new_strides),
strides: new_strides,
storage: self.storage.clone(),
device: self.device,
layout: self.layout,
Expand All @@ -657,7 +657,7 @@ impl Tensor {

Ok(Self {
shape: DimsVec::from(new_shape),
strides: DimsVec::from(new_strides),
strides: new_strides,
storage: self.storage,
device: self.device,
layout: self.layout,
Expand Down
Loading