fmtlib/fmt
1
0
Fork 1
mirror of https://github.com/fmtlib/fmt.git synced 2025-07-30 18:57:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixes NVIDIA HPC compiler and Intel ICC compatibility (#2732)

Browse Source 
* Fixes NVIDIA HPC compiler and Intel ICC compatibility

* Fixes NVIDIA HPC compiler and Intel ICC compatibility

* Rename FMT_NVHPC_VERSION to FMT_NVCOMPILER_VERSION

Co-authored-by: Federico Busato <fbusato@nvidia.com>
This commit is contained in:
Federico
2022-01-26 15:53:04 -08:00
committed by GitHub
parent a7aecbfcaa
commit b00a1eac75
2 changed files with 13 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
include/fmt/core.h
View File

@ -49,6 +49,13 @@
# define FMT_ICC_VERSION 0 # define FMT_ICC_VERSION 0
#endif #endif
#ifdef __NVCOMPILER
# define FMT_NVCOMPILER_VERSION \
(__NVCOMPILER_MAJOR__ * 100 + __NVCOMPILER_MINOR__)
#else
# define FMT_NVCOMPILER_VERSION 0
#endif
#ifdef __NVCC__ #ifdef __NVCC__
# define FMT_NVCC __NVCC__ # define FMT_NVCC __NVCC__
#else #else
@ -287,7 +294,7 @@
// Enable minimal optimizations for more compact code in debug mode. // Enable minimal optimizations for more compact code in debug mode.
FMT_GCC_PRAGMA("GCC push_options") FMT_GCC_PRAGMA("GCC push_options")
#ifndef __OPTIMIZE__ #if !defined(__OPTIMIZE__) && !FMT_NVCOMPILER_VERSION
FMT_GCC_PRAGMA("GCC optimize(\"Og\")") FMT_GCC_PRAGMA("GCC optimize(\"Og\")")
#endif #endif

8
include/fmt/format.h
View File

@ -159,10 +159,12 @@ FMT_END_NAMESPACE
// __builtin_ctz is broken in Intel Compiler Classic on Windows: // __builtin_ctz is broken in Intel Compiler Classic on Windows:
// https://github.com/fmtlib/fmt/issues/2510. // https://github.com/fmtlib/fmt/issues/2510.
#ifndef __ICL #ifndef __ICL
# if FMT_HAS_BUILTIN(__builtin_ctz) || FMT_GCC_VERSION || FMT_ICC_VERSION # if FMT_HAS_BUILTIN(__builtin_ctz) || FMT_GCC_VERSION || \
FMT_ICC_VERSION || FMT_NVCOMPILER_VERSION
# define FMT_BUILTIN_CTZ(n) __builtin_ctz(n) # define FMT_BUILTIN_CTZ(n) __builtin_ctz(n)
# endif # endif
# if FMT_HAS_BUILTIN(__builtin_ctzll) || FMT_GCC_VERSION || FMT_ICC_VERSION # if FMT_HAS_BUILTIN(__builtin_ctzll) || FMT_GCC_VERSION || \
FMT_ICC_VERSION || FMT_NVCOMPILER_VERSION
# define FMT_BUILTIN_CTZLL(n) __builtin_ctzll(n) # define FMT_BUILTIN_CTZLL(n) __builtin_ctzll(n)
# endif # endif
#endif #endif
@ -354,7 +356,7 @@ template <> constexpr auto num_bits<fallback_uintptr>() -> int {
FMT_INLINE void assume(bool condition) { FMT_INLINE void assume(bool condition) {
(void)condition; (void)condition;
#if FMT_HAS_BUILTIN(__builtin_assume) #if FMT_HAS_BUILTIN(__builtin_assume) && !FMT_ICC_VERSION
__builtin_assume(condition); __builtin_assume(condition);
#endif #endif
} }