Skip to content

Commit 7491d28

Browse files
jaredhoberockjaredhoberock
committed
Replace use of "executor" with "agent"
1 parent e3da2bd commit 7491d28

16 files changed

+188
-224
lines changed

‎bulk/algorithm/accumulate.hpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -17,13 +17,13 @@ template<std::size_t bound,
1717
typename T,
1818
typename BinaryFunction>
1919
__forceinline__ __device__
20-
T accumulate(const bounded_executor<bound,bulk::sequential_executor<grainsize> > &exec,
20+
T accumulate(const bounded_agent<bound,bulk::agent<grainsize> > &exec,
2121
RandomAccessIterator first,
2222
RandomAccessIterator last,
2323
T init,
2424
BinaryFunction binary_op)
2525
{
26-
typedef typename bounded_executor<bound,bulk::sequential_executor<grainsize> >::size_type size_type;
26+
typedef typename bounded_agent<bound,bulk::agent<grainsize> >::size_type size_type;
2727
typedef typename thrust::iterator_value<RandomAccessIterator>::type value_type;
2828

2929
size_type n = last - first;
@@ -62,15 +62,15 @@ struct buffer
6262

6363
template<std::size_t groupsize, std::size_t grainsize, typename RandomAccessIterator, typename T, typename BinaryFunction>
6464
__device__
65-
T accumulate(bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize> &g,
65+
T accumulate(bulk::concurrent_group<bulk::agent<grainsize>,groupsize> &g,
6666
RandomAccessIterator first,
6767
RandomAccessIterator last,
6868
T init,
6969
BinaryFunction binary_op)
7070
{
7171
typedef typename thrust::iterator_value<RandomAccessIterator>::type value_type;
7272

73-
typedef typename bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize>::size_type size_type;
73+
typedef typename bulk::concurrent_group<bulk::agent<grainsize>,groupsize>::size_type size_type;
7474

7575
const size_type elements_per_group = groupsize * grainsize;
7676

@@ -143,7 +143,7 @@ T accumulate(bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsi
143143

144144
template<std::size_t groupsize, std::size_t grainsize, typename RandomAccessIterator, typename T, typename BinaryFunction>
145145
__device__
146-
T accumulate(bulk::concurrent_group<bulk::sequential_executor<grainsize>, groupsize> &g,
146+
T accumulate(bulk::concurrent_group<bulk::agent<grainsize>, groupsize> &g,
147147
RandomAccessIterator first,
148148
RandomAccessIterator last,
149149
T init,

‎bulk/algorithm/adjacent_difference.hpp

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ template<std::size_t grainsize,
1414
typename T,
1515
typename BinaryOperation>
1616
__device__
17-
RandomAccessIterator2 adjacent_difference(bulk::sequential_executor<grainsize> &exec,
17+
RandomAccessIterator2 adjacent_difference(bulk::agent<grainsize> &exec,
1818
RandomAccessIterator1 first, RandomAccessIterator1 last,
1919
RandomAccessIterator2 result,
2020
T init,
@@ -38,7 +38,7 @@ template<std::size_t groupsize,
3838
typename T,
3939
typename BinaryOperation>
4040
__device__
41-
RandomAccessIterator2 adjacent_difference(bulk::concurrent_group<bulk::sequential_executor<grainsize_>,groupsize> &g,
41+
RandomAccessIterator2 adjacent_difference(bulk::concurrent_group<bulk::agent<grainsize_>,groupsize> &g,
4242
RandomAccessIterator1 first, RandomAccessIterator1 last,
4343
RandomAccessIterator2 result,
4444
T init,
@@ -48,7 +48,7 @@ RandomAccessIterator2 adjacent_difference(bulk::concurrent_group<bulk::sequentia
4848
// when the input and output do not overlap, we can avoid the need for next_init
4949
// and the barriers
5050

51-
typedef typename bulk::concurrent_group<bulk::sequential_executor<grainsize_>,groupsize>::size_type size_type;
51+
typedef typename bulk::concurrent_group<bulk::agent<grainsize_>,groupsize>::size_type size_type;
5252

5353
RandomAccessIterator2 return_me = result + (last - first);
5454

@@ -97,7 +97,7 @@ template<std::size_t groupsize,
9797
typename RandomAccessIterator2,
9898
typename BinaryOperation>
9999
__device__
100-
RandomAccessIterator2 adjacent_difference(bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize> &g,
100+
RandomAccessIterator2 adjacent_difference(bulk::concurrent_group<bulk::agent<grainsize>,groupsize> &g,
101101
RandomAccessIterator1 first, RandomAccessIterator1 last,
102102
RandomAccessIterator2 result,
103103
BinaryOperation binary_op)

‎bulk/algorithm/copy.hpp

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@ template<std::size_t bound,
1818
typename Size,
1919
typename RandomAccessIterator2>
2020
__forceinline__ __device__
21-
RandomAccessIterator2 copy_n(const bounded_executor<bound,sequential_executor<grainsize> > &b,
21+
RandomAccessIterator2 copy_n(const bounded_agent<bound,agent<grainsize> > &b,
2222
RandomAccessIterator1 first,
2323
Size n,
2424
RandomAccessIterator2 result)
2525
{
26-
typedef typename bounded_executor<bound,sequential_executor<grainsize> >::size_type size_type;
26+
typedef typename bounded_agent<bound,agent<grainsize> >::size_type size_type;
2727

2828
#pragma unroll
2929
for(size_type i = 0; i < b.bound(); ++i)
@@ -71,14 +71,14 @@ template<std::size_t size,
7171
typename RandomAccessIterator2>
7272
__forceinline__ __device__
7373
RandomAccessIterator2 simple_copy_n(bulk::concurrent_group<
74-
sequential_executor<grainsize>,
74+
agent<grainsize>,
7575
size
7676
> &g,
7777
RandomAccessIterator1 first, Size n,
7878
RandomAccessIterator2 result)
7979
{
8080
typedef bulk::concurrent_group<
81-
sequential_executor<grainsize>,
81+
agent<grainsize>,
8282
size
8383
> group_type;
8484

@@ -144,7 +144,7 @@ template<std::size_t size,
144144
typename RandomAccessIterator2>
145145
__forceinline__ __device__
146146
RandomAccessIterator2 copy_n(concurrent_group<
147-
sequential_executor<grainsize>,
147+
agent<grainsize>,
148148
size
149149
> &g,
150150
RandomAccessIterator1 first,
@@ -177,21 +177,21 @@ typename thrust::detail::enable_if<
177177
(bound <= groupsize * grainsize),
178178
RandomAccessIterator2
179179
>::type
180-
copy_n(bulk::bounded_executor<
180+
copy_n(bulk::bounded_agent<
181181
bound,
182182
concurrent_group<
183-
sequential_executor<grainsize>,
183+
agent<grainsize>,
184184
groupsize
185185
>
186186
> &g,
187187
RandomAccessIterator1 first,
188188
Size n,
189189
RandomAccessIterator2 result)
190190
{
191-
typedef bounded_executor<
191+
typedef bounded_agent<
192192
bound,
193193
concurrent_group<
194-
sequential_executor<grainsize>,
194+
agent<grainsize>,
195195
groupsize
196196
>
197197
> group_type;

‎bulk/algorithm/for_each.hpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
#pragma once
22

33
#include <bulk/detail/config.hpp>
4-
#include <bulk/sequential_executor.hpp>
4+
#include <bulk/execution_policy.hpp>
55

66

77
BULK_NS_PREFIX
88
namespace bulk
99
{
1010

1111

12-
template<typename ThreadGroup,
12+
template<typename ExecutionGroup,
1313
typename RandomAccessIterator,
1414
typename Size,
1515
typename Function>
1616
__device__
17-
RandomAccessIterator for_each_n(ThreadGroup &g, RandomAccessIterator first, Size n, Function f)
17+
RandomAccessIterator for_each_n(ExecutionGroup &g, RandomAccessIterator first, Size n, Function f)
1818
{
1919
for(Size i = g.this_thread.index();
2020
i < n;
@@ -30,16 +30,17 @@ RandomAccessIterator for_each_n(ThreadGroup &g, RandomAccessIterator first, Size
3030

3131

3232
template<std::size_t bound,
33+
std::size_t grainsize,
3334
typename RandomAccessIterator,
3435
typename Size,
3536
typename Function>
3637
__device__
37-
RandomAccessIterator for_each_n(bounded_executor<bound> &b,
38+
RandomAccessIterator for_each_n(bounded_agent<bound, bulk::agent<grainsize> > &b,
3839
RandomAccessIterator first,
3940
Size n,
4041
Function f)
4142
{
42-
typedef typename bounded_executor<bound>::size_type size_type;
43+
typedef typename bounded_agent<bound, bulk::agent<grainsize> >::size_type size_type;
4344

4445
for(size_type i = 0; i < bound; ++i)
4546
{

‎bulk/algorithm/merge.hpp

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ template<std::size_t bound,
4848
typename OutputIterator,
4949
typename Compare>
5050
__device__
51-
OutputIterator merge(const bulk::bounded_executor<bound,sequential_executor<grainsize> > &e,
51+
OutputIterator merge(const bulk::bounded_agent<bound,agent<grainsize> > &e,
5252
InputIterator1 first1, InputIterator1 last1,
5353
InputIterator2 first2, InputIterator2 last2,
5454
OutputIterator result,
5555
Compare comp)
5656
{
57-
typedef typename bounded_executor<bound,sequential_executor<grainsize> >::size_type size_type;
57+
typedef typename bounded_agent<bound,agent<grainsize> >::size_type size_type;
5858

5959
typedef typename thrust::iterator_value<InputIterator1>::type value_type1;
6060
typedef typename thrust::iterator_value<InputIterator2>::type value_type2;
@@ -149,17 +149,17 @@ __device__
149149
typename thrust::detail::enable_if<
150150
(bound <= groupsize * grainsize)
151151
>::type
152-
inplace_merge(bulk::bounded_executor<
152+
inplace_merge(bulk::bounded_agent<
153153
bound,
154154
bulk::concurrent_group<
155-
bulk::sequential_executor<grainsize>,
155+
bulk::agent<grainsize>,
156156
groupsize
157157
>
158158
> &g,
159159
RandomAccessIterator first, RandomAccessIterator middle, RandomAccessIterator last,
160160
Compare comp)
161161
{
162-
typedef typename bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize>::size_type size_type;
162+
typedef typename bulk::concurrent_group<bulk::agent<grainsize>,groupsize>::size_type size_type;
163163

164164
size_type n1 = middle - first;
165165
size_type n2 = last - middle;
@@ -202,10 +202,10 @@ typename thrust::detail::enable_if<
202202
(bound <= groupsize * grainsize),
203203
RandomAccessIterator3
204204
>::type
205-
merge(bulk::bounded_executor<
205+
merge(bulk::bounded_agent<
206206
bound,
207207
bulk::concurrent_group<
208-
bulk::sequential_executor<grainsize>,
208+
bulk::agent<grainsize>,
209209
groupsize
210210
>
211211
> &g,
@@ -214,7 +214,7 @@ merge(bulk::bounded_executor<
214214
RandomAccessIterator3 result,
215215
Compare comp)
216216
{
217-
typedef typename bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize>::size_type size_type;
217+
typedef typename bulk::concurrent_group<bulk::agent<grainsize>,groupsize>::size_type size_type;
218218

219219
size_type n1 = last1 - first1;
220220
size_type n2 = last2 - first2;
@@ -253,18 +253,18 @@ namespace merge_detail
253253
{
254254

255255

256-
// XXX this should take a bounded_executor
256+
// XXX this should take a bounded_agent
257257
template<std::size_t groupsize, std::size_t grainsize, typename RandomAccessIterator1, typename RandomAccessIterator2, typename RandomAccessIterator3, typename RandomAccessIterator4, typename Compare>
258258
__device__
259259
RandomAccessIterator4
260-
bounded_merge_with_buffer(bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize> &exec,
260+
bounded_merge_with_buffer(bulk::concurrent_group<bulk::agent<grainsize>,groupsize> &exec,
261261
RandomAccessIterator1 first1, RandomAccessIterator1 last1,
262262
RandomAccessIterator2 first2, RandomAccessIterator2 last2,
263263
RandomAccessIterator3 buffer,
264264
RandomAccessIterator4 result,
265265
Compare comp)
266266
{
267-
typedef typename bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize>::size_type size_type;
267+
typedef typename bulk::concurrent_group<bulk::agent<grainsize>,groupsize>::size_type size_type;
268268

269269
size_type n1 = last1 - first1;
270270
size_type n2 = last2 - first2;
@@ -292,13 +292,13 @@ RandomAccessIterator4
292292

293293
template<std::size_t groupsize, std::size_t grainsize, typename RandomAccessIterator1, typename RandomAccessIterator2, typename RandomAccessIterator3, typename Compare>
294294
__device__
295-
RandomAccessIterator3 merge(bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize> &exec,
295+
RandomAccessIterator3 merge(bulk::concurrent_group<bulk::agent<grainsize>,groupsize> &exec,
296296
RandomAccessIterator1 first1, RandomAccessIterator1 last1,
297297
RandomAccessIterator2 first2, RandomAccessIterator2 last2,
298298
RandomAccessIterator3 result,
299299
Compare comp)
300300
{
301-
typedef typename bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize>::size_type size_type;
301+
typedef typename bulk::concurrent_group<bulk::agent<grainsize>,groupsize>::size_type size_type;
302302

303303
typedef typename thrust::iterator_value<RandomAccessIterator3>::type value_type;
304304

‎bulk/algorithm/reduce.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ __device__ T destructive_reduce_n(ConcurrentGroup &g, RandomAccessIterator first
5858

5959
template<std::size_t groupsize, std::size_t grainsize, typename RandomAccessIterator, typename T, typename BinaryFunction>
6060
__device__
61-
T reduce(bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize> &g,
61+
T reduce(bulk::concurrent_group<bulk::agent<grainsize>,groupsize> &g,
6262
RandomAccessIterator first,
6363
RandomAccessIterator last,
6464
T init,
@@ -154,8 +154,8 @@ T reduce(bulk::concurrent_group<> &g,
154154
typedef int size_type;
155155

156156
const size_type groupsize = g.size();
157-
typedef typename bulk::concurrent_group<>::executor_type executor_type;
158-
const size_type grainsize = executor_type::static_grainsize;
157+
typedef typename bulk::concurrent_group<>::agent_type agent_type;
158+
const size_type grainsize = agent_type::static_grainsize;
159159
const size_type elements_per_group = groupsize * grainsize;
160160

161161
size_type tid = g.this_exec.index();

‎bulk/algorithm/reduce_by_key.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ thrust::tuple<
6868
typename thrust::iterator_value<OutputIterator2>::type
6969
>
7070
__device__
71-
reduce_by_key(bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize> &g,
71+
reduce_by_key(bulk::concurrent_group<bulk::agent<grainsize>,groupsize> &g,
7272
InputIterator1 keys_first, InputIterator1 keys_last,
7373
InputIterator2 values_first,
7474
OutputIterator1 keys_result,
@@ -81,7 +81,7 @@ reduce_by_key(bulk::concurrent_group<bulk::sequential_executor<grainsize>,groups
8181
typedef typename thrust::iterator_value<InputIterator1>::type key_type;
8282
typedef typename thrust::iterator_value<InputIterator2>::type value_type; // XXX this should be the type returned by BinaryFunction
8383

84-
typedef typename bulk::concurrent_group<bulk::sequential_executor<grainsize>,groupsize>::size_type size_type;
84+
typedef typename bulk::concurrent_group<bulk::agent<grainsize>,groupsize>::size_type size_type;
8585

8686
const size_type interval_size = groupsize * grainsize;
8787

0 commit comments

Comments
 (0)