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

Commits on Oct 21, 2023

  1. Workaround NVCC parse failure in cast_op (pybind#4893)

    * 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>
    Flamefire and pre-commit-ci[bot] authored Oct 21, 2023
    Configuration menu
    Copy the full SHA
    3414c56 View commit details
    Browse the repository at this point in the history

Commits on Oct 23, 2023

  1. Bug fix: Replace bare static exception<T> with `gil_safe_call_once_…

    …and_store`. (pybind#4897)
    
    This is to ensure that `Py_DECREF()` is not called after the Python interpreter was finalized already:
    
    https://github.com/pybind/pybind11/blob/3414c56b6c7c521d868c9a137ca2ace2e26b5b2e/include/pybind11/gil_safe_call_once.h#L19
    Ralf W. Grosse-Kunstleve authored Oct 23, 2023
    Configuration menu
    Copy the full SHA
    bf88e29 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'master' into sh_merge_master

    Ralf W. Grosse-Kunstleve committed Oct 23, 2023
    Configuration menu
    Copy the full SHA
    28ec485 View commit details
    Browse the repository at this point in the history