Skip to content

[SYCL] Merge two set_final_data methods into one #3140

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 12 commits into from
Feb 3, 2021
Merged

[SYCL] Merge two set_final_data methods into one #3140

Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
1c56b1c
[SYCL] Fix set_final_data(..) for vector<bool>
maximdimakov Jan 26, 2021
a988a0b
[SYCL] Clang-format fix
maximdimakov Jan 26, 2021
02dbc6f
[SYCL] Adress review comments
maximdimakov Jan 26, 2021
a353a66
[SYCL] Clang-format fix
maximdimakov Jan 26, 2021
6d5d798
[SYCL] More correct usage of unique_ptr
maximdimakov Jan 26, 2021
ccc2627
[SYCL] Added <memory> lib
maximdimakov Jan 26, 2021
2efc552
Merge branch 'sycl' into fix-set_final_data
maximdimakov Jan 27, 2021
f2a2195
[SYCL] Use unique_ptr constructor instead of make_unique
maximdimakov Jan 27, 2021
d841469
[SYCL] Replace iterator_traits with iterators
maximdimakov Jan 28, 2021
7a39b8a
Merge branch 'sycl' into fix-set_final_data
maximdimakov Feb 1, 2021
7a45855
[SYCL] Merge two set_final_data methods into one
maximdimakov Feb 2, 2021
baf0466
[SYCL] Clang-format fix
maximdimakov Feb 2, 2021
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
27 changes: 3 additions & 24 deletions sycl/include/CL/sycl/detail/sycl_mem_obj_t.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,7 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {

template <typename T>
using EnableIfOutputIteratorT = enable_if_t<
/*is_output_iterator<T>::value &&*/ !std::is_pointer<T>::value &&
!std::is_same<typename T::value_type, bool>::value>;

template <typename T>
using EnableIfOutputIteratorBool =
enable_if_t<!std::is_pointer<T>::value &&
std::is_same<typename T::value_type, bool>::value>;
/*is_output_iterator<T>::value &&*/ !std::is_pointer<T>::value>;

template <typename T>
using EnableIfDefaultAllocator =
Expand Down Expand Up @@ -184,23 +178,8 @@ class __SYCL_EXPORT SYCLMemObjT : public SYCLMemObjI {
// ContiguousStorage. updateHostMemory works only with pointer to
// continuous data.
const size_t Size = MSizeInBytes / sizeof(DestinationValueT);
vector_class<DestinationValueT> ContiguousStorage(Size);
updateHostMemory(ContiguousStorage.data());
std::copy(ContiguousStorage.cbegin(), ContiguousStorage.cend(),
FinalData);
};
}

template <typename Destination>
__SYCL_DLL_LOCAL EnableIfOutputIteratorBool<Destination>
set_final_data(Destination FinalData) {
MUploadDataFunctor = [this, FinalData]() {
using DestinationValueT = iterator_value_type_t<Destination>;
// TODO if Destination is ContiguousIterator then don't create
// ContiguousStorage. updateHostMemory works only with pointer to
// continuous data.
const size_t Size = MSizeInBytes / sizeof(DestinationValueT);
std::unique_ptr<bool[]> ContiguousStorage(new bool[Size]);
std::unique_ptr<DestinationValueT[]> ContiguousStorage(
new DestinationValueT[Size]);
updateHostMemory(ContiguousStorage.get());
std::copy(ContiguousStorage.get(), ContiguousStorage.get() + Size,
FinalData);
Expand Down