Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/ci/sanitizer/clang/Leak.supp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ leak:libopen-pal*
leak:libopen-rte*
leak:libmpi*
leak:libevent*
# CPython 3.7.1 and pybind11 2.3.0
# CPython 3.7.1 and pybind11 3.0.0
leak:*py*
# 10 byte memleak in main of "make" 4.1
leak:/usr/bin/make*
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ if(ImpactX_PYTHON)
impactx_enable_IPO(pyImpactX)
else()
# conditionally defined target in pybind11
# https://github.com/pybind/pybind11/blob/v2.13.0/tools/pybind11Common.cmake#L407-L413
# https://github.com/pybind/pybind11/blob/v3.0.0/tools/pybind11Common.cmake#L420-L426
target_link_libraries(pyImpactX PRIVATE pybind11::lto)
endif()
endif()
Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies/ABLASTR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ set(ImpactX_openpmd_src ""
set(ImpactX_ablastr_repo "https://github.com/BLAST-WarpX/warpx.git"
CACHE STRING
"Repository URI to pull and build ABLASTR from if(ImpactX_ablastr_internal)")
set(ImpactX_ablastr_branch "25.07"
set(ImpactX_ablastr_branch "06feda8131de7b97f2cc16a6e244d1d4f9874c3b"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CACHE STRING
"Repository branch for ImpactX_ablastr_repo if(ImpactX_ablastr_internal)")

Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies/pyAMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ option(ImpactX_pyamrex_internal "Download & build pyAMReX" ON)
set(ImpactX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
CACHE STRING
"Repository URI to pull and build pyamrex from if(ImpactX_pyamrex_internal)")
set(ImpactX_pyamrex_branch "25.07"
set(ImpactX_pyamrex_branch "f884dda4beebdd955aaba8f82a8a9530b8185bb5"
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

CACHE STRING
"Repository branch for ImpactX_pyamrex_repo if(ImpactX_pyamrex_internal)")

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/pybind11.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ function(find_pybind11)
mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED_FETCHEDpybind11)
endif()
else()
find_package(pybind11 2.13.0 CONFIG REQUIRED)
find_package(pybind11 3.0.0 CONFIG REQUIRED)
message(STATUS "pybind11: Found version '${pybind11_VERSION}'")
endif()
endfunction()
Expand All @@ -52,7 +52,7 @@ option(ImpactX_pybind11_internal "Download & build pybind11" ON)
set(ImpactX_pybind11_repo "https://github.com/pybind/pybind11.git"
CACHE STRING
"Repository URI to pull and build pybind11 from if(ImpactX_pybind11_internal)")
set(ImpactX_pybind11_branch "v2.13.6"
set(ImpactX_pybind11_branch "v3.0.0"
CACHE STRING
"Repository branch for ImpactX_pybind11_repo if(ImpactX_pybind11_internal)")

Expand Down
2 changes: 1 addition & 1 deletion src/python/Iterator.H
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace pyImpactX
* explicitly, otherwise we will jump directly to the 2nd element. We do
* this the same way as pybind11 does this, via a little state:
* https://github.com/AMReX-Codes/pyamrex/pull/50
* https://github.com/pybind/pybind11/blob/v2.10.0/include/pybind11/pybind11.h#L2269-L2282
* https://github.com/pybind/pybind11/blob/v3.0.0/include/pybind11/pybind11.h#L2954-L2967
*
* To avoid unnecessary (and expensive) copies, remember to only call this
* helper always with py::return_value_policy::reference_internal!
Expand Down
Loading