Skip to content
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

Fix namespace lookup issues in <oneapi/dpl/random> header #1855

Merged
merged 2 commits into from
Sep 19, 2024
Merged

Fix namespace lookup issues in <oneapi/dpl/random> header #1855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c1d1c50
Fix namespace lookup issues in <oneapi/dpl/random> header
dmitriy-sobolev Sep 17, 2024
4862a0b
Include <oneapi/dpl/random> only if SYCL is available
dmitriy-sobolev Sep 17, 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
34 changes: 17 additions & 17 deletions include/oneapi/dpl/internal/random_impl/philox_engine.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,32 +33,32 @@ namespace experimental
{

template <typename _UIntType, std::size_t _w, std::size_t _n, std::size_t _r,
internal::element_type_t<_UIntType>... _consts>
oneapi::dpl::internal::element_type_t<_UIntType>... _consts>
class philox_engine;

template <typename __CharT, typename __Traits, typename __UIntType, std::size_t __w, std::size_t __n, std::size_t __r,
internal::element_type_t<__UIntType>... __consts>
oneapi::dpl::internal::element_type_t<__UIntType>... __consts>
std::basic_ostream<__CharT, __Traits>&
operator<<(std::basic_ostream<__CharT, __Traits>&, const philox_engine<__UIntType, __w, __n, __r, __consts...>&);

template <typename __UIntType, std::size_t __w, std::size_t __n, std::size_t __r,
internal::element_type_t<__UIntType>... __consts>
oneapi::dpl::internal::element_type_t<__UIntType>... __consts>
const sycl::stream&
operator<<(const sycl::stream&, const philox_engine<__UIntType, __w, __n, __r, __consts...>&);

template <typename __CharT, typename __Traits, typename __UIntType, std::size_t __w, std::size_t __n, std::size_t __r,
internal::element_type_t<__UIntType>... __consts>
oneapi::dpl::internal::element_type_t<__UIntType>... __consts>
std::basic_istream<__CharT, __Traits>&
operator>>(std::basic_istream<__CharT, __Traits>&, philox_engine<__UIntType, __w, __n, __r, __consts...>&);

template <typename _UIntType, std::size_t _w, std::size_t _n, std::size_t _r,
internal::element_type_t<_UIntType>... _consts>
oneapi::dpl::internal::element_type_t<_UIntType>... _consts>
class philox_engine
{
public:
/* Types */
using result_type = _UIntType;
using scalar_type = internal::element_type_t<result_type>;
using scalar_type = oneapi::dpl::internal::element_type_t<result_type>;

private:
/* The size of the consts arrays */
Expand Down Expand Up @@ -140,14 +140,14 @@ class philox_engine
result_type
operator()()
{
return generate_internal<internal::type_traits_t<result_type>::num_elems>();
return generate_internal<oneapi::dpl::internal::type_traits_t<result_type>::num_elems>();
}

/* operator () overload for result portion generation */
result_type
operator()(unsigned int __random_nums)
{
return generate_internal<internal::type_traits_t<result_type>::num_elems>(__random_nums);
return generate_internal<oneapi::dpl::internal::type_traits_t<result_type>::num_elems>(__random_nums);
}

/* Shift the counter only forward relative to its current position */
Expand Down Expand Up @@ -175,17 +175,17 @@ class philox_engine

/* Inserters and extractors */
template <typename __CharT, typename __Traits, typename __UIntType, std::size_t __w, std::size_t __n,
std::size_t __r, internal::element_type_t<__UIntType>... __consts>
std::size_t __r, oneapi::dpl::internal::element_type_t<__UIntType>... __consts>
friend std::basic_ostream<__CharT, __Traits>&
operator<<(std::basic_ostream<__CharT, __Traits>&, const philox_engine<__UIntType, __w, __n, __r, __consts...>&);

template <typename __UIntType, std::size_t __w, std::size_t __n, std::size_t __r,
internal::element_type_t<__UIntType>... __consts>
oneapi::dpl::internal::element_type_t<__UIntType>... __consts>
friend const sycl::stream&
operator<<(const sycl::stream&, const philox_engine<__UIntType, __w, __n, __r, __consts...>&);

template <typename __CharT, typename __Traits, typename __UIntType, std::size_t __w, std::size_t __n,
std::size_t __r, internal::element_type_t<__UIntType>... __consts>
std::size_t __r, oneapi::dpl::internal::element_type_t<__UIntType>... __consts>
friend std::basic_istream<__CharT, __Traits>&
operator>>(std::basic_istream<__CharT, __Traits>&, philox_engine<__UIntType, __w, __n, __r, __consts...>&);

Expand Down Expand Up @@ -447,12 +447,12 @@ class philox_engine
};

template <typename __CharT, typename __Traits, typename __UIntType, std::size_t __w, std::size_t __n, std::size_t __r,
internal::element_type_t<__UIntType>... __consts>
oneapi::dpl::internal::element_type_t<__UIntType>... __consts>
std::basic_ostream<__CharT, __Traits>&
operator<<(std::basic_ostream<__CharT, __Traits>& __os,
const philox_engine<__UIntType, __w, __n, __r, __consts...>& __engine)
{
internal::save_stream_flags<__CharT, __Traits> __flags(__os);
oneapi::dpl::internal::save_stream_flags<__CharT, __Traits> __flags(__os);

__os.setf(std::ios_base::dec | std::ios_base::left);
__CharT __sp = __os.widen(' ');
Expand All @@ -476,7 +476,7 @@ operator<<(std::basic_ostream<__CharT, __Traits>& __os,
}

template <typename __UIntType, std::size_t __w, std::size_t __n, std::size_t __r,
internal::element_type_t<__UIntType>... __consts>
oneapi::dpl::internal::element_type_t<__UIntType>... __consts>
const sycl::stream&
operator<<(const sycl::stream& __os, const philox_engine<__UIntType, __w, __n, __r, __consts...>& __engine)
{
Expand All @@ -498,17 +498,17 @@ operator<<(const sycl::stream& __os, const philox_engine<__UIntType, __w, __n, _
}

template <typename __CharT, typename __Traits, typename __UIntType, std::size_t __w, std::size_t __n, std::size_t __r,
internal::element_type_t<__UIntType>... __consts>
oneapi::dpl::internal::element_type_t<__UIntType>... __consts>
std::basic_istream<__CharT, __Traits>&
operator>>(std::basic_istream<__CharT, __Traits>& __is, philox_engine<__UIntType, __w, __n, __r, __consts...>& __engine)
{
internal::save_stream_flags<__CharT, __Traits> __flags(__is);
oneapi::dpl::internal::save_stream_flags<__CharT, __Traits> __flags(__is);

__is.setf(std::ios_base::dec);

const std::size_t __state_size = 2 * __n + __n / 2 + 1;

std::array<internal::element_type_t<__UIntType>, __state_size> __tmp_inp;
std::array<oneapi::dpl::internal::element_type_t<__UIntType>, __state_size> __tmp_inp;
for (std::size_t __i = 0; __i < __state_size; ++__i)
{
__is >> __tmp_inp[__i];
Expand Down
8 changes: 5 additions & 3 deletions test/general/multiple_translation_units/header_umbrella.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,11 @@
#include <oneapi/dpl/memory>
#include <oneapi/dpl/numeric>
#include <oneapi/dpl/optional>
// TODO: investigate issues:
// philox_engine.h:36:11: error: no template named 'element_type_t' in namespace 'oneapi::dpl::experimental::internal'; did you mean '::oneapi::dpl::internal::element_type_t'?
// #include <oneapi/dpl/random>

#if TEST_DPCPP_BACKEND_PRESENT
# include <oneapi/dpl/random>
#endif

#include <oneapi/dpl/ranges>
#include <oneapi/dpl/ratio>
#include <oneapi/dpl/tuple>
Expand Down
Loading