Zengtudor/pybind11
1
0
Fork 0
mirror of https://github.com/pybind/pybind11.git synced 2024-12-02 09:57:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'pybind:master' into master

Browse Source
This commit is contained in:
Steve R. Sun 2023-05-03 16:57:58 +08:00 committed by GitHub
commit 3470abcba9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.github/workflows/pip.yml vendored
View File

@ -98,13 +98,13 @@ jobs:
- uses: actions/download-artifact@v3 - uses: actions/download-artifact@v3
- name: Publish standard package - name: Publish standard package
uses: pypa/gh-action-pypi-publish@v1.8.5 uses: pypa/gh-action-pypi-publish@v1.8.6
with: with:
password: ${{ secrets.pypi_password }} password: ${{ secrets.pypi_password }}
packages-dir: standard/ packages-dir: standard/
- name: Publish global package - name: Publish global package
uses: pypa/gh-action-pypi-publish@v1.8.5 uses: pypa/gh-action-pypi-publish@v1.8.6
with: with:
password: ${{ secrets.pypi_password_global }} password: ${{ secrets.pypi_password_global }}
packages-dir: global/ packages-dir: global/

4
.pre-commit-config.yaml
View File

@ -100,7 +100,7 @@ repos:
# Check static types with mypy # Check static types with mypy
- repo: https://github.com/pre-commit/mirrors-mypy - repo: https://github.com/pre-commit/mirrors-mypy
rev: "v1.1.1" rev: "v1.2.0"
hooks: hooks:
- id: mypy - id: mypy
args: [] args: []
@ -143,7 +143,7 @@ repos:
# Clang format the codebase automatically # Clang format the codebase automatically
- repo: https://github.com/pre-commit/mirrors-clang-format - repo: https://github.com/pre-commit/mirrors-clang-format
rev: "v16.0.0" rev: "v16.0.2"
hooks: hooks:
- id: clang-format - id: clang-format
types_or: [c++, c, cuda] types_or: [c++, c, cuda]

5
pybind11/setup_helpers.py
View File

@ -144,7 +144,6 @@ class Pybind11Extension(_Extension): # type: ignore[misc]
self.cxx_std = cxx_std self.cxx_std = cxx_std
cflags = [] cflags = []
ldflags = []
if WIN: if WIN:
cflags += ["/EHsc", "/bigobj"] cflags += ["/EHsc", "/bigobj"]
else: else:
@ -154,11 +153,7 @@ class Pybind11Extension(_Extension): # type: ignore[misc]
c_cpp_flags = shlex.split(env_cflags) + shlex.split(env_cppflags) c_cpp_flags = shlex.split(env_cflags) + shlex.split(env_cppflags)
if not any(opt.startswith("-g") for opt in c_cpp_flags): if not any(opt.startswith("-g") for opt in c_cpp_flags):
cflags += ["-g0"] cflags += ["-g0"]
if MACOS:
cflags += ["-stdlib=libc++"]
ldflags += ["-stdlib=libc++"]
self._add_cflags(cflags) self._add_cflags(cflags)
self._add_ldflags(ldflags)
@property @property
def cxx_std(self) -> int: def cxx_std(self) -> int:

8
tools/pybind11Common.cmake
View File

@ -5,8 +5,8 @@ Adds the following targets::
pybind11::pybind11 - link to headers and pybind11 pybind11::pybind11 - link to headers and pybind11
pybind11::module - Adds module links pybind11::module - Adds module links
pybind11::embed - Adds embed links pybind11::embed - Adds embed links
pybind11::lto - Link time optimizations (manual selection) pybind11::lto - Link time optimizations (only if CMAKE_INTERPROCEDURAL_OPTIMIZATION is not set)
pybind11::thin_lto - Link time optimizations (manual selection) pybind11::thin_lto - Link time optimizations (only if CMAKE_INTERPROCEDURAL_OPTIMIZATION is not set)
pybind11::python_link_helper - Adds link to Python libraries pybind11::python_link_helper - Adds link to Python libraries
pybind11::windows_extras - MSVC bigobj and mp for building multithreaded pybind11::windows_extras - MSVC bigobj and mp for building multithreaded
pybind11::opt_size - avoid optimizations that increase code size pybind11::opt_size - avoid optimizations that increase code size
@ -20,7 +20,7 @@ Adds the following functions::
# CMake 3.10 has an include_guard command, but we can't use that yet # CMake 3.10 has an include_guard command, but we can't use that yet
# include_guard(global) (pre-CMake 3.10) # include_guard(global) (pre-CMake 3.10)
if(TARGET pybind11::lto) if(TARGET pybind11::pybind11)
return() return()
endif() endif()
@ -372,11 +372,13 @@ function(_pybind11_generate_lto target prefer_thin_lto)
endif() endif()
endfunction() endfunction()
if(NOT DEFINED CMAKE_INTERPROCEDURAL_OPTIMIZATION)
add_library(pybind11::lto IMPORTED INTERFACE ${optional_global}) add_library(pybind11::lto IMPORTED INTERFACE ${optional_global})
_pybind11_generate_lto(pybind11::lto FALSE) _pybind11_generate_lto(pybind11::lto FALSE)
add_library(pybind11::thin_lto IMPORTED INTERFACE ${optional_global}) add_library(pybind11::thin_lto IMPORTED INTERFACE ${optional_global})
_pybind11_generate_lto(pybind11::thin_lto TRUE) _pybind11_generate_lto(pybind11::thin_lto TRUE)
endif()
# ---------------------- pybind11_strip ----------------------------- # ---------------------- pybind11_strip -----------------------------