Macro redefinition on windows with CUDA

[orgonth]

Describe the bug

Building my project on MSVC + CUDA, I have some CUDA tests (e.g. test_foo.cu) that are compiled with nvcc.
Compilation of these files fail with this error:

[build] catch2/internal/catch_compiler_capabilities.hpp(184): error C2220: the following warning is treated as an error
[build] catch2/internal/catch_compiler_capabilities.hpp(184): warning C4005: 'CATCH_INTERNAL_START_WARNINGS_SUPPRESSION': macro redefinition
[build] catch2/internal/catch_compiler_capabilities.hpp(64): note: see previous definition of 'CATCH_INTERNAL_START_WARNINGS_SUPPRESSION'
[build] catch2/internal/catch_compiler_capabilities.hpp(185): warning C4005: 'CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION': macro redefinition
[build] catch2/internal/catch_compiler_capabilities.hpp(65): note: see previous definition of 'CATCH_INTERNAL_STOP_WARNINGS_SUPPRESSION'

The problem is indeed that both _MSC_VER and __CUDACC__ are defined for these files.

Platform information:

• OS: Windows 10
• Compiler+version: Visual Studio 2019 + CUDA 11.3
• Catch version: v3.2.1

Relates to: #2307

[j-stephan]

Same here with CUDA 12 and Visual Studio 2022.

[horenmar]

Can you check if the linked commit fixes your issue?

[orgonth]

It "works" but I have another error now:

[build] test_ProcDemodulate.cu(38): error C2220: the following warning is treated as an error
[build] test_ProcDemodulate.cu(38): warning C4068: unknown pragma 'nv_diagnostic'
[build] test_ProcDemodulate.cu(38): warning C4068: unknown pragma 'nv_diag_suppress'
[build] test_ProcDemodulate.cu(38): warning C4068: unknown pragma 'nv_diagnostic'
[build] test_ProcDemodulate.cu(60): warning C4068: unknown pragma 'nv_diagnostic'
[build] test_ProcDemodulate.cu(60): warning C4068: unknown pragma 'nv_diagnostic'
[build] test_ProcDemodulate.cu(63): warning C4068: unknown pragma 'nv_diagnostic'
[build] test_ProcDemodulate.cu(63): warning C4068: unknown pragma 'nv_diag_suppress'
[build] test_ProcDemodulate.cu(63): warning C4068: unknown pragma 'nv_diagnostic'
[build] test_ProcDemodulate.cu(83): warning C4068: unknown pragma 'nv_diagnostic'
[build] test_ProcDemodulate.cu(83): warning C4068: unknown pragma 'nv_diagnostic'

Looks like these pragma were introduced in CUDA 11.5
See __NVCC_DIAG_PRAGMA_SUPPORT__ to solve that:
https://developer.nvidia.com/blog/reducing-application-build-times-using-cuda-c-compilation-aids/

I can propose a fix, if you want

[horenmar]

Yeah I don't have access to nvcc, so PRs are welcome.