feedc0de/boost_config
1
0
Fork 0
forked from boostorg/config
Code Pull Requests Activity

Update nvcc.hpp

Browse Source
This commit is contained in:
jzmaddock
2017-08-18 18:13:38 +01:00
committed by GitHub
parent 17a4997aaa
commit 593389dc4b
1 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
include/boost/config/compiler/nvcc.hpp
View File

@ -12,12 +12,10 @@
#endif #endif
#if defined(__CUDACC_VER_MAJOR__) && defined(__CUDACC_VER_MINOR__) && defined(__CUDACC_VER_BUILD__) #if defined(__CUDACC_VER_MAJOR__) && defined(__CUDACC_VER_MINOR__) && defined(__CUDACC_VER_BUILD__)
# define BOOST_CUDA_VERSION __CUDACC_VER_MAJOR__ * 10000 + __CUDACC_VER_MINOR__ * 100 + __CUDACC_VER_BUILD__ # define BOOST_CUDA_VERSION __CUDACC_VER_MAJOR__ * 1000000 + __CUDACC_VER_MINOR__ * 10000 + __CUDACC_VER_BUILD__
#elif defined(__CUDACC_VER__)
define BOOST_CUDA_VERSION __CUDACC_VER__
#else #else
// We don't really know what the CUDA version is, but it's definitely before 7.5: // We don't really know what the CUDA version is, but it's definitely before 7.5:
# define BOOST_CUDA_VERSION 70000 # define BOOST_CUDA_VERSION 7000000
#endif #endif
// NVIDIA Specific support // NVIDIA Specific support
@ -28,11 +26,11 @@
// https://svn.boost.org/trac/boost/ticket/11897 // https://svn.boost.org/trac/boost/ticket/11897
// This is fixed in 7.5. As the following version macro was introduced in 7.5 an existance // This is fixed in 7.5. As the following version macro was introduced in 7.5 an existance
// check is enough to detect versions < 7.5 // check is enough to detect versions < 7.5
#if BOOST_CUDA_VERSION < 70500 #if BOOST_CUDA_VERSION < 7050000
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES # define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif #endif
// The same bug is back again in 8.0: // The same bug is back again in 8.0:
#if (BOOST_CUDA_VERSION > 80000) && (BOOST_CUDA_VERSION < 80100) #if (BOOST_CUDA_VERSION > 8000000) && (BOOST_CUDA_VERSION < 8010000)
# define BOOST_NO_CXX11_VARIADIC_TEMPLATES # define BOOST_NO_CXX11_VARIADIC_TEMPLATES
#endif #endif
// Most recent CUDA (8.0) has no constexpr support in msvc mode: // Most recent CUDA (8.0) has no constexpr support in msvc mode:
@ -52,7 +50,7 @@
// And this one effects the NVCC front end, // And this one effects the NVCC front end,
// See https://svn.boost.org/trac/boost/ticket/13049 // See https://svn.boost.org/trac/boost/ticket/13049
// //
#if (BOOST_CUDA_VERSION >= 80000) && (BOOST_CUDA_VERSION < 80100) #if (BOOST_CUDA_VERSION >= 8000000) && (BOOST_CUDA_VERSION < 8010000)
# define BOOST_NO_CXX11_NOEXCEPT # define BOOST_NO_CXX11_NOEXCEPT
#endif #endif