Skip to content

Commit 3bf9d1b

Browse files
committed
Remove no longer relevant comment and refactor a few lines
1 parent 2f678c1 commit 3bf9d1b

2 files changed

Lines changed: 7 additions & 9 deletions

File tree

include/xtensor/xassign.hpp

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -470,16 +470,13 @@ namespace xt
470470
linear_assigner<false>::run(de1, de2);
471471
}
472472
}
473+
else if (simd_strided_assign)
474+
{
475+
strided_loop_assigner<simd_strided_assign>::run(de1, de2);
476+
}
473477
else
474478
{
475-
if (simd_strided_assign)
476-
{
477-
strided_loop_assigner<simd_strided_assign>::run(de1, de2);
478-
}
479-
else
480-
{
481-
stepper_assigner<E1, E2, default_assignable_layout(E1::static_layout)>(de1, de2).run();
482-
}
479+
stepper_assigner<E1, E2, default_assignable_layout(E1::static_layout)>(de1, de2).run();
483480
}
484481
}
485482

include/xtensor/xcontainer.hpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -928,11 +928,12 @@ namespace xt
928928
{
929929
return i == 0;
930930
};
931-
// This is unsafe if the strides are all 0. Does that happen?
932931
if (!is_contiguous_container<storage_type>::value)
933932
{
934933
return false;
935934
}
935+
// We need to make sure the inner-most non-zero stride is one.
936+
// Trailing zero strides are ignored because they indicate bradcasted dimensions.
936937
if (m_layout == layout_type::row_major)
937938
{
938939
auto it = std::find_if_not(m_strides.rbegin(), m_strides.rend(), is_zero);

0 commit comments

Comments
 (0)