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.

Sign up for GitHub

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

Jump to bottom

Merge branch/2.2.x into main #607

Closed
wants to merge 6 commits into from
Closed

Merge branch/2.2.x into main #607

wants to merge 6 commits into from

Conversation

jrhemstad
Copy link
Collaborator

Description

Apparently we forgot to merge branch/2.2.x back into main after merging changes into the release branch.

alliepiper and others added 5 commits August 7, 2023 09:14
@alliepiper
Add new CCCL:: CMake targets (#244)
6a3aefa 
* Fix indention.

* Add CCCL::CCCL, CCCL::libcudacxx, CCCL::CUB, and CCCL::Thrust targets.

The Thrust target is configured via cache options as discussed in #203.

Closes #203.

* Mark the CCCL::Thrust options as advanced.

* Guard against rebuilding pre-existing targets.

* Make the imported `CCCL::CCCL` target global in our CMake package.

This ensures that users will be able to use it from their builds.
@wmaxey @miscco
Fix cudacc and nvcc mixup. (#329)
124ff48 
* 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]>
@miscco
[skip-tests] Use builtin for destructible concept on MSVC (#333)
d70a624 
MSVC has issues with private destructors, so just use the builtin it provides.

This addresses nvbug200707001
@miscco
[skip-test] Fix merge conflict from two inflight PRs (#338)
36f379f 
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
Use global qualification for internal use
71267c0
@jrhemstad jrhemstad requested review from a team as code owners October 24, 2023 22:37
@jrhemstad jrhemstad requested review from alliepiper and ericniebler and removed request for a team October 24, 2023 22:37
@copy-pr-bot
Copy link

copy-pr-bot bot commented Oct 24, 2023

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@jrhemstad
Copy link
Collaborator Author

Okay, so apparently we did merge branch/2.2.x into main here: #350

The problem is that it was done with a force push, which changed the commit hashes and so it lost the reference from the original branch/2.2.x.

@jrhemstad jrhemstad closed this Oct 24, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alliepiper alliepiper Awaiting requested review from alliepiper alliepiper is a code owner automatically assigned from NVIDIA/cccl-cmake-codeowners

@ericniebler ericniebler Awaiting requested review from ericniebler ericniebler was automatically assigned from NVIDIA/cccl-codeowners

Assignees
No one assigned
Labels
None yet
Projects
CCCL
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@jrhemstad @alliepiper @wmaxey @miscco