From 4b9c620752f3ea13cddb8d6ff773a117afe13d20 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jakub=20Klinkovsk=C3=BD?= <klinkovsky@mmg.fjfi.cvut.cz>
Date: Wed, 4 Dec 2019 14:57:19 +0100
Subject: [PATCH] Fixed static asserts in NDArray due to nvcc 10.2
---
src/TNL/Containers/NDArray.h | 4 ++--
src/TNL/Containers/NDArrayView.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/src/TNL/Containers/NDArray.h b/src/TNL/Containers/NDArray.h
index 3cbc8a7bc1..cd741e0664 100644
--- a/src/TNL/Containers/NDArray.h
+++ b/src/TNL/Containers/NDArray.h
@@ -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
diff --git a/src/TNL/Containers/NDArrayView.h b/src/TNL/Containers/NDArrayView.h
index d5d94d61ee..1d3663ecdf 100644
--- a/src/TNL/Containers/NDArrayView.h
+++ b/src/TNL/Containers/NDArrayView.h
@@ -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
--
GitLab