From 238fcc710b56cfedeb607fc431a381bf3b528909 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 20 Nov 2023 09:54:03 -0800 Subject: [PATCH 1/2] AMReX: Update to latest development Update to latest commit in `development`. --- cmake/dependencies/AMReX.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index e28a3cae..9bbfc4a0 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -85,7 +85,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 "23.11" +set(pyAMReX_amrex_branch "175b99d913dc2748e43c53192737170c770fe0e8" CACHE STRING "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)") From 2e46aa68a21d4c894720fd34d4fa9922770c592d Mon Sep 17 00:00:00 2001 From: ax3l Date: Mon, 20 Nov 2023 19:09:55 +0000 Subject: [PATCH 2/2] Update Stub Files --- src/amrex/space1d/__init__.pyi | 2 +- .../space1d/amrex_1d_pybind/__init__.pyi | 28 +++++++++---------- src/amrex/space2d/__init__.pyi | 2 +- .../space2d/amrex_2d_pybind/__init__.pyi | 28 +++++++++---------- src/amrex/space3d/__init__.pyi | 2 +- .../space3d/amrex_3d_pybind/__init__.pyi | 28 +++++++++---------- 6 files changed, 45 insertions(+), 45 deletions(-) diff --git a/src/amrex/space1d/__init__.pyi b/src/amrex/space1d/__init__.pyi index a70e8422..6f4f69d5 100644 --- a/src/amrex/space1d/__init__.pyi +++ b/src/amrex/space1d/__init__.pyi @@ -494,4 +494,4 @@ def d_decl(x, y, z): __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.11" +__version__: str = "23.11-14-g175b99d913dc" diff --git a/src/amrex/space1d/amrex_1d_pybind/__init__.pyi b/src/amrex/space1d/amrex_1d_pybind/__init__.pyi index 37e481f3..a4b88b50 100644 --- a/src/amrex/space1d/amrex_1d_pybind/__init__.pyi +++ b/src/amrex/space1d/amrex_1d_pybind/__init__.pyi @@ -3575,7 +3575,7 @@ class BoxArray: def size(self) -> int: ... class Config: - amrex_version: typing.ClassVar[str] = "23.11" + amrex_version: typing.ClassVar[str] = "23.11-14-g175b99d913dc" gpu_backend = None have_gpu: typing.ClassVar[bool] = False have_mpi: typing.ClassVar[bool] = True @@ -5984,7 +5984,7 @@ class ParticleContainer_0_0_4_0_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6111,7 +6111,7 @@ class ParticleContainer_0_0_4_0_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6238,7 +6238,7 @@ class ParticleContainer_0_0_4_0_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6365,7 +6365,7 @@ class ParticleContainer_0_0_5_0_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6492,7 +6492,7 @@ class ParticleContainer_0_0_5_0_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6619,7 +6619,7 @@ class ParticleContainer_0_0_5_0_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6746,7 +6746,7 @@ class ParticleContainer_1_1_2_1_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6873,7 +6873,7 @@ class ParticleContainer_1_1_2_1_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7000,7 +7000,7 @@ class ParticleContainer_1_1_2_1_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7113,7 +7113,7 @@ class ParticleContainer_pureSoA_8_2_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7226,7 +7226,7 @@ class ParticleContainer_pureSoA_8_2_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7339,7 +7339,7 @@ class ParticleContainer_pureSoA_8_2_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -11287,4 +11287,4 @@ def write_single_level_plotfile( __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.11" +__version__: str = "23.11-14-g175b99d913dc" diff --git a/src/amrex/space2d/__init__.pyi b/src/amrex/space2d/__init__.pyi index a1c6bff1..187642dc 100644 --- a/src/amrex/space2d/__init__.pyi +++ b/src/amrex/space2d/__init__.pyi @@ -494,4 +494,4 @@ def d_decl(x, y, z): __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.11" +__version__: str = "23.11-14-g175b99d913dc" diff --git a/src/amrex/space2d/amrex_2d_pybind/__init__.pyi b/src/amrex/space2d/amrex_2d_pybind/__init__.pyi index 507fdf44..bbaa62cf 100644 --- a/src/amrex/space2d/amrex_2d_pybind/__init__.pyi +++ b/src/amrex/space2d/amrex_2d_pybind/__init__.pyi @@ -3575,7 +3575,7 @@ class BoxArray: def size(self) -> int: ... class Config: - amrex_version: typing.ClassVar[str] = "23.11" + amrex_version: typing.ClassVar[str] = "23.11-14-g175b99d913dc" gpu_backend = None have_gpu: typing.ClassVar[bool] = False have_mpi: typing.ClassVar[bool] = True @@ -5990,7 +5990,7 @@ class ParticleContainer_0_0_4_0_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6117,7 +6117,7 @@ class ParticleContainer_0_0_4_0_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6244,7 +6244,7 @@ class ParticleContainer_0_0_4_0_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6371,7 +6371,7 @@ class ParticleContainer_0_0_5_0_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6498,7 +6498,7 @@ class ParticleContainer_0_0_5_0_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6625,7 +6625,7 @@ class ParticleContainer_0_0_5_0_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6752,7 +6752,7 @@ class ParticleContainer_1_1_2_1_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6879,7 +6879,7 @@ class ParticleContainer_1_1_2_1_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7006,7 +7006,7 @@ class ParticleContainer_1_1_2_1_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7119,7 +7119,7 @@ class ParticleContainer_pureSoA_8_2_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7232,7 +7232,7 @@ class ParticleContainer_pureSoA_8_2_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7345,7 +7345,7 @@ class ParticleContainer_pureSoA_8_2_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -11304,4 +11304,4 @@ def write_single_level_plotfile( __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.11" +__version__: str = "23.11-14-g175b99d913dc" diff --git a/src/amrex/space3d/__init__.pyi b/src/amrex/space3d/__init__.pyi index dc3e69b1..c5b32a44 100644 --- a/src/amrex/space3d/__init__.pyi +++ b/src/amrex/space3d/__init__.pyi @@ -494,4 +494,4 @@ def d_decl(x, y, z): __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.11" +__version__: str = "23.11-14-g175b99d913dc" diff --git a/src/amrex/space3d/amrex_3d_pybind/__init__.pyi b/src/amrex/space3d/amrex_3d_pybind/__init__.pyi index 743719f5..4b3fe232 100644 --- a/src/amrex/space3d/amrex_3d_pybind/__init__.pyi +++ b/src/amrex/space3d/amrex_3d_pybind/__init__.pyi @@ -3575,7 +3575,7 @@ class BoxArray: def size(self) -> int: ... class Config: - amrex_version: typing.ClassVar[str] = "23.11" + amrex_version: typing.ClassVar[str] = "23.11-14-g175b99d913dc" gpu_backend = None have_gpu: typing.ClassVar[bool] = False have_mpi: typing.ClassVar[bool] = True @@ -5993,7 +5993,7 @@ class ParticleContainer_0_0_4_0_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6120,7 +6120,7 @@ class ParticleContainer_0_0_4_0_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6247,7 +6247,7 @@ class ParticleContainer_0_0_4_0_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6374,7 +6374,7 @@ class ParticleContainer_0_0_5_0_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6501,7 +6501,7 @@ class ParticleContainer_0_0_5_0_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6628,7 +6628,7 @@ class ParticleContainer_0_0_5_0_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6755,7 +6755,7 @@ class ParticleContainer_1_1_2_1_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -6882,7 +6882,7 @@ class ParticleContainer_1_1_2_1_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7009,7 +7009,7 @@ class ParticleContainer_1_1_2_1_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7122,7 +7122,7 @@ class ParticleContainer_pureSoA_8_2_arena: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7235,7 +7235,7 @@ class ParticleContainer_pureSoA_8_2_default: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -7348,7 +7348,7 @@ class ParticleContainer_pureSoA_8_2_pinned: self : amrex.ParticleContainer_* A ParticleContainer class in pyAMReX local : bool - MPI-local particles + MPI rank-local particles only comm : MPI Communicator if local is False, this defaults to mpi4py.MPI.COMM_WORLD root_rank : MPI root rank to gather to @@ -11328,4 +11328,4 @@ def write_single_level_plotfile( __author__: str = "Axel Huebl, Ryan T. Sandberg, Shreyas Ananthan, David P. Grote, Revathi Jambunathan, Edoardo Zoni, Remi Lehe, Andrew Myers, Weiqun Zhang" __license__: str = "BSD-3-Clause-LBNL" -__version__: str = "23.11" +__version__: str = "23.11-14-g175b99d913dc"