fixes for CUDA 11 (#1519)

Required fixes to compile CUDA 11.
GridTools · Jun 17, 2020 · 1d4a744 · 1d4a744
1 parent f114e74
commit 1d4a744
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 2 deletions.
diff --git a/include/gridtools/common/tuple_util.hpp b/include/gridtools/common/tuple_util.hpp
@@ -475,7 +475,8 @@ namespace gridtools {
                     Fun m_fun;
 
                     template <size_t I, class... Args>
-                    GT_TARGET GT_FORCE_INLINE GT_CONSTEXPR decltype(auto) operator()(Args &&... args) const {
+                    GT_TARGET GT_FORCE_INLINE GT_CONSTEXPR auto operator()(Args &&... args) const
+                        -> decltype(m_fun(wstd::forward<Args>(args)...)) {
                         return m_fun(wstd::forward<Args>(args)...);
                     }
                 };

diff --git a/include/gridtools/meta/macros.hpp b/include/gridtools/meta/macros.hpp
@@ -22,7 +22,7 @@
  *  NVCC bug workaround: sizeof... works incorrectly within template alias context.
  */
 #if defined(__CUDACC_VER_MAJOR__) && \
-    (__CUDACC_VER_MAJOR__ < 10 || (__CUDACC_VER_MAJOR__ == 10 && __CUDACC_VER_MINOR__ < 3))
+    (__CUDACC_VER_MAJOR__ < 11 || (__CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 1))
 
 namespace gridtools {
     namespace meta {

diff --git a/include/gridtools/sid/composite.hpp b/include/gridtools/sid/composite.hpp
@@ -299,7 +299,10 @@ namespace gridtools {
                 template <class... Sids>
                 class values {
                     static_assert(sizeof...(Keys) == sizeof...(Sids), GT_INTERNAL_ERROR);
+#if defined(__CUDACC_VER_MAJOR__) && __CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ < 1
+#else
                     static_assert(conjunction<is_sid<Sids>...>::value, GT_INTERNAL_ERROR);
+#endif
 
                     typename hymap::keys<Keys...>::template values<Sids...> m_sids;