Rework our system header approach to be more error proof #661
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
miscco
requested review from
griwes,
elstehle,
gevtushenko,
jrhemstad and
wmaxey
and removed request for
a team
wmaxey
approved these changes
Nov 6, 2023
griwes
approved these changes
Nov 6, 2023
elstehle
approved these changes
Nov 6, 2023
jrhemstad
added
the
backport branch/2.3.x
gevtushenko
approved these changes
Nov 6, 2023
miscco
force-pushed
the
resurrect_use_implicit_system_header
branch
from
cac49bb
to
cfb9b7c
Compare
|
I have taken that PR to fix nvbug4367604 |
miscco
changed the title
miscco
force-pushed
the
resurrect_use_implicit_system_header
branch
from
3d29df7
to
b07b147
Compare
Unfortunately nvcc has some issues with properly handling `_Pragma` for some host compilers Rather than putting another bandaid on just move the `#pragma` into the respective header file
miscco
force-pushed
the
resurrect_use_implicit_system_header
branch
from
b07b147
to
ba66bbd
Compare
miscco
commented
Nov 7, 2023
| @@ -22,6 +22,10 @@ | |||
| # define _CCCL_COMPILER_MSVC | |||
| #elif defined(__IBMCPP__) | |||
| # define _CCCL_COMPILER_IBM | |||
| #elif defined(__INTEL_LLVM_COMPILER) | |||
There was a problem hiding this comment.
Funnily enough we were also missing intel compiler in our list
| @@ -47,46 +51,44 @@ | |||
| #endif | |||
|
|
|||
| // Enforce that cccl headers are treated as system headers | |||
| #if defined(_CCCL_COMPILER_GCC) | |||
| # define _CCCL_FORCE_SYSTEM_HEADER _Pragma("GCC system_header") | |||
| #if defined(_CCCL_COMPILER_GCC) || defined(_CCCL_COMPILER_NVHPC) || defined(_CCCL_COMPILER_ICC) \ | |||
There was a problem hiding this comment.
This is the real change. We filter compilers and use the appropriate #pragma depending on the define
gevtushenko
approved these changes
Nov 7, 2023
libcudacxx/include/cuda/std/detail/libcxx/include/experimental/propagate_const
Outdated
Show resolved
Hide resolved
Co-authored-by: Georgii Evtushenko <[email protected]>
|
Backport failed for Please cherry-pick the changes locally. git fetch origin branch/2.3.x
git worktree add -d .worktree/backport-661-to-branch/2.3.x origin/branch/2.3.x
cd .worktree/backport-661-to-branch/2.3.x
git checkout -b backport-661-to-branch/2.3.x
ancref=$(git merge-base a9d7d8e26cbab2894d09d086e290b5960c823c62 86815971aaf966cb4e6ab5f67b8176fc5403f4aa)
git cherry-pick -x $ancref..86815971aaf966cb4e6ab5f67b8176fc5403f4aa |
|
/backport |
|
Backport failed for Please cherry-pick the changes locally. git fetch origin branch/2.3.x
git worktree add -d .worktree/backport-661-to-branch/2.3.x origin/branch/2.3.x
cd .worktree/backport-661-to-branch/2.3.x
git checkout -b backport-661-to-branch/2.3.x
ancref=$(git merge-base a9d7d8e26cbab2894d09d086e290b5960c823c62 86815971aaf966cb4e6ab5f67b8176fc5403f4aa)
git cherry-pick -x $ancref..86815971aaf966cb4e6ab5f67b8176fc5403f4aa |
miscco
added a commit
to miscco/cccl
that referenced
this pull request
Nov 8, 2023
Co-authored-by: Georgii Evtushenko <[email protected]>
jrhemstad
pushed a commit
to miscco/cccl
that referenced
this pull request
Nov 10, 2023
Co-authored-by: Georgii Evtushenko <[email protected]>
jrhemstad
pushed a commit
that referenced
this pull request
Nov 13, 2023
Co-authored-by: Georgii Evtushenko <[email protected]>
jrhemstad
removed
the
backport branch/2.3.x
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.