From e1e47e5f4d4559a37a661d1fcdd4019f97ded749 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 1 Oct 2024 15:41:39 -0700 Subject: [PATCH] pybind11: 2.13.0+ --- CMakeLists.txt | 2 +- README.md | 4 ++-- cmake/dependencies/pybind11.cmake | 4 ++-- docs/source/install/dependencies.rst | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index c20b10e1..df170ecd 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -143,7 +143,7 @@ foreach(D IN LISTS AMReX_SPACEDIM) pyamrex_enable_IPO(pyAMReX_${D}d) else() # conditionally defined target in pybind11 - # https://github.com/pybind/pybind11/blob/v2.12.0/tools/pybind11Common.cmake#L397-L403 + # https://github.com/pybind/pybind11/blob/v2.13.0/tools/pybind11Common.cmake#L407-L413 target_link_libraries(pyAMReX_${D}d PRIVATE pybind11::lto) endif() endif() diff --git a/README.md b/README.md index ec131ef2..2da3fc14 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ pyAMReX depends on the following popular third party software. - a mature [C++17](https://en.wikipedia.org/wiki/C%2B%2B17) compiler, e.g., GCC 8, Clang 7, NVCC 11.0, MSVC 19.15 or newer - [CMake 3.24.0+](https://cmake.org) - [AMReX *development*](https://amrex-codes.github.io): we automatically download and compile a copy of AMReX -- [pybind11](https://github.com/pybind/pybind11/) 2.12.0+: we automatically download and compile a copy of pybind11 ([new BSD](https://github.com/pybind/pybind11/blob/master/LICENSE)) +- [pybind11](https://github.com/pybind/pybind11/) 2.13.0+: we automatically download and compile a copy of pybind11 ([new BSD](https://github.com/pybind/pybind11/blob/master/LICENSE)) - [Python](https://python.org) 3.9+ - [Numpy](https://numpy.org) 1.15+ @@ -199,7 +199,7 @@ Furthermore, pyAMReX adds a few selected CMake build options: | `pyAMReX_pybind11_src` | *None* | Absolute path to pybind11 source directory (preferred if set) | | `pyAMReX_pybind11_internal` | **ON**/OFF | Needs a pre-installed pybind11 library if set to `OFF` | | `pyAMReX_pybind11_repo` | `https://github.com/pybind/pybind11.git` | Repository URI to pull and build pybind11 from | -| `pyAMReX_pybind11_branch` | `v2.12.0` | Repository branch for `pyAMReX_pybind11_repo` | +| `pyAMReX_pybind11_branch` | `v2.13.6` | Repository branch for `pyAMReX_pybind11_repo` | | `Python_EXECUTABLE` | (newest found) | Path to Python executable | As one example, one can also build against a local AMReX copy. diff --git a/cmake/dependencies/pybind11.cmake b/cmake/dependencies/pybind11.cmake index 3fe2c473..bb1c4439 100644 --- a/cmake/dependencies/pybind11.cmake +++ b/cmake/dependencies/pybind11.cmake @@ -36,7 +36,7 @@ function(find_pybind11) mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED_FETCHEDpybind11) endif() elseif(NOT pyAMReX_pybind11_internal) - find_package(pybind11 2.12.0 CONFIG REQUIRED) + find_package(pybind11 2.13.0 CONFIG REQUIRED) message(STATUS "pybind11: Found version '${pybind11_VERSION}'") endif() endfunction() @@ -51,7 +51,7 @@ option(pyAMReX_pybind11_internal "Download & build pybind11" ON) set(pyAMReX_pybind11_repo "https://github.com/pybind/pybind11.git" CACHE STRING "Repository URI to pull and build pybind11 from if(pyAMReX_pybind11_internal)") -set(pyAMReX_pybind11_branch "v2.12.0" +set(pyAMReX_pybind11_branch "v2.13.6" CACHE STRING "Repository branch for pyAMReX_pybind11_repo if(pyAMReX_pybind11_internal)") diff --git a/docs/source/install/dependencies.rst b/docs/source/install/dependencies.rst index d1071c79..552deb27 100644 --- a/docs/source/install/dependencies.rst +++ b/docs/source/install/dependencies.rst @@ -10,7 +10,7 @@ Please see installation instructions below. - `CMake 3.24.0+ `__ - `Git 2.18+ `__ - `AMReX `__: we automatically download and compile a copy -- `pybind11 2.12.0+ `__: we automatically download and compile a copy +- `pybind11 2.13.0+ `__: we automatically download and compile a copy - `Python 3.9+ `__ - `numpy 1.15+ `__