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

git merge smart_holder (pybind/pybind11#4900) #30072

Merged
merged 4 commits into from
Oct 24, 2023
Merged

Conversation

rwgk
Copy link
Contributor

@rwgk rwgk commented Oct 24, 2023

Description

Helper/scratch PR for testing.

Suggested changelog entry:

Flamefire and others added 4 commits October 21, 2023 10:50
* Workaround NVCC parse failure in `cast_op`

There is a bug in some CUDA versions (observed in CUDA 12.1 and 11.7 w/ GCC 12.2),
that makes `cast_op` fail to compile:
  `cast.h:45:120: error: expected template-name before ‘<’ token`

Defining the nested type as an alias and using it allows this to work
without any change in semantics.

Fixes google#4606

* style: pre-commit fixes

* Add comments to result_t referencing PR

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
@google-cla
Copy link

google-cla bot commented Oct 24, 2023

Thanks for your pull request! It looks like this may be your first contribution to a Google open source project. Before we can look at your pull request, you'll need to sign a Contributor License Agreement (CLA).

View this failed invocation of the CLA check for more information.

For the most up to date status, view the checks section at the bottom of the pull request.

@rwgk rwgk changed the title git merge smart_holder git merge smart_holder (pybind/pybind11#4900) Oct 24, 2023
@rwgk rwgk marked this pull request as ready for review October 24, 2023 04:09
@rwgk rwgk merged commit f5269ca into google:main Oct 24, 2023
147 checks passed
@rwgk rwgk deleted the pywrapcc_merge_sh branch October 24, 2023 04:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants