Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge commits from 2.2 branch #350

Merged
merged 4 commits into from
Aug 17, 2023
Merged

Merge commits from 2.2 branch #350

merged 4 commits into from
Aug 17, 2023

Conversation

miscco
Copy link
Collaborator

@miscco miscco commented Aug 17, 2023

This pulls in 4 commits from 2.2

wmaxey and others added 3 commits August 17, 2023 09:25
* Replace COMPILER_NVCC_BELOW version macro with CUDACC version macro

* Fix CUDACC query in NV_DIAG_SUPPRESS macro

* [skip-tests] Also use `__CUDACC__` for libcu++ tests

---------

Co-authored-by: Michael Schellenberger Costa <[email protected]>
MSVC has issues with private destructors, so just use the builtin it provides.

This addresses nvbug200707001
We renamed `TEST_COMPILER_C1XX` to `TEST_COMPILER_MSVC` because the former does not make sense and the latter is the convention we have for the internal macro

However, an inflight PR did miss the macro rename

Skipping tests as this is only libcudacxx test related
@miscco miscco requested review from a team as code owners August 17, 2023 07:26
@miscco miscco requested review from robertmaynard, alliepiper, jarmak-nv, ericniebler and gevtushenko and removed request for a team August 17, 2023 07:26
@miscco miscco changed the base branch from branch/2.2.x to main August 17, 2023 07:26
@miscco miscco merged commit 8577579 into NVIDIA:main Aug 17, 2023
435 checks passed
@miscco miscco deleted the merge_2_2 branch August 17, 2023 17:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

4 participants