Commit 4b9c6207 authored by Jakub Klinkovský's avatar Jakub Klinkovský
Browse files

Fixed static asserts in NDArray due to nvcc 10.2

parent a0f33f17

src/TNL/Containers/NDArray.h

+2 −2
Original line number Diff line number Diff line
@@ -143,10 +143,10 @@ public: 
   {

      static_assert( sizeof...( indices ) == getDimension(), "got wrong number of indices" );

      static_assert( 0 < sizeof...(Dimensions) && sizeof...(Dimensions) <= getDimension(), "got wrong number of dimensions" );

      static_assert( __ndarray_impl::all_elements_in_range( 0, Permutation::size(), {Dimensions...} ),

                     "invalid dimensions" );

// FIXME: nvcc chokes on the variadic brace-initialization

#ifndef __NVCC__

      static_assert( __ndarray_impl::all_elements_in_range( 0, Permutation::size(), {Dimensions...} ),

                     "invalid dimensions" );

      static_assert( __ndarray_impl::is_increasing_sequence( {Dimensions...} ),

                     "specifying permuted dimensions is not supported" );

#endif

src/TNL/Containers/NDArrayView.h

+2 −2
Original line number Diff line number Diff line
@@ -196,10 +196,10 @@ public: 
   {

      static_assert( sizeof...( indices ) == getDimension(), "got wrong number of indices" );

      static_assert( 0 < sizeof...(Dimensions) && sizeof...(Dimensions) <= getDimension(), "got wrong number of dimensions" );

      static_assert( __ndarray_impl::all_elements_in_range( 0, Permutation::size(), {Dimensions...} ),

                     "invalid dimensions" );

// FIXME: nvcc chokes on the variadic brace-initialization

#ifndef __NVCC__

      static_assert( __ndarray_impl::all_elements_in_range( 0, Permutation::size(), {Dimensions...} ),

                     "invalid dimensions" );

      static_assert( __ndarray_impl::is_increasing_sequence( {Dimensions...} ),

                     "specifying permuted dimensions is not supported" );

#endif