Skip to content

fixing async reshape: use proper move semantics for wait lambdas #3

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

Merged
merged 1 commit into from
Apr 17, 2024
Merged

fixing async reshape: use proper move semantics for wait lambdas #3

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
24 changes: 12 additions & 12 deletions src/idtr.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,12 +51,12 @@ template <typename T> class WaitHandle : public WaitHandleBase {
T _fini;

public:
WaitHandle(T fini) : _fini(fini) {}
WaitHandle(T &&fini) : _fini(std::move(fini)) {}
virtual void wait() override { _fini(); }
};

template <typename T> WaitHandle<T> *mkWaitHandle(T fini) {
return new WaitHandle<T>(fini);
template <typename T> WaitHandle<T> *mkWaitHandle(T &&fini) {
return new WaitHandle<T>(std::move(fini));
};

extern "C" {
Expand Down Expand Up @@ -489,24 +489,24 @@ WaitHandleBase *_idtr_copy_reshape(SHARPY::DTypeId sharpytype,
}
}

SHARPY::Buffer outbuff(totSSz * sizeof_dtype(sharpytype), 2);
SHARPY::Buffer sendbuff(totSSz * sizeof_dtype(sharpytype), 2);
bufferizeN(iNDims, iDataPtr, iDataShapePtr, iDataStridesPtr, sharpytype, N,
lsOffs.data(), lsEnds.data(), outbuff.data());
auto hdl = tc->alltoall(outbuff.data(), sszs.data(), soffs.data(), sharpytype,
oDataPtr, rszs.data(), roffs.data());
lsOffs.data(), lsEnds.data(), sendbuff.data());
auto hdl = tc->alltoall(sendbuff.data(), sszs.data(), soffs.data(),
sharpytype, oDataPtr, rszs.data(), roffs.data());

if (true || no_async) { // FIXME remove true once IMEX is fixed
if (no_async) {
tc->wait(hdl);
return nullptr;
}

auto wait = [tc = tc, hdl = hdl, outbuff = std::move(outbuff),
auto wait = [tc = tc, hdl = hdl, sendbuff = std::move(sendbuff),
sszs = std::move(sszs), soffs = std::move(soffs),
rszs = std::move(rszs),
roffs = std::move(roffs)]() { tc->wait(hdl); };
assert(outbuff.empty() && sszs.empty() && soffs.empty() && rszs.empty() &&
assert(sendbuff.empty() && sszs.empty() && soffs.empty() && rszs.empty() &&
roffs.empty());
return mkWaitHandle(wait);
return mkWaitHandle(std::move(wait));
}

/// @brief reshape array
Expand Down Expand Up @@ -918,7 +918,7 @@ void *_idtr_update_halo(SHARPY::DTypeId sharpytype, int64_t ndims,
wait();
return nullptr;
}
return mkWaitHandle(wait);
return mkWaitHandle(std::move(wait));
}

/// @brief templated wrapper for typed function versions calling
Expand Down