Skip to content

[RNG] Workaround for get_multi_ptr with AdaptiveCPP #535

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
iMartyan merged 5 commits into from
Jul 12, 2024
Merged

[RNG] Workaround for get_multi_ptr with AdaptiveCPP #535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
158849d
Initial commit
iMartyan Jul 9, 2024
c1cf5db
changed template to more common
iMartyan Jul 10, 2024
3e85cd6
typename and examples
iMartyan Jul 11, 2024
3211b7e
tests
iMartyan Jul 11, 2024
479cb68
clang-format
iMartyan Jul 12, 2024
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
10 changes: 10 additions & 0 deletions examples/rng/device/include/rng_example_helper.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,22 @@ struct has_member_code_meta<T, std::void_t<decltype(std::declval<T>().get_multi_

template <typename T, typename std::enable_if<has_member_code_meta<T>::value>::type* = nullptr>
auto get_multi_ptr(T acc) {
// Workaround for AdaptiveCPP, as they do not yet support the get_multi_ptr function
#ifndef __HIPSYCL__
return acc.get_multi_ptr();
#else
return acc.get_pointer();
#endif
};

template <typename T, typename std::enable_if<!has_member_code_meta<T>::value>::type* = nullptr>
auto get_multi_ptr(T acc) {
// Workaround for AdaptiveCPP, as they do not yet support the get_multi_ptr function
#ifndef __HIPSYCL__
return acc.template get_multi_ptr<sycl::access::decorated::yes>();
#else
return acc.get_pointer();
#endif
};

#endif // _RNG_EXAMPLE_HELPER_HPP__
9 changes: 7 additions & 2 deletions src/rng/backends/mklcpu/cpu_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,9 +56,14 @@ class kernel_name {};
template <typename Engine, typename Distr>
class kernel_name_usm {};

template <typename T, sycl::access_mode AccMode>
T *get_raw_ptr(sycl::accessor<T, 1, AccMode> acc) {
template <typename Acc>
typename Acc::value_type *get_raw_ptr(Acc acc) {
// Workaround for AdaptiveCPP, as they do not yet support the get_multi_ptr function
#ifndef __HIPSYCL__
return acc.template get_multi_ptr<sycl::access::decorated::no>().get_raw();
#else
return acc.get_pointer();
#endif
}

} // namespace mklcpu
Expand Down
8 changes: 8 additions & 0 deletions tests/unit_tests/rng/device/include/rng_device_test_common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,12 +112,20 @@ struct has_member_code_meta<T, std::void_t<decltype(std::declval<T>().get_multi_

template <typename T, typename std::enable_if<has_member_code_meta<T>::value>::type* = nullptr>
auto get_multi_ptr(T acc) {
#ifndef __HIPSYCL__
return acc.get_multi_ptr();
#else
return acc.get_pointer();
#endif
};

template <typename T, typename std::enable_if<!has_member_code_meta<T>::value>::type* = nullptr>
auto get_multi_ptr(T acc) {
#ifndef __HIPSYCL__
return acc.template get_multi_ptr<sycl::access::decorated::yes>();
#else
return acc.get_pointer();
#endif
};

template <typename T>
Expand Down