Skip to content
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

Jump to bottom

Fix Miri errors for WindowsIter and ExactChunksIter/Mut #1142

Merged
merged 1 commit into from
Mar 9, 2024
Merged

Fix Miri errors for WindowsIter and ExactChunksIter/Mut #1142

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
21 changes: 21 additions & 0 deletions src/impl_views/conversions.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,27 @@ where
}
}

/// Private raw array view methods
impl<A, D> RawArrayView<A, D>
where
D: Dimension,
{
#[inline]
pub(crate) fn into_base_iter(self) -> Baseiter<A, D> {
unsafe { Baseiter::new(self.ptr.as_ptr(), self.dim, self.strides) }
}
}

impl<A, D> RawArrayViewMut<A, D>
where
D: Dimension,
{
#[inline]
pub(crate) fn into_base_iter(self) -> Baseiter<A, D> {
unsafe { Baseiter::new(self.ptr.as_ptr(), self.dim, self.strides) }
}
}

/// Private array view methods
impl<'a, A, D> ArrayView<'a, A, D>
where
Expand Down
55 changes: 36 additions & 19 deletions src/iterators/chunks.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
use std::marker::PhantomData;

use crate::imp_prelude::*;
use crate::ElementsBase;
use crate::ElementsBaseMut;
use crate::Baseiter;
use crate::IntoDimension;
use crate::{Layout, NdProducer};

