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

Optimize strided loop assignment for runtime-contiguous layout types with contiguous assignment #2810

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Optimize strided loop assignment for runtime-contiguous layout types with contiguous assignment #2810

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
8 changes: 5 additions & 3 deletions include/xtensor/xassign.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1141,6 +1141,8 @@ namespace xt
std::size_t simd_size = inner_loop_size / simd_type::size;
std::size_t simd_rest = inner_loop_size % simd_type::size;

bool e1_is_contiguous = E1::contiguous_layout || e1.is_contiguous();

auto fct_stepper = e2.stepper_begin(e1.shape());
auto res_stepper = e1.stepper_begin(e1.shape());

Expand Down Expand Up @@ -1191,7 +1193,7 @@ namespace xt
fct_stepper.to_begin();

// need to step E1 as well if not contigous assign (e.g. view)
if (!E1::contiguous_layout)
if (!E1::contiguous_layout && !e1_is_contiguous)
{
res_stepper.to_begin();
for (std::size_t i = 0; i < idx.size(); ++i)
Expand Down Expand Up @@ -1266,7 +1268,7 @@ namespace xt
fct_stepper.to_begin();

// need to step E1 as well if not contigous assign (e.g. view)
if (!E1::contiguous_layout)
if (!E1::contiguous_layout && !e1_is_contiguous)
{
res_stepper.to_begin();
for (std::size_t i = 0; i < idx.size(); ++i)
Expand Down Expand Up @@ -1311,7 +1313,7 @@ namespace xt
fct_stepper.to_begin();

// need to step E1 as well if not contigous assign (e.g. view)
if (!E1::contiguous_layout)
if (!E1::contiguous_layout && !e1_is_contiguous)
{
res_stepper.to_begin();
for (std::size_t i = 0; i < idx.size(); ++i)
Expand Down
Loading