Skip to content

Commit d5b5bd8

Browse files
authored
RAJA loop_exec deprecated for seq_exec (#309)
loop_exec->seq_exec
1 parent 2c370fb commit d5b5bd8

9 files changed

Lines changed: 14 additions & 14 deletions

File tree

docs/sphinx/ArrayOfArrays.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,8 @@ The following timings are from a clang 10 release build on LLNL's Quartz system
226226
Function RAJA Policy Time
227227
======================== ========================= ======
228228
``vector`` N/A 0.99s
229-
``overAllocation`` ``loop_exec`` 0.49s
230-
``resizeFromCapacities`` ``loop_exec`` 0.58s
229+
``overAllocation`` ``seq_exec`` 0.49s
230+
``resizeFromCapacities`` ``seq_exec`` 0.58s
231231
``overAllocation`` ``omp_parallel_for_exec`` 0.11s
232232
``resizeFromCapacities`` ``omp_parallel_for_exec`` 0.17s
233233
======================== ========================= ======

examples/exampleArray.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -350,7 +350,7 @@ CUDA_TEST( Array, chaiBuffer )
350350
LvArray::ChaiBuffer > const & view = array;
351351

352352
// Capture the view in a host kernel which moves the data back to the host.
353-
RAJA::forall< RAJA::loop_exec >(
353+
RAJA::forall< RAJA::seq_exec >(
354354
RAJA::TypedRangeSegment< std::ptrdiff_t >( 0, view.size() ),
355355
[view] ( std::ptrdiff_t const i )
356356
{

examples/exampleArrayOfArrays.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ TEST( ArrayOfArrays, resizeFromCapacities )
266266

267267
// Resize the ArrayOfArrays from a new list of capacities.
268268
std::array< std::ptrdiff_t, 3 > newCapacities = { 3, 5, 2 };
269-
arrayOfArrays.resizeFromCapacities< RAJA::loop_exec >( newCapacities.size(), newCapacities.data() );
269+
arrayOfArrays.resizeFromCapacities< RAJA::seq_exec >( newCapacities.size(), newCapacities.data() );
270270

271271
// This will clear any existing arrays.
272272
EXPECT_EQ( arrayOfArrays.size(), 3 );
@@ -311,7 +311,7 @@ CUDA_TEST( ArrayOfArrays, ChaiBuffer )
311311

312312
// Capture the view on the host. This will copy back the values and sizes since they were previously touched
313313
// on device. It will only touch the values on host.
314-
RAJA::forall< RAJA::loop_exec >(
314+
RAJA::forall< RAJA::seq_exec >(
315315
RAJA::TypedRangeSegment< std::ptrdiff_t >( 0, viewConstSizes.size() ),
316316
[viewConstSizes] ( std::ptrdiff_t const i )
317317
{
@@ -332,7 +332,7 @@ CUDA_TEST( ArrayOfArrays, ChaiBuffer )
332332

333333
// Capture the view on device. Since the values were previously touched on host it will copy them over.
334334
// Both the sizes and offsets are current on device so they are not copied over. Nothing is touched.
335-
RAJA::forall< RAJA::loop_exec >(
335+
RAJA::forall< RAJA::seq_exec >(
336336
RAJA::TypedRangeSegment< std::ptrdiff_t >( 0, viewConst.size() ),
337337
[viewConst] ( std::ptrdiff_t const i )
338338
{

examples/exampleArrayOfSets.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ TEST( ArrayOfSets, assimilate )
5959
arrayOfArrays.emplaceBack( 2, 1 );
6060

6161
// Assimilate arrayOfArrays into arrayOfSets.
62-
arrayOfSets.assimilate< RAJA::loop_exec >( std::move( arrayOfArrays ),
62+
arrayOfSets.assimilate< RAJA::seq_exec >( std::move( arrayOfArrays ),
6363
LvArray::sortedArrayManipulation::Description::SORTED_UNIQUE );
6464

6565
// After being assimilated arrayOfArrays is empty.
@@ -84,7 +84,7 @@ TEST( ArrayOfSets, assimilate )
8484
arrayOfArrays.emplaceBack( 1, 4 );
8585

8686
// Assimilate the arrayOfArrays yet again.
87-
arrayOfSets.assimilate< RAJA::loop_exec >( std::move( arrayOfArrays ),
87+
arrayOfSets.assimilate< RAJA::seq_exec >( std::move( arrayOfArrays ),
8888
LvArray::sortedArrayManipulation::Description::UNSORTED_WITH_DUPLICATES );
8989

9090
EXPECT_EQ( arrayOfSets.size(), 2 );

examples/exampleBuffers.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ CUDA_TEST( ChaiBuffer, captureOnDevice )
102102
} );
103103

104104
// Capture buffer in a host kernel moving the data back to the host allocation.
105-
RAJA::forall< RAJA::loop_exec >(
105+
RAJA::forall< RAJA::seq_exec >(
106106
RAJA::TypedRangeSegment< std::ptrdiff_t >( 0, size ),
107107
[buffer] ( std::ptrdiff_t const i )
108108
{
@@ -138,7 +138,7 @@ CUDA_TEST( ChaiBuffer, captureOnDeviceConst )
138138
// Capture buffer in a host kernel moving the data back to the host allocation.
139139
// If constBuffer didn't contain "int const" then this check would fail because
140140
// the data would be copied back from device.
141-
RAJA::forall< RAJA::loop_exec >(
141+
RAJA::forall< RAJA::seq_exec >(
142142
RAJA::TypedRangeSegment< std::ptrdiff_t >( 0, size ),
143143
[buffer] ( std::ptrdiff_t const i )
144144
{

examples/exampleSparsityPatternAndCRSMatrix.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ TEST( CRSMatrix, assimilate )
122122

123123
// Create a matrix with the sparsity pattern
124124
LvArray::CRSMatrix< double, int, std::ptrdiff_t, LvArray::MallocBuffer > matrix;
125-
matrix.assimilate< RAJA::loop_exec >( std::move( sparsity ) );
125+
matrix.assimilate< RAJA::seq_exec >( std::move( sparsity ) );
126126

127127
// The sparsity is empty after being assimilated.
128128
EXPECT_EQ( sparsity.numRows(), 0 );

src/Macros.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,7 @@ template< typename >
686686
struct RAJAHelper
687687
{};
688688

689-
using serialPolicy = RAJA::loop_exec;
689+
using serialPolicy = RAJA::seq_exec;
690690

691691
template<>
692692
struct RAJAHelper< serialPolicy >

src/python/PyCRSMatrix.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -258,7 +258,7 @@ class PyCRSMatrixWrapper final : public PyCRSMatrixWrapperBase
258258
using EXEC_POLICY = RAJA::omp_parallel_for_exec;
259259
using REDUCE_POLICY = RAJA::omp_reduce;
260260
#else
261-
using EXEC_POLICY = RAJA::loop_exec;
261+
using EXEC_POLICY = RAJA::seq_exec;
262262
using REDUCE_POLICY = RAJA::seq_reduce;
263263
#endif
264264

unitTests/testUtils.hpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ template< typename >
3636
struct RAJAHelper
3737
{};
3838

39-
using serialPolicy = RAJA::loop_exec;
39+
using serialPolicy = RAJA::seq_exec;
4040

4141
template<>
4242
struct RAJAHelper< serialPolicy >

0 commit comments

Comments
 (0)