Expand All @@ -9,6 +10,7 @@ impl_ndproducer! {
[Clone => 'a, A, D: Clone ]
ExactChunks {
base,
life,
chunk,
inner_strides,
}
Expand All @@ -23,16 +25,14 @@ impl_ndproducer! {
}
}

type BaseProducerRef<'a, A, D> = ArrayView<'a, A, D>;
type BaseProducerMut<'a, A, D> = ArrayViewMut<'a, A, D>;

/// Exact chunks producer and iterable.
///
/// See [`.exact_chunks()`](ArrayBase::exact_chunks) for more
/// information.
//#[derive(Debug)]
pub struct ExactChunks<'a, A, D> {
base: BaseProducerRef<'a, A, D>,
base: RawArrayView<A, D>,
life: PhantomData<&'a A>,
chunk: D,
inner_strides: D,
}
Expand All @@ -41,10 +41,11 @@ impl<'a, A, D: Dimension> ExactChunks<'a, A, D> {
/// Creates a new exact chunks producer.
///
/// **Panics** if any chunk dimension is zero
pub(crate) fn new<E>(mut a: ArrayView<'a, A, D>, chunk: E) -> Self
pub(crate) fn new<E>(a: ArrayView<'a, A, D>, chunk: E) -> Self
where
E: IntoDimension<Dim = D>,
{
let mut a = a.into_raw_view();
let chunk = chunk.into_dimension();
ndassert!(
a.ndim() == chunk.ndim(),
Expand All @@ -59,11 +60,12 @@ impl<'a, A, D: Dimension> ExactChunks<'a, A, D> {
for i in 0..a.ndim() {
a.dim[i] /= chunk[i];
}
let inner_strides = a.raw_strides();
let inner_strides = a.strides.clone();
a.strides *= &chunk;

ExactChunks {
base: a,
life: PhantomData,
chunk,
inner_strides,
}
Expand All @@ -79,7 +81,8 @@ where
type IntoIter = ExactChunksIter<'a, A, D>;
fn into_iter(self) -> Self::IntoIter {
ExactChunksIter {
iter: self.base.into_elements_base(),
iter: self.base.into_base_iter(),
life: self.life,
chunk: self.chunk,
inner_strides: self.inner_strides,
}
Expand All @@ -91,7 +94,8 @@ where
/// See [`.exact_chunks()`](ArrayBase::exact_chunks) for more
/// information.
pub struct ExactChunksIter<'a, A, D> {
iter: ElementsBase<'a, A, D>,
iter: Baseiter<A, D>,
life: PhantomData<&'a A>,
chunk: D,
inner_strides: D,
}
Expand All @@ -101,6 +105,7 @@ impl_ndproducer! {
[Clone => ]
ExactChunksMut {
base,
life,
chunk,
inner_strides,
}
Expand All @@ -122,7 +127,8 @@ impl_ndproducer! {
/// for more information.
//#[derive(Debug)]
pub struct ExactChunksMut<'a, A, D> {
base: BaseProducerMut<'a, A, D>,
base: RawArrayViewMut<A, D>,
life: PhantomData<&'a mut A>,
chunk: D,
inner_strides: D,
}
Expand All @@ -131,10 +137,11 @@ impl<'a, A, D: Dimension> ExactChunksMut<'a, A, D> {
/// Creates a new exact chunks producer.
///
/// **Panics** if any chunk dimension is zero
pub(crate) fn new<E>(mut a: ArrayViewMut<'a, A, D>, chunk: E) -> Self
pub(crate) fn new<E>(a: ArrayViewMut<'a, A, D>, chunk: E) -> Self
where
E: IntoDimension<Dim = D>,
{
let mut a = a.into_raw_view_mut();
let chunk = chunk.into_dimension();
ndassert!(
a.ndim() == chunk.ndim(),
Expand All @@ -149,11 +156,12 @@ impl<'a, A, D: Dimension> ExactChunksMut<'a, A, D> {
for i in 0..a.ndim() {
a.dim[i] /= chunk[i];
}
let inner_strides = a.raw_strides();
let inner_strides = a.strides.clone();
a.strides *= &chunk;

ExactChunksMut {
base: a,
life: PhantomData,
chunk,
inner_strides,
}
Expand All @@ -169,7 +177,8 @@ where
type IntoIter = ExactChunksIterMut<'a, A, D>;
fn into_iter(self) -> Self::IntoIter {
ExactChunksIterMut {
iter: self.base.into_elements_base(),
iter: self.base.into_base_iter(),
life: self.life,
chunk: self.chunk,
inner_strides: self.inner_strides,
}
Expand All @@ -181,16 +190,17 @@ impl_iterator! {
[Clone => 'a, A, D: Clone]
ExactChunksIter {
iter,
life,
chunk,
inner_strides,
}
ExactChunksIter<'a, A, D> {
type Item = ArrayView<'a, A, D>;

fn item(&mut self, elt) {
fn item(&mut self, ptr) {
unsafe {
ArrayView::new_(
elt,
ptr,
self.chunk.clone(),
self.inner_strides.clone())
}
Expand All @@ -209,10 +219,10 @@ impl_iterator! {
ExactChunksIterMut<'a, A, D> {
type Item = ArrayViewMut<'a, A, D>;

fn item(&mut self, elt) {
fn item(&mut self, ptr) {
unsafe {
ArrayViewMut::new_(
elt,
ptr,
self.chunk.clone(),
self.inner_strides.clone())
}
Expand All @@ -225,7 +235,14 @@ impl_iterator! {
/// See [`.exact_chunks_mut()`](ArrayBase::exact_chunks_mut)
/// for more information.
pub struct ExactChunksIterMut<'a, A, D> {
iter: ElementsBaseMut<'a, A, D>,
iter: Baseiter<A, D>,
life: PhantomData<&'a mut A>,
chunk: D,
inner_strides: D,
}

send_sync_read_only!(ExactChunks);
send_sync_read_only!(ExactChunksIter);

send_sync_read_write!(ExactChunksMut);
send_sync_read_write!(ExactChunksIterMut);
2 changes: 1 addition & 1 deletion src/iterators/macros.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ impl<$($typarm)*> NdProducer for $fulltype {
}

unsafe fn uget_ptr(&self, i: &Self::Dim) -> *mut A {
self.$base.uget_ptr(i)
self.$base.uget_ptr(i) as *mut _
}

fn stride_of(&self, axis: Axis) -> isize {
Expand Down
25 changes: 18 additions & 7 deletions src/iterators/windows.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
use super::ElementsBase;
use std::marker::PhantomData;

use super::Baseiter;
use crate::imp_prelude::*;
use crate::IntoDimension;
use crate::Layout;
Expand All @@ -10,7 +12,8 @@ use crate::Slice;
/// See [`.windows()`](ArrayBase::windows) for more
/// information.
pub struct Windows<'a, A, D> {
base: ArrayView<'a, A, D>,
base: RawArrayView<A, D>,
life: PhantomData<&'a A>,
window: D,
strides: D,
}
Expand Down Expand Up @@ -74,7 +77,8 @@ impl<'a, A, D: Dimension> Windows<'a, A, D> {
});

Windows {
base,
base: base.into_raw_view(),
life: PhantomData,
window,
strides: window_strides,
}
Expand All @@ -86,6 +90,7 @@ impl_ndproducer! {
[Clone => 'a, A, D: Clone ]
Windows {
base,
life,
window,
strides,
}
Expand All @@ -109,7 +114,8 @@ where
type IntoIter = WindowsIter<'a, A, D>;
fn into_iter(self) -> Self::IntoIter {
WindowsIter {
iter: self.base.into_elements_base(),
iter: self.base.into_base_iter(),
life: self.life,
window: self.window,
strides: self.strides,
}
Expand All @@ -121,7 +127,8 @@ where
/// See [`.windows()`](ArrayBase::windows) for more
/// information.
pub struct WindowsIter<'a, A, D> {
iter: ElementsBase<'a, A, D>,
iter: Baseiter<A, D>,
life: PhantomData<&'a A>,
window: D,
strides: D,
}
Expand All @@ -131,19 +138,23 @@ impl_iterator! {
[Clone => 'a, A, D: Clone]
WindowsIter {
iter,
life,
window,
strides,
}
WindowsIter<'a, A, D> {
type Item = ArrayView<'a, A, D>;

fn item(&mut self, elt) {
fn item(&mut self, ptr) {
unsafe {
ArrayView::new_(
elt,
ptr,
self.window.clone(),
self.strides.clone())
}
}
}
}

send_sync_read_only!(Windows);
send_sync_read_only!(WindowsIter);
4 changes: 0 additions & 4 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1559,10 +1559,6 @@ where
unsafe { ArrayView::new(ptr, dim, strides) }
}

fn raw_strides(&self) -> D {
self.strides.clone()
}

/// Remove array axis `axis` and return the result.
fn try_remove_axis(self, axis: Axis) -> ArrayBase<S, D::Smaller> {
let d = self.dim.try_remove_axis(axis);
Expand Down