Bugfix for ArrayView::setValues.

Author: corbett5

src/ArrayView.hpp

@@ -574,9 +574,10 @@ class ArrayView
   template< typename POLICY >
   void setValues( T const & value ) const
   {
-    RAJA::forall< POLICY >( RAJA::TypedRangeSegment< INDEX_TYPE >( 0, size() ), [value, this] LVARRAY_HOST_DEVICE ( INDEX_TYPE const i )
+    auto const view = toView();
+    RAJA::forall< POLICY >( RAJA::TypedRangeSegment< INDEX_TYPE >( 0, size() ), [value, view] LVARRAY_HOST_DEVICE ( INDEX_TYPE const i )
       {
-        data()[ i ] = value;
+        view.data()[ i ] = value;
       } );
   }
 
@@ -595,9 +596,10 @@ class ArrayView
                                "This method only works with Arrays with the same data layout." );
     }
 
-    RAJA::forall< POLICY >( RAJA::TypedRangeSegment< INDEX_TYPE >( 0, size() ), [rhs, this] LVARRAY_HOST_DEVICE ( INDEX_TYPE const i )
+    auto const view = toView();
+    RAJA::forall< POLICY >( RAJA::TypedRangeSegment< INDEX_TYPE >( 0, size() ), [view, rhs] LVARRAY_HOST_DEVICE ( INDEX_TYPE const i )
       {
-        data()[ i ] = rhs.data()[ i ];
+        view.data()[ i ] = rhs.data()[ i ];
       } );
   }
 

unitTests/testArray1DOfArray1D.cpp

@@ -5,8 +5,6 @@
  * SPDX-License-Identifier: (BSD-3-Clause)
  */
 
-#if 0
-
 // Source includes
 #include "Array.hpp"
 #include "output.hpp"
@@ -277,5 +275,3 @@ int main( int argc, char * * argv )
   int const result = RUN_ALL_TESTS();
   return result;
 }
-
-#endif

unitTests/testArrayView.hpp

@@ -433,17 +433,19 @@ class ArrayViewPolicyTest : public ArrayViewTest< typename ARRAY_POLICY_PAIR::fi
     }
 
     array->template setValues< POLICY >( value );
-    array->move( MemorySpace::CPU );
+
+    ViewTypeConst const view = array->toViewConst();
+    forall< POLICY >( array->size(), [view, value] LVARRAY_HOST_DEVICE ( INDEX_TYPE const i )
+        {
+          PORTABLE_EXPECT_EQ( view.data()[ i ], value );
+        } );
 
     EXPECT_EQ( array->size(), totalSize );
     EXPECT_EQ( array->capacity(), totalSize );
     EXPECT_EQ( array->data(), initialPtr );
 
     for( int dim = 0; dim < NDIM; ++dim )
     { EXPECT_EQ( array->size( dim ), sizes[ dim ] ); }
-
-    for( INDEX_TYPE i = 0; i < array->size(); ++i )
-    { EXPECT_EQ( array->data()[ i ], value ); }
   }
 
   static void setValuesFromView()
@@ -454,16 +456,21 @@ class ArrayViewPolicyTest : public ArrayViewTest< typename ARRAY_POLICY_PAIR::fi
     array.resize( NDIM, arrayToCopy->dims() );
     T const * const initialPtr = array.data();
 
+    ViewTypeConst const viewToCopy = arrayToCopy->toViewConst();
     array.template setValues< POLICY >( arrayToCopy->toViewConst() );
-    array.move( MemorySpace::CPU );
+
+    ViewTypeConst const view = array.toViewConst();
+    forall< POLICY >( array.size(), [view, viewToCopy] LVARRAY_HOST_DEVICE ( INDEX_TYPE const i )
+        {
+          PORTABLE_EXPECT_EQ( view.data()[ i ], viewToCopy.data()[ i ] );
+        } );
+
 
     EXPECT_EQ( array.size(), arrayToCopy->size() );
     EXPECT_EQ( array.capacity(), arrayToCopy->size() );
     EXPECT_EQ( array.data(), initialPtr );
 
-    for( int dim = 0; dim < NDIM; ++dim )
-    { EXPECT_EQ( array.size( dim ), arrayToCopy->size( dim ) ); }
-
+    array.move( MemorySpace::CPU );
     ParentClass::checkFill( array );
   }