Skip to content

[SYCL] Use SYCL containers in accessor_impl.hpp #1102

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
Feb 10, 2020
Merged

[SYCL] Use SYCL containers in accessor_impl.hpp #1102

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
16 changes: 8 additions & 8 deletions sycl/include/CL/sycl/detail/accessor_impl.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@
#include <CL/sycl/detail/sycl_mem_obj_i.hpp>
#include <CL/sycl/id.hpp>
#include <CL/sycl/range.hpp>

#include <memory>
#include <CL/sycl/stl.hpp>

__SYCL_INLINE namespace cl {
namespace sycl {
Expand Down Expand Up @@ -100,17 +99,17 @@ class AccessorImplHost {
Command *MBlockedCmd = nullptr;
};

using AccessorImplPtr = std::shared_ptr<AccessorImplHost>;
using AccessorImplPtr = shared_ptr_class<AccessorImplHost>;

class AccessorBaseHost {
public:
AccessorBaseHost(id<3> Offset, range<3> AccessRange, range<3> MemoryRange,
access::mode AccessMode, detail::SYCLMemObjI *SYCLMemObject,
int Dims, int ElemSize, int OffsetInBytes = 0,
bool IsSubBuffer = false) {
impl = std::make_shared<AccessorImplHost>(
impl = shared_ptr_class<AccessorImplHost>(new AccessorImplHost(
Offset, AccessRange, MemoryRange, AccessMode, SYCLMemObject, Dims,
ElemSize, OffsetInBytes, IsSubBuffer);
ElemSize, OffsetInBytes, IsSubBuffer));
}

protected:
Expand Down Expand Up @@ -160,12 +159,13 @@ class LocalAccessorImplHost {
}
};

using LocalAccessorImplPtr = std::shared_ptr<LocalAccessorImplHost>;
using LocalAccessorImplPtr = shared_ptr_class<LocalAccessorImplHost>;

class LocalAccessorBaseHost {
public:
LocalAccessorBaseHost(sycl::range<3> Size, int Dims, int ElemSize) {
impl = std::make_shared<LocalAccessorImplHost>(Size, Dims, ElemSize);
impl = shared_ptr_class<LocalAccessorImplHost>(
new LocalAccessorImplHost(Size, Dims, ElemSize));
}
sycl::range<3> &getSize() { return impl->MSize; }
const sycl::range<3> &getSize() const { return impl->MSize; }
Expand All @@ -181,7 +181,7 @@ class LocalAccessorBaseHost {
template <class Obj>
friend decltype(Obj::impl) getSyclObjImpl(const Obj &SyclObject);

std::shared_ptr<LocalAccessorImplHost> impl;
shared_ptr_class<LocalAccessorImplHost> impl;
};

using Requirement = AccessorImplHost;
Expand Down