M-Labs
/
nalgebra
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Sound implementation for from_row_iterator

This commit is contained in:
Gianluca Oldani 2022-03-02 00:52:01 +01:00 committed by Sébastien Crozet
parent 008511d96e
commit 8588ef8fb2
1 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/base/default_allocator.rs
View File

@ -87,10 +87,7 @@ impl<T: Scalar, const R: usize, const C: usize> Allocator<T, Const<R>, Const<C>>
ncols: Const<C>, ncols: Const<C>,
iter: I, iter: I,
) -> Self::Buffer { ) -> Self::Buffer {
#[cfg(feature = "no_unsound_assume_init")] let mut res = Self::allocate_uninit(nrows, ncols);
let mut res: Self::Buffer = unimplemented!();
#[cfg(not(feature = "no_unsound_assume_init"))]
let mut res = unsafe { Self::allocate_uninitialized(nrows, ncols).assume_init() };
let mut count = 0; let mut count = 0;
let res_ptr = res.as_mut_slice(); let res_ptr = res.as_mut_slice();
@ -101,7 +98,7 @@ impl<T: Scalar, const R: usize, const C: usize> Allocator<T, Const<R>, Const<C>>
{ {
unsafe { unsafe {
*res_ptr *res_ptr
.get_unchecked_mut((i % ncols.value()) * nrows.value() + i / ncols.value()) = e; .get_unchecked_mut((i % ncols.value()) * nrows.value() + i / ncols.value()) = MaybeUninit::new(e);
} }
// res_ptr[(i % ncols.value()) * nrows.value() + i / ncols.value()] = e; // res_ptr[(i % ncols.value()) * nrows.value() + i / ncols.value()] = e;
count += 1; count += 1;
@ -112,7 +109,7 @@ impl<T: Scalar, const R: usize, const C: usize> Allocator<T, Const<R>, Const<C>>
"Matrix init. from row iterator: iterator not long enough." "Matrix init. from row iterator: iterator not long enough."
); );
res unsafe { <Self as Allocator<T, Const<R>, Const<C>>>::assume_init(res) }
} }
} }
@ -250,7 +247,7 @@ impl<T: Scalar, R: DimName> Allocator<T, R, Dynamic> for DefaultAllocator {
unsafe { unsafe {
for (i, e) in it.enumerate() { for (i, e) in it.enumerate() {
*res_ptr.add((i % ncols.value()) * nrows.value() + i / ncols.value()) = e; *res_ptr.add((i % ncols.value()) * nrows.value() + i / ncols.value()) = MaybeUninit::new(e).assume_init();
count += 1; count += 1;
} }
res.set_len(nrows.value() * ncols.value()); res.set_len(nrows.value() * ncols.value());