+
Skip to content

Implement Shape for arrays (#377) #385

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

Merged
merged 2 commits into from
Jan 22, 2023
Merged

Implement Shape for arrays (#377) #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e524308
implement Shape for usize arrays
nkoppel Jan 21, 2023
d6f9cd2
Merge branch 'main' into array_shapes
nkoppel Jan 21, 2023
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
63 changes: 35 additions & 28 deletions src/shapes/axes.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,13 +85,20 @@ pub trait HasAxes<Ax> {
}

macro_rules! impl_has_axis {
(($($Vars:tt),*), $Axis:tt) => {
impl<$($Vars: Dim, )*> HasAxes<Axis<$Axis>> for ($($Vars, )*) {
#[inline(always)]
fn size(&self) -> usize {
self.$Axis.size()
}
}
(($($Vars:tt),*), $Num:tt, $Axis:tt) => {
impl<$($Vars: Dim, )*> HasAxes<Axis<$Axis>> for ($($Vars, )*) {
#[inline(always)]
fn size(&self) -> usize {
self.$Axis.size()
}
}

impl HasAxes<Axis<$Axis>> for [usize; $Num] {
#[inline(always)]
fn size(&self) -> usize {
self[$Axis]
}
}
};
}

Expand All @@ -102,27 +109,27 @@ impl HasAxes<Axis<0>> for () {
}
}

impl_has_axis!((D1), 0);
impl_has_axis!((D1, D2), 0);
impl_has_axis!((D1, D2), 1);
impl_has_axis!((D1, D2, D3), 0);
impl_has_axis!((D1, D2, D3), 1);
impl_has_axis!((D1, D2, D3), 2);
impl_has_axis!((D1, D2, D3, D4), 0);
impl_has_axis!((D1, D2, D3, D4), 1);
impl_has_axis!((D1, D2, D3, D4), 2);
impl_has_axis!((D1, D2, D3, D4), 3);
impl_has_axis!((D1, D2, D3, D4, D5), 0);
impl_has_axis!((D1, D2, D3, D4, D5), 1);
impl_has_axis!((D1, D2, D3, D4, D5), 2);
impl_has_axis!((D1, D2, D3, D4, D5), 3);
impl_has_axis!((D1, D2, D3, D4, D5), 4);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 0);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 1);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 2);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 3);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 4);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 5);
impl_has_axis!((D1), 1, 0);
impl_has_axis!((D1, D2), 2, 0);
impl_has_axis!((D1, D2), 2, 1);
impl_has_axis!((D1, D2, D3), 3, 0);
impl_has_axis!((D1, D2, D3), 3, 1);
impl_has_axis!((D1, D2, D3), 3, 2);
impl_has_axis!((D1, D2, D3, D4), 4, 0);
impl_has_axis!((D1, D2, D3, D4), 4, 1);
impl_has_axis!((D1, D2, D3, D4), 4, 2);
impl_has_axis!((D1, D2, D3, D4), 4, 3);
impl_has_axis!((D1, D2, D3, D4, D5), 5, 0);
impl_has_axis!((D1, D2, D3, D4, D5), 5, 1);
impl_has_axis!((D1, D2, D3, D4, D5), 5, 2);
impl_has_axis!((D1, D2, D3, D4, D5), 5, 3);
impl_has_axis!((D1, D2, D3, D4, D5), 5, 4);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 6, 0);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 6, 1);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 6, 2);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 6, 3);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 6, 4);
impl_has_axis!((D1, D2, D3, D4, D5, D6), 6, 5);

impl<const I: isize, const J: isize, S> HasAxes<Axes2<I, J>> for S
where
Expand Down
88 changes: 52 additions & 36 deletions src/shapes/broadcasts.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,45 +18,61 @@ impl ReduceShape<Axis<0>> for () {
}
impl<Src: Shape, Dst: Shape + ReduceShapeTo<Src, Ax>, Ax> BroadcastShapeTo<Dst, Ax> for Src {}

