Codestin Search App

kkraus14 · 2023-10-11T20:25:29Z

PR based on #2858 and #2859.

Fixes the issue where a constexpr function in spdlog may call a non-constexpr function in fmt because FMT_CONSTEXPR is not defined or is defined differently for a given compiler.

Ideally, a test could be added of building a .cu file using nvcc and add that to CI to prevent nvcc breakages moving forward.

fix the issue where constexpr function in spdlog may call non-constexpr function in the bundled fmt because FMT_USE_CONSTEXPR is not defined.

…t explaining the constexpr check

kkraus14 · 2023-10-11T21:27:07Z

An alternative approach that might work here is to reuse FMT_CONSTEXPR with something like:

#ifdef FMT_CONSTEXPR
    #define SPDLOG_CONSTEXPR_FUNC FMT_CONSTEXPR
#else
    #if __cplusplus >= 201402L
        #define SPDLOG_CONSTEXPR_FUNC constexpr
    #else
        #define SPDLOG_CONSTEXPR_FUNC inline
    #endif
#endif

This may be friendlier to when we're using std::format as opposed to fmt as well.

gabime · 2023-10-11T22:23:19Z

An alternative approach that might work here is to reuse FMT_CONSTEXPR with something like

Agreed. Seems cleaner and to the point (use same constexpr as fmt).

kkraus14 · 2023-10-11T22:42:15Z

include/spdlog/common.h

+    #if FMT_USE_CONSTEXPR
+        #define SPDLOG_CONSTEXPR_FUNC FMT_CONSTEXPR
    #else
-        #define SPDLOG_CONSTEXPR_FUNC inline
+	#define SPDLOG_CONSTEXPR_FUNC inline


I needed to change this slightly to maintain the current behavior. If fmt determines it can't use constexpr then it defines FMT_CONSTEXPR as empty

spdlog/include/spdlog/fmt/bundled/core.h

Lines 92 to 107 in cedfeeb

// Check if relaxed C++14 constexpr is supported.

// GCC doesn't allow throw in constexpr until version 6 (bug 67371).

#ifndef FMT_USE_CONSTEXPR

# if (FMT_HAS_FEATURE(cxx_relaxed_constexpr) || FMT_MSC_VERSION >= 1912 || \

(FMT_GCC_VERSION >= 600 && FMT_CPLUSPLUS >= 201402L)) && \

!FMT_ICC_VERSION && !defined(__NVCC__)

# define FMT_USE_CONSTEXPR 1

# else

# define FMT_USE_CONSTEXPR 0

# endif

#endif

#if FMT_USE_CONSTEXPR

# define FMT_CONSTEXPR constexpr

#else

# define FMT_CONSTEXPR

#endif

while spdlog's current behavior is to define it as inline

We could probably use some preprocessor magic to detect when FMT_CONSTEXPR is empty and use inline instead in those situations, but that adds some non-trivial complexity.

Why would it be empty?

It gets defined as empty for some reason:

spdlog/include/spdlog/fmt/bundled/core.h

Line 106 in cedfeeb

# define FMT_CONSTEXPR

I think it won't matter for spdlog. It can be empty for spdlog as well.

Updated based on that

…fined

kkraus14 · 2023-10-12T04:42:54Z

Looks like without the inline in C++11 (in C++14 and newer it would be constexpr) we hit some ODR violations from the header being included in multiple translation units that then get linked into a single artifact.

gabime · 2023-10-12T04:52:38Z

So I guess we need to use your first suggestion after all.

… it's defined" This reverts commit 1897f70.

kkraus14 · 2023-10-13T03:57:36Z

Reverted the change where I think this should be good to go. Thanks for your review and feedback @gabime!

gabime · 2023-10-13T07:00:09Z

Thanks @kkraus14

ShujianQian and others added 2 commits October 11, 2023 16:15

Modify the condition of SPDLOG_CONSTEXPR_FUNC to match that of fmt

b0ad647

fix the issue where constexpr function in spdlog may call non-constexpr function in the bundled fmt because FMT_USE_CONSTEXPR is not defined.

add SPDLOG_HAS_FEATURE macro to avoid redefining built-in, add commen…

23c69f8

…t explaining the constexpr check

kkraus14 mentioned this pull request Oct 11, 2023

Modify the condition of SPDLOG_CONSTEXPR_FUNC to match that of fmt #2859

Closed

Update implementation to reuse FMT_CONSTEXPR where possible

2421b09

kkraus14 commented Oct 11, 2023

View reviewed changes

don't need to inline, simplify to always use FMT_CONSTEXPR if it's de…

1897f70

…fined

Revert "don't need to inline, simplify to always use FMT_CONSTEXPR if…

fab780c

… it's defined" This reverts commit 1897f70.

gabime merged commit 0c4fb03 into gabime:v1.x Oct 13, 2023

kkraus14 mentioned this pull request Oct 13, 2023

[FEA] Update to spdlog 1.12 and fmt 10 rapidsai/rmm#1356

Closed

This was referenced Apr 23, 2024

Treat clobber warnings as errors for conda builds rapidsai/build-planning#54

Open

spdlog v1.13.0 conda-forge/spdlog-feedstock#61

Merged

update fmt and spdlog across RAPIDS rapidsai/build-planning#56

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Match SPDLOG_CONSTEXPR_FUNC to FMT_CONSTEXPR#2901

Match SPDLOG_CONSTEXPR_FUNC to FMT_CONSTEXPR#2901
gabime merged 5 commits intogabime:v1.xfrom
kkraus14:fix_nvcc

kkraus14 commented Oct 11, 2023 •

edited

Loading

Uh oh!

kkraus14 commented Oct 11, 2023

Uh oh!

gabime commented Oct 11, 2023

Uh oh!

kkraus14 Oct 11, 2023 •

edited

Loading

Uh oh!

kkraus14 Oct 11, 2023

Uh oh!

gabime Oct 11, 2023

Uh oh!

kkraus14 Oct 11, 2023

Uh oh!

gabime Oct 12, 2023

Uh oh!

kkraus14 Oct 12, 2023

Uh oh!

kkraus14 commented Oct 12, 2023

Uh oh!

gabime commented Oct 12, 2023

Uh oh!

kkraus14 commented Oct 13, 2023

Uh oh!

gabime commented Oct 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

	// Check if relaxed C++14 constexpr is supported.
	// GCC doesn't allow throw in constexpr until version 6 (bug 67371).
	#ifndef FMT_USE_CONSTEXPR
	# if (FMT_HAS_FEATURE(cxx_relaxed_constexpr) \|\| FMT_MSC_VERSION >= 1912 \|\| \
	(FMT_GCC_VERSION >= 600 && FMT_CPLUSPLUS >= 201402L)) && \
	!FMT_ICC_VERSION && !defined(__NVCC__)
	# define FMT_USE_CONSTEXPR 1
	# else
	# define FMT_USE_CONSTEXPR 0
	# endif
	#endif
	#if FMT_USE_CONSTEXPR
	# define FMT_CONSTEXPR constexpr
	#else
	# define FMT_CONSTEXPR
	#endif

Conversation

kkraus14 commented Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kkraus14 commented Oct 11, 2023

Uh oh!

gabime commented Oct 11, 2023

Uh oh!

kkraus14 Oct 11, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

kkraus14 Oct 11, 2023

Choose a reason for hiding this comment

Uh oh!

gabime Oct 11, 2023

Choose a reason for hiding this comment

Uh oh!

kkraus14 Oct 11, 2023

Choose a reason for hiding this comment

Uh oh!

gabime Oct 12, 2023

Choose a reason for hiding this comment

Uh oh!

kkraus14 Oct 12, 2023

Choose a reason for hiding this comment

Uh oh!

kkraus14 commented Oct 12, 2023

Uh oh!

gabime commented Oct 12, 2023

Uh oh!

kkraus14 commented Oct 13, 2023

Uh oh!

gabime commented Oct 13, 2023

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Comments

kkraus14 commented Oct 11, 2023 •

edited

Loading

kkraus14 Oct 11, 2023 •

edited

Loading