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

[smart_holder] git merge master #4900

Merged
merged 3 commits into from
Oct 24, 2023
Merged

Conversation

rwgk
Copy link
Collaborator

@rwgk rwgk commented Oct 23, 2023

Description

Helper/scratch PR for testing.

Suggested changelog entry:

Flamefire and others added 3 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 pybind#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>
@rwgk rwgk merged commit 28ec485 into pybind:smart_holder Oct 24, 2023
152 checks passed
@github-actions github-actions bot added the needs changelog Possibly needs a changelog entry label Oct 24, 2023
rwgk pushed a commit to google/pybind11clif that referenced this pull request Oct 24, 2023
@henryiii henryiii removed the needs changelog Possibly needs a changelog entry label Nov 15, 2023
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.

3 participants