macro_rules! broadcast_to {
(($($SrcDims:tt),*), ($($DstDims:tt),*), $Axes:ty) => {
impl<$($DstDims: Dim, )*> ReduceShapeTo<($($SrcDims, )*), $Axes> for ($($DstDims, )*) {}
impl<$($DstDims: Dim, )*> ReduceShape<$Axes> for ($($DstDims, )*) {
type Reduced = ($($SrcDims, )*);
macro_rules! broadcast_to_array {
($SrcNum:literal, (), $DstNum:literal, ($($DstDims:tt),*), $Axes:ty) => {
impl ReduceShapeTo<(), $Axes> for [usize; $DstNum] {}
impl ReduceShape<$Axes> for [usize; $DstNum] {
type Reduced = ();
}
};
($SrcNum:literal, ($($SrcDims:tt),*), $DstNum:literal, ($($DstDims:tt),*), $Axes:ty) => {
impl ReduceShapeTo<[usize; $SrcNum], $Axes> for [usize; $DstNum] {}
impl ReduceShape<$Axes> for [usize; $DstNum] {
type Reduced = [usize; $SrcNum];
}
};
}

macro_rules! broadcast_to {
($SrcNum:literal, ($($SrcDims:tt),*), $DstNum:literal, ($($DstDims:tt),*), $Axes:ty) => {
impl<$($DstDims: Dim, )*> ReduceShapeTo<($($SrcDims, )*), $Axes> for ($($DstDims, )*) {}
impl<$($DstDims: Dim, )*> ReduceShape<$Axes> for ($($DstDims, )*) {
type Reduced = ($($SrcDims, )*);
}
broadcast_to_array!($SrcNum, ($($SrcDims),*), $DstNum, ($($DstDims),*), $Axes);
};
}
broadcast_to!((), (M), Axis<0>);
broadcast_to!((), (M, N), Axes2<0, 1>);
broadcast_to!((), (M, N, O), Axes3<0, 1, 2>);
broadcast_to!((), (M, N, O, P), Axes4<0, 1, 2, 3>);
broadcast_to!((), (M, N, O, P, Q), Axes5<0, 1, 2, 3, 4>);
broadcast_to!((), (M, N, O, P, Q, R), Axes6<0, 1, 2, 3, 4, 5>);

broadcast_to!((M), (M, N), Axis<1>);
broadcast_to!((N), (M, N), Axis<0>);
broadcast_to!((M), (M, N, O), Axes2<1, 2>);
broadcast_to!((N), (M, N, O), Axes2<0, 2>);
broadcast_to!((O), (M, N, O), Axes2<0, 1>);
broadcast_to!((M), (M, N, O, P), Axes3<1, 2, 3>);
broadcast_to!((N), (M, N, O, P), Axes3<0, 2, 3>);
broadcast_to!((O), (M, N, O, P), Axes3<0, 1, 3>);
broadcast_to!((P), (M, N, O, P), Axes3<0, 1, 2>);

broadcast_to!((M, N), (M, N, O), Axis<2>);
broadcast_to!((M, O), (M, N, O), Axis<1>);
broadcast_to!((N, O), (M, N, O), Axis<0>);
broadcast_to!((M, N), (M, N, O, P), Axes2<2, 3>);
broadcast_to!((M, O), (M, N, O, P), Axes2<1, 3>);
broadcast_to!((N, O), (M, N, O, P), Axes2<0, 3>);
broadcast_to!((M, P), (M, N, O, P), Axes2<1, 2>);
broadcast_to!((N, P), (M, N, O, P), Axes2<0, 2>);
broadcast_to!((O, P), (M, N, O, P), Axes2<0, 1>);

broadcast_to!((M, N, O), (M, N, O, P), Axis<3>);
broadcast_to!((M, N, P), (M, N, O, P), Axis<2>);
broadcast_to!((M, O, P), (M, N, O, P), Axis<1>);
broadcast_to!((N, O, P), (M, N, O, P), Axis<0>);
broadcast_to!(0, (), 1, (M), Axis<0>);
broadcast_to!(0, (), 2, (M, N), Axes2<0, 1>);
broadcast_to!(0, (), 3, (M, N, O), Axes3<0, 1, 2>);
broadcast_to!(0, (), 4, (M, N, O, P), Axes4<0, 1, 2, 3>);
broadcast_to!(0, (), 5, (M, N, O, P, Q), Axes5<0, 1, 2, 3, 4>);
broadcast_to!(0, (), 6, (M, N, O, P, Q, R), Axes6<0, 1, 2, 3, 4, 5>);

broadcast_to!(1, (M), 2, (M, N), Axis<1>);
broadcast_to!(1, (N), 2, (M, N), Axis<0>);
broadcast_to!(1, (M), 3, (M, N, O), Axes2<1, 2>);
broadcast_to!(1, (N), 3, (M, N, O), Axes2<0, 2>);
broadcast_to!(1, (O), 3, (M, N, O), Axes2<0, 1>);
broadcast_to!(1, (M), 4, (M, N, O, P), Axes3<1, 2, 3>);
broadcast_to!(1, (N), 4, (M, N, O, P), Axes3<0, 2, 3>);
broadcast_to!(1, (O), 4, (M, N, O, P), Axes3<0, 1, 3>);
broadcast_to!(1, (P), 4, (M, N, O, P), Axes3<0, 1, 2>);

broadcast_to!(2, (M, N), 3, (M, N, O), Axis<2>);
broadcast_to!(2, (M, O), 3, (M, N, O), Axis<1>);
broadcast_to!(2, (N, O), 3, (M, N, O), Axis<0>);
broadcast_to!(2, (M, N), 4, (M, N, O, P), Axes2<2, 3>);
broadcast_to!(2, (M, O), 4, (M, N, O, P), Axes2<1, 3>);
broadcast_to!(2, (N, O), 4, (M, N, O, P), Axes2<0, 3>);
broadcast_to!(2, (M, P), 4, (M, N, O, P), Axes2<1, 2>);
broadcast_to!(2, (N, P), 4, (M, N, O, P), Axes2<0, 2>);
broadcast_to!(2, (O, P), 4, (M, N, O, P), Axes2<0, 1>);

broadcast_to!(3, (M, N, O), 4, (M, N, O, P), Axis<3>);
broadcast_to!(3, (M, N, P), 4, (M, N, O, P), Axis<2>);
broadcast_to!(3, (M, O, P), 4, (M, N, O, P), Axis<1>);
broadcast_to!(3, (N, O, P), 4, (M, N, O, P), Axis<0>);

/// Internal implementation for broadcasting strides
pub trait BroadcastStridesTo<S: Shape, Ax>: Shape + BroadcastShapeTo<S, Ax> {
Expand Down
8 changes: 4 additions & 4 deletions src/shapes/same_numel.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,10 @@ pub trait HasSameNumelAs<Dst> {}

macro_rules! impl_same_num_elements {
([$($SrcVs:tt),*], $SrcNumEl:tt, [$($DstVs:tt),*], $DstNumEl:tt) => {
#[cfg(feature = "nightly")]
impl<$(const $SrcVs: usize, )* $(const $DstVs: usize, )*> HasSameNumelAs<($(Const<$SrcVs>, )*)> for ($(Const<$DstVs>, )*)
where
Assert<{ $DstNumEl == $SrcNumEl }>: ConstTrue {}
#[cfg(feature = "nightly")]
impl<$(const $SrcVs: usize, )* $(const $DstVs: usize, )*> HasSameNumelAs<($(Const<$SrcVs>, )*)> for ($(Const<$DstVs>, )*)
where
Assert<{ $DstNumEl == $SrcNumEl }>: ConstTrue {}
};
}

Expand Down
45 changes: 30 additions & 15 deletions src/shapes/shape.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -177,21 +177,36 @@ pub type Rank6<const M: usize, const N: usize, const O: usize, const P: usize, c

macro_rules! shape {
(($($D:tt $Idx:tt),*), rank=$Num:expr, all=$All:tt) => {
impl<$($D: Dim, )*> Shape for ($($D, )*) {
const NUM_DIMS: usize = $Num;
type Concrete = [usize; $Num];
type AllAxes = $All<$($Idx,)*>;
type LastAxis = Axis<{$Num - 1}>;
#[inline(always)]
fn concrete(&self) -> Self::Concrete {
[$(self.$Idx.size(), )*]
}
#[inline(always)]
fn from_concrete(concrete: &Self::Concrete) -> Option<Self> {
Some(($(Dim::from_size(concrete[$Idx])?, )*))
}
}
impl<$($D: ConstDim, )*> ConstShape for ($($D, )*) { }
impl<$($D: Dim, )*> Shape for ($($D, )*) {
const NUM_DIMS: usize = $Num;
type Concrete = [usize; $Num];
type AllAxes = $All<$($Idx,)*>;
type LastAxis = Axis<{$Num - 1}>;
#[inline(always)]
fn concrete(&self) -> Self::Concrete {
[$(self.$Idx.size(), )*]
}
#[inline(always)]
fn from_concrete(concrete: &Self::Concrete) -> Option<Self> {
Some(($(Dim::from_size(concrete[$Idx])?, )*))
}
}
impl<$($D: ConstDim, )*> ConstShape for ($($D, )*) { }

impl Shape for [usize; $Num] {
const NUM_DIMS: usize = $Num;
type Concrete = Self;
type AllAxes = $All<$($Idx,)*>;
type LastAxis = Axis<{$Num - 1}>;

fn concrete(&self) -> Self::Concrete {
*self
}

fn from_concrete(concrete: &Self::Concrete) -> Option<Self> {
Some(*concrete)
}
}
};
}

Expand Down
点击 这是indexloc提供的php浏览器服务，不要输入任何密码和下载