Commit cfe193b9 authored by Tomáš Oberhuber's avatar Tomáš Oberhuber Committed by Tomáš Oberhuber
Browse files

Reverting fixes of asserts in Array/ArrayView::operator[] since it is not accepted by nvcc.

parent c63e7386

src/TNL/Containers/Array.hpp

+4 −4
Original line number Diff line number Diff line
@@ -510,9 +510,9 @@ Array< Value, Device, Index, Allocator >:: 
operator[]( const Index& i )

{

#ifdef __CUDA_ARCH__

   TNL_ASSERT_TRUE( ( std::is_same< Device, Devices::Cuda >::value ), "Attempt to access data not allocated on CUDA device from CUDA device." );

   TNL_ASSERT( ( std::is_same< Device, Devices::Cuda >::value ), "Attempt to access data not allocated on CUDA device from CUDA device." );

#else

   TNL_ASSERT_TRUE( ( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Sequential >::value ),

   TNL_ASSERT( ( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Sequential >::value ),

               "Attempt to access data not allocated on the host from the host." );

#endif

   TNL_ASSERT_GE( i, (Index) 0, "Element index must be non-negative." );
@@ -530,9 +530,9 @@ Array< Value, Device, Index, Allocator >:: 
operator[]( const Index& i ) const

{

#ifdef __CUDA_ARCH__

   TNL_ASSERT_TRUE( ( std::is_same< Device, Devices::Cuda >::value ), "Attempt to access data not allocated on CUDA device from CUDA device." );

   TNL_ASSERT( ( std::is_same< Device, Devices::Cuda >::value ), "Attempt to access data not allocated on CUDA device from CUDA device." );

#else

   TNL_ASSERT_TRUE( ( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Sequential >::value ),

   TNL_ASSERT( ( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Sequential >::value ),

               "Attempt to access data not allocated on the host from the host." );

#endif

   TNL_ASSERT_GE( i, (Index) 0, "Element index must be non-negative." );

src/TNL/Containers/ArrayView.hpp

+4 −4
Original line number Diff line number Diff line
@@ -253,9 +253,9 @@ Value& ArrayView< Value, Device, Index >:: 
operator[]( Index i )

{

#ifdef __CUDA_ARCH__

   TNL_ASSERT_TRUE( ( std::is_same< Device, Devices::Cuda >::value ), "Attempt to access data not allocated on CUDA device from CUDA device." );

   TNL_ASSERT( ( std::is_same< Device, Devices::Cuda >::value ), "Attempt to access data not allocated on CUDA device from CUDA device." );

#else

   TNL_ASSERT_TRUE( ( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Sequential >::value ),

   TNL_ASSERT( ( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Sequential >::value ),

               "Attempt to access data not allocated on the host from the host." );

#endif

   TNL_ASSERT_GE( i, 0, "Element index must be non-negative." );
@@ -272,9 +272,9 @@ Value& ArrayView< Value, Device, Index >:: 
operator[]( Index i ) const

{

#ifdef __CUDA_ARCH__

   TNL_ASSERT_TRUE( ( std::is_same< Device, Devices::Cuda >::value ), "Attempt to access data not allocated on CUDA device from CUDA device." );

   TNL_ASSERT( ( std::is_same< Device, Devices::Cuda >::value ), "Attempt to access data not allocated on CUDA device from CUDA device." );

#else

   TNL_ASSERT_TRUE( ( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Sequential >::value ),

   TNL_ASSERT( ( std::is_same< Device, Devices::Host >::value || std::is_same< Device, Devices::Sequential >::value ),

               "Attempt to access data not allocated on the host from the host." );

#endif

   TNL_ASSERT_GE( i, 0, "Element index must be non-negative." );