Skip to content

Commit c90223d

Browse files
authored
Dan comments applied (uxlfoundation#1688)
1 parent 9944c46 commit c90223d

16 files changed

Lines changed: 125 additions & 112 deletions

File tree

.github/Dockerfile

Lines changed: 0 additions & 14 deletions
This file was deleted.

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ jobs:
204204
- name: Install libfmt and gtest needed by Distributed Ranges tests
205205
if: (matrix.std == '23')
206206
run: |
207-
sudo apt-get install libgtest-dev libcxxopts-dev libfmt-dev -y
207+
sudo apt-get install libgtest-dev libfmt-dev -y
208208
sudo apt-get remove libgcc-14-dev cpp-14-x86-64-linux-gnu -y # gcc14 toolkit not supported yet by DR
209209
- name: Run testing
210210
shell: bash

include/oneapi/dpl/internal/distributed_ranges_impl/shp/algorithms/exclusive_scan.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,12 +41,12 @@ exclusive_scan_impl_(ExecutionPolicy&& policy, R&& r, O&& o, U init, BinaryOp bi
4141
{
4242
using T = rng::range_value_t<O>;
4343

44-
static_assert(std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, device_policy>);
44+
static_assert(std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, distributed_device_policy>);
4545

4646
auto zipped_view = views::zip(r, o);
4747
auto zipped_segments = zipped_view.zipped_segments();
4848

49-
if constexpr (std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, device_policy>)
49+
if constexpr (std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, distributed_device_policy>)
5050
{
5151

5252
U* d_inits = sycl::malloc_device<U>(rng::size(zipped_segments), devices()[0], context());

include/oneapi/dpl/internal/distributed_ranges_impl/shp/algorithms/execution_policy.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,15 +22,15 @@
2222
namespace oneapi::dpl::experimental::dr::shp
2323
{
2424

25-
struct device_policy
25+
struct distributed_device_policy
2626
{
27-
device_policy(sycl::device device) : devices_({device}) {}
28-
device_policy(sycl::queue queue) : devices_({queue.get_device()}) {}
27+
distributed_device_policy(sycl::device device) : devices_({device}) {}
28+
distributed_device_policy(sycl::queue queue) : devices_({queue.get_device()}) {}
2929

30-
device_policy() : devices_({sycl::queue{}.get_device()}) {}
30+
distributed_device_policy() : devices_({sycl::queue{}.get_device()}) {}
3131

3232
template <rng::range R>
33-
requires(std::is_same_v<rng::range_value_t<R>, sycl::device>) device_policy(R&& devices)
33+
requires(std::is_same_v<rng::range_value_t<R>, sycl::device>) distributed_device_policy(R&& devices)
3434
: devices_(rng::begin(devices), rng::end(devices))
3535
{
3636
}

include/oneapi/dpl/internal/distributed_ranges_impl/shp/algorithms/for_each.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void
3232
for_each(ExecutionPolicy&& policy, R&& r, Fn fn)
3333
{
3434
static_assert( // currently only one policy supported
35-
std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, device_policy>);
35+
std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, distributed_device_policy>);
3636

3737
std::vector<sycl::event> events;
3838

include/oneapi/dpl/internal/distributed_ranges_impl/shp/algorithms/inclusive_scan.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,12 @@ inclusive_scan_impl_(ExecutionPolicy&& policy, R&& r, O&& o, BinaryOp binary_op,
4343
{
4444
using T = rng::range_value_t<O>;
4545

46-
static_assert(std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, device_policy>);
46+
static_assert(std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, distributed_device_policy>);
4747

4848
auto zipped_view = views::zip(r, o);
4949
auto zipped_segments = zipped_view.zipped_segments();
5050

51-
if constexpr (std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, device_policy>)
51+
if constexpr (std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, distributed_device_policy>)
5252
{
5353

5454
std::vector<sycl::event> events;

include/oneapi/dpl/internal/distributed_ranges_impl/shp/algorithms/reduce.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@ T
6868
reduce(ExecutionPolicy&& policy, R&& r, T init, BinaryOp binary_op)
6969
{
7070

71-
static_assert(std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, device_policy>);
71+
static_assert(std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, distributed_device_policy>);
7272

73-
if constexpr (std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, device_policy>)
73+
if constexpr (std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, distributed_device_policy>)
7474
{
7575
using future_t = decltype(reduce_async(__detail::dpl_policy(0), ranges::segments(r)[0].begin(),
7676
ranges::segments(r)[0].end(), init, binary_op));

include/oneapi/dpl/internal/distributed_ranges_impl/shp/algorithms/transform.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ transform(ExecutionPolicy&& policy, distributed_range auto&& in, distributed_ite
4141
{
4242

4343
static_assert( // currently only one policy supported
44-
std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, device_policy>);
44+
std::is_same_v<std::remove_cvref_t<ExecutionPolicy>, distributed_device_policy>);
4545

4646
std::vector<sycl::event> events;
4747
using OutT = typename decltype(out)::value_type;

include/oneapi/dpl/internal/distributed_ranges_impl/shp/init.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ nprocs()
8080
return __detail::ngpus();
8181
}
8282

83-
inline device_policy par_unseq;
83+
inline distributed_device_policy par_unseq;
8484

8585
template <rng::range R>
8686
inline void
@@ -98,7 +98,7 @@ init(R&& devices) requires(std::is_same_v<sycl::device, std::remove_cvref_t<rng:
9898
__detail::dpl_policies_.emplace_back(__detail::queues_.back());
9999
}
100100

101-
par_unseq = device_policy(__detail::devices_);
101+
par_unseq = distributed_device_policy(__detail::devices_);
102102
}
103103

104104
template <__detail::sycl_device_selector Selector>

test/CMakeLists.txt

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,10 @@ endif()
6969
add_custom_target(build-onedpl-tests
7070
COMMENT "Build all oneDPL tests")
7171

72-
set(run-onedpl-tests-depends build-onedpl-tests)
73-
7472
add_custom_target(run-onedpl-tests
7573
COMMAND "${CMAKE_CTEST_COMMAND}" --output-on-failure
7674
USES_TERMINAL
77-
DEPENDS ${run-onedpl-tests-depends}
75+
DEPENDS build-onedpl-tests
7876
COMMENT "Build and run all oneDPL tests")
7977

8078
macro(onedpl_construct_exec test_source_file _test_name switch_off_checked_iterators custom_define extra_test_label)

0 commit comments

Comments
 (0)