-
Notifications
You must be signed in to change notification settings - Fork 798
[SYCL][NFCI] Refactor weak_obj implementation
#20843
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.
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
Open
aelovikov-intel
wants to merge
8
commits into
intel:sycl
Choose a base branch
from
aelovikov-intel:weak-obj
base: sycl
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Contributor
Author
|
Going through individual commits might be easier to review, I kept them atomic. |
Contributor
Author
|
Windows failure is basically this (I think): #include <memory>
#include <type_traits>
struct ImplUtils {
template <class Obj>
static const decltype(Obj::impl) &getSyclObjImpl(const Obj &SyclObj) {
return SyclObj.impl;
}
};
template <class Obj>
auto getSyclObjImpl(const Obj &SyclObj)
-> decltype(ImplUtils::getSyclObjImpl(SyclObj)) {
return ImplUtils::getSyclObjImpl(SyclObj);
}
template <typename SYCLObjT> class weak_object_base;
template <typename SYCLObjT>
decltype(weak_object_base<SYCLObjT>::MObjWeakPtr)
getSyclWeakObjImpl(const weak_object_base<SYCLObjT> &WeakObj);
template <class SyclObjT> class OwnerLessBase {
public:
bool ext_oneapi_owner_before(
const weak_object_base<SyclObjT> &Other) const noexcept {
return getSyclObjImpl(*static_cast<const SyclObjT *>(this))
.owner_before(getSyclWeakObjImpl(Other));
}
bool ext_oneapi_owner_before(const SyclObjT &Other) const noexcept {
return getSyclObjImpl(*static_cast<const SyclObjT *>(this))
.owner_before(getSyclObjImpl(Other));
}
};
class device_impl;
class __declspec(dllexport) device : public OwnerLessBase<device> {
friend ImplUtils;
public:
private:
std::shared_ptr<device_impl> impl;
};which should be solvable by ensuring |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Most important part is the removal of a dedicated
weak_object_base.hpp. It was introduced to break a cyclic headers dependency, but a forward declaration achieves the same in a much less intrusive way.Once the header is removed and
weak_object_basedefinitions are moved intoweak_object.hppwheresycl::buffer/sycl::streamare complete we can move more common methods into theweak_object_base(seelock()).The rest is minor stylistic improvements.