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.

Sign up for GitHub

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

Release: 25.02 #412

Merged
merged 2 commits into from
Feb 4, 2025
Merged

Release: 25.02 #412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4b56573
Release: 25.02
ax3l Feb 3, 2025
663d037
X-Ref AMReX iMultiFab Issue
ax3l Feb 3, 2025
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 CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Preamble ####################################################################
#
cmake_minimum_required(VERSION 3.24.0)
project(pyAMReX VERSION 25.01)
project(pyAMReX VERSION 25.02)

include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake)

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/AMReX.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ macro(find_amrex)
message(STATUS "Searching for pre-installed AMReX ...")
# https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#importing-amrex-into-your-cmake-project
# not strictly required yet to compile pyAMReX: EB
find_package(AMReX 25.01 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
find_package(AMReX 25.02 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")

if(AMReX_GPU_BACKEND STREQUAL CUDA)
Expand All @@ -86,7 +86,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON)
set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
CACHE STRING
"Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)")
set(pyAMReX_amrex_branch "0f46a1615c17f0bbeaedb20c27a97c9f6e439781"
set(pyAMReX_amrex_branch "25.02"
CACHE STRING
"Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")

Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,9 +72,9 @@
# built documents.
#
# The short X.Y version.
version = "25.01"
version = "25.02"
# The full version, including alpha/beta/rc tags.
release = "25.01"
release = "25.02"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -217,7 +217,7 @@ def build_extension(self, ext):
setup(
name="amrex",
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
version="25.01",
version="25.02",
packages=["amrex"],
# Python sources:
package_dir={"": "src"},
Expand Down
13 changes: 7 additions & 6 deletions src/Base/MultiFab.H
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,8 @@ factory :
)
;

// TODO: Missing in AMReX iMultiFab as of v25.01
// TODO: Missing in AMReX iMultiFab as of v25.02
// https://github.com/AMReX-Codes/amrex/issues/4317
if constexpr (std::is_same_v<T, MultiFab>) {
py_MultiFab
.def("sum_unique",
Expand Down Expand Up @@ -478,7 +479,7 @@ factory :
)
;

// TODO: Missing in iMultiFab
// TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317
if constexpr (std::is_same_v<T, MultiFab>) {
py_MultiFab
.def("add",
Expand All @@ -503,7 +504,7 @@ factory :
)
;

// TODO: Missing in iMultiFab
// TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317
if constexpr (std::is_same_v<T, MultiFab>) {
py_MultiFab
.def("subtract",
Expand Down Expand Up @@ -554,7 +555,7 @@ factory :

if constexpr (std::is_same_v<T, MultiFab>) {
py_MultiFab
.def("divide", /* TODO: Missing in iMultiFab */
.def("divide", /* TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317 */
[](T &self, T const &src, int srccomp, int comp, int numcomp, IntVect const &nghost) {
T::Divide(self, src, srccomp, comp, numcomp, nghost);
},
Expand All @@ -563,7 +564,7 @@ factory :
"The two MultiFabs MUST have the same underlying BoxArray."
)

.def("swap", /* TODO: Missing in iMultiFab */
.def("swap", /* TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317 */
Copy link
Member

Choose a reason for hiding this comment

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

Will do it.

Copy link
Member Author

Choose a reason for hiding this comment

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

Thank you! 🎉

[](T &self, T &src, int srccomp, int comp, int numcomp, int nghost) {
T::Swap(self, src, srccomp, comp, numcomp, nghost);
},
Expand All @@ -572,7 +573,7 @@ factory :
"The two MultiFabs MUST have the same underlying BoxArray.\n"
"The swap is local."
)
.def("swap", /* TODO: Missing in iMultiFab */
.def("swap", /* TODO: Missing in iMultiFab https://github.com/AMReX-Codes/amrex/issues/4317 */
[](T &self, T &src, int srccomp, int comp, int numcomp, IntVect const &nghost) {
T::Swap(self, src, srccomp, comp, numcomp, nghost);
},
Expand Down
Loading