From e7ed54fd0819f6b3cb7411f3a07531f0aa316bbd Mon Sep 17 00:00:00 2001 From: Bernhard Manfred Gruber Date: Thu, 4 May 2023 14:21:44 +0200 Subject: [PATCH] Remove nvcc workaround --- include/llama/mapping/AoS.hpp | 2 +- include/llama/mapping/AoSoA.hpp | 2 +- include/llama/mapping/One.hpp | 2 +- include/llama/mapping/SoA.hpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/include/llama/mapping/AoS.hpp b/include/llama/mapping/AoS.hpp index 294e0fe666..5dd85f1be0 100644 --- a/include/llama/mapping/AoS.hpp +++ b/include/llama/mapping/AoS.hpp @@ -47,7 +47,7 @@ namespace llama::mapping RecordCoord = {}) const -> NrAndOffset { constexpr std::size_t flatFieldIndex = -#ifdef __NVCC__ +#if defined(__NVCC__) && __CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ <= 6 *& // mess with nvcc compiler state to workaround bug #endif Flattener::template flatIndex; diff --git a/include/llama/mapping/AoSoA.hpp b/include/llama/mapping/AoSoA.hpp index 4b901c81eb..0f80c88bb8 100644 --- a/include/llama/mapping/AoSoA.hpp +++ b/include/llama/mapping/AoSoA.hpp @@ -61,7 +61,7 @@ namespace llama::mapping RecordCoord = {}) const -> NrAndOffset { constexpr std::size_t flatFieldIndex = -#ifdef __NVCC__ +#if defined(__NVCC__) && __CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ <= 6 *& // mess with nvcc compiler state to workaround bug #endif Flattener::template flatIndex; diff --git a/include/llama/mapping/One.hpp b/include/llama/mapping/One.hpp index ff85f8d377..ebba9bca2f 100644 --- a/include/llama/mapping/One.hpp +++ b/include/llama/mapping/One.hpp @@ -55,7 +55,7 @@ namespace llama::mapping RecordCoord = {}) const -> NrAndOffset { constexpr std::size_t flatFieldIndex = -#ifdef __NVCC__ +#if defined(__NVCC__) && __CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ <= 6 *& // mess with nvcc compiler state to workaround bug #endif Flattener::template flatIndex; diff --git a/include/llama/mapping/SoA.hpp b/include/llama/mapping/SoA.hpp index 4b170c3baf..c24701662e 100644 --- a/include/llama/mapping/SoA.hpp +++ b/include/llama/mapping/SoA.hpp @@ -135,7 +135,7 @@ namespace llama::mapping else { constexpr std::size_t flatFieldIndex = -#ifdef __NVCC__ +#if defined(__NVCC__) && __CUDACC_VER_MAJOR__ == 11 && __CUDACC_VER_MINOR__ <= 6 *& // mess with nvcc compiler state to workaround bug #endif Flattener::template flatIndex;