Skip to content

ndarray interface #71

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

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

ndarray interface #71

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c9e46a9
as_view
termoshtt Jun 28, 2019
4f803b8
as_view_mut
termoshtt Jun 28, 2019
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
17 changes: 17 additions & 0 deletions fftw/src/array.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

use crate::types::*;
use ffi;
use ndarray::*;

use num_traits::Zero;
use std::ops::{Deref, DerefMut};
Expand Down Expand Up @@ -55,6 +56,22 @@ impl<T> AlignedVec<T> {
pub fn as_slice_mut(&mut self) -> &mut [T] {
unsafe { from_raw_parts_mut(self.data, self.n) }
}

pub fn as_view<D, Shape>(&self, shape: Shape) -> Result<ArrayView<T, D>, ShapeError>
where
D: Dimension,
Shape: Into<StrideShape<D>>,
{
ArrayView::from_shape(shape, self.as_slice())
}

pub fn as_view_mut<D, Shape>(&mut self, shape: Shape) -> Result<ArrayViewMut<T, D>, ShapeError>
where
D: Dimension,
Shape: Into<StrideShape<D>>,
{
ArrayViewMut::from_shape(shape, self.as_slice_mut())
}
}

impl<T> Deref for AlignedVec<T> {
Expand Down