Release: 24.02 (#246)

Author: ax3l

CMakeLists.txt

@@ -1,7 +1,7 @@
 # Preamble ####################################################################
 #
 cmake_minimum_required(VERSION 3.20.0)
-project(pyAMReX VERSION 24.01)
+project(pyAMReX VERSION 24.02)
 
 include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake)
 

cmake/dependencies/AMReX.cmake

@@ -70,7 +70,7 @@ macro(find_amrex)
     elseif(NOT pyAMReX_amrex_internal)
         message(STATUS "Searching for pre-installed AMReX ...")
         # https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#importing-amrex-into-your-cmake-project
-        find_package(AMReX 24.01 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
+        find_package(AMReX 24.02 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
         message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
     endif()
 endmacro()
@@ -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 "24.01"
+set(pyAMReX_amrex_branch "24.02"
     CACHE STRING
     "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")
 

docs/source/conf.py

@@ -72,9 +72,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = "24.01"
+version = "24.02"
 # The full version, including alpha/beta/rc tags.
-release = "24.01"
+release = "24.02"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -190,6 +190,7 @@ def build_extension(self, ext):
     cmdclass = dict(build=CopyPreBuild)
 # CMake: build pyAMReX ourselves
 else:
+    # TODO: modernize into a single build
     cmdclass = dict(build_ext=CMakeBuild)
     for dim in [x.lower() for x in AMReX_SPACEDIM.split(";")]:
         name = dim + "d"
@@ -207,7 +208,7 @@ def build_extension(self, ext):
 setup(
     name="amrex",
     # note PEP-440 syntax: x.y.zaN but x.y.z.devN
-    version="24.01",
+    version="24.02",
     packages=["amrex"],
     # Python sources:
     package_dir={"": "src"},

src/Particle/Particle.cpp

@@ -327,8 +327,8 @@ void init_Particle(py::module& m) {
     make_Particle< 3, 2 > (m);
     make_Particle< 4, 0 > (m);  // HiPACE++ 22.07
     make_Particle< 5, 0 > (m);  // ImpactX 22.07
-    make_Particle< 6, 0 > (m);  // WarpX 24.02+
-    //make_Particle< 7, 0 > (m);  // WarpX 24.02+
-    make_Particle< 8, 0 > (m);  // ImpactX 24.02+
+    make_Particle< 6, 0 > (m);  // WarpX 24.03+
+    //make_Particle< 7, 0 > (m);  // WarpX 24.03+
+    make_Particle< 8, 0 > (m);  // ImpactX 24.03+
     make_Particle< 37, 1> (m);  // HiPACE++ 22.07
 }

src/Particle/ParticleContainer_ImpactX.cpp

@@ -14,6 +14,6 @@ void init_ParticleContainer_ImpactX(py::module& m) {
 
     // TODO: we might need to move all or most of the defines in here into a
     //       test/example submodule, so they do not collide with downstream projects
-    make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0>(m);     // ImpactX 22.07 - 24.01
-    make_ParticleContainer_and_Iterators<SoAParticle<8, 0>, 8, 0>(m);  // ImpactX 24.02+
+    make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0>(m);     // ImpactX 22.07 - 24.02
+    make_ParticleContainer_and_Iterators<SoAParticle<8, 0>, 8, 0>(m);  // ImpactX 24.03+
 }

src/Particle/ParticleContainer_WarpX.cpp

@@ -13,15 +13,15 @@ void init_ParticleContainer_WarpX(py::module& m) {
 
     // TODO: we might need to move all or most of the defines in here into a
     //       test/example submodule, so they do not collide with downstream projects
-    make_ParticleContainer_and_Iterators<Particle<0, 0>, 4, 0>(m);   // WarpX 22.07 - 24.01 1D-3D
-    //make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0> (m);   // WarpX 22.07 - 24.01 RZ
+    make_ParticleContainer_and_Iterators<Particle<0, 0>, 4, 0>(m);   // WarpX 22.07 - 24.02 1D-3D
+    //make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0> (m);   // WarpX 22.07 - 24.02 RZ
 
 #if AMREX_SPACEDIM == 1
-    make_ParticleContainer_and_Iterators<SoAParticle<5, 0>, 5, 0>(m);  // WarpX 24.02+ 1D
+    make_ParticleContainer_and_Iterators<SoAParticle<5, 0>, 5, 0>(m);  // WarpX 24.03+ 1D
 #elif AMREX_SPACEDIM == 2
-    make_ParticleContainer_and_Iterators<SoAParticle<6, 0>, 6, 0>(m);  // WarpX 24.02+ 2D
-    make_ParticleContainer_and_Iterators<SoAParticle<7, 0>, 7, 0>(m);  // WarpX 24.02+ RZ
+    make_ParticleContainer_and_Iterators<SoAParticle<6, 0>, 6, 0>(m);  // WarpX 24.03+ 2D
+    make_ParticleContainer_and_Iterators<SoAParticle<7, 0>, 7, 0>(m);  // WarpX 24.03+ RZ
 #elif AMREX_SPACEDIM == 3
-    make_ParticleContainer_and_Iterators<SoAParticle<7, 0>, 7, 0>(m);  // WarpX 24.02+ 3D
+    make_ParticleContainer_and_Iterators<SoAParticle<7, 0>, 7, 0>(m);  // WarpX 24.03+ 3D
 #endif
 }

src/Particle/ParticleTile.cpp

@@ -210,13 +210,13 @@ void init_ParticleTile(py::module& m) {
     make_ParticleTile<ParticleType_0_0, 4, 0> (m);   // HiPACE++ 22.07
     make_ParticleTile<ParticleType_0_0, 5, 0> (m);   // ImpactX 22.07
 #if AMREX_SPACEDIM == 1
-    make_ParticleTile<SoAParticleType_5_0, 5, 0> (m);   // WarpX 24.02+ 1D
+    make_ParticleTile<SoAParticleType_5_0, 5, 0> (m);   // WarpX 24.03+ 1D
 #elif AMREX_SPACEDIM == 2
-    make_ParticleTile<SoAParticleType_6_0, 6, 0> (m);   // WarpX 24.02+ 2D
-    make_ParticleTile<SoAParticleType_7_0, 7, 0> (m);   // WarpX 24.02+ RZ
+    make_ParticleTile<SoAParticleType_6_0, 6, 0> (m);   // WarpX 24.03+ 2D
+    make_ParticleTile<SoAParticleType_7_0, 7, 0> (m);   // WarpX 24.03+ RZ
 #elif AMREX_SPACEDIM == 3
-    make_ParticleTile<SoAParticleType_7_0, 7, 0> (m);   // WarpX 24.02+ 3D
+    make_ParticleTile<SoAParticleType_7_0, 7, 0> (m);   // WarpX 24.03+ 3D
 #endif
-    make_ParticleTile<SoAParticleType_8_0, 8, 0> (m);   // ImpactX 24.02+
+    make_ParticleTile<SoAParticleType_8_0, 8, 0> (m);   // ImpactX 24.03+
     make_ParticleTile<ParticleType_0_0, 37, 1> (m);  // HiPACE++ 22.07
 }

src/Particle/StructOfArrays.cpp

@@ -99,16 +99,16 @@ void make_StructOfArrays(py::module &m)
 
 void init_StructOfArrays(py::module& m) {
     make_StructOfArrays< 2, 1>(m);
-    make_StructOfArrays< 4, 0>(m);  // HiPACE++ 22.08 - 24.01
-    make_StructOfArrays< 5, 0>(m);  // ImpactX 22.07 - 24.01
+    make_StructOfArrays< 4, 0>(m);  // HiPACE++ 22.08 - 24.02
+    make_StructOfArrays< 5, 0>(m);  // ImpactX 22.07 - 24.02
 #if AMREX_SPACEDIM == 1
-    make_StructOfArrays< 5, 0, true>(m);  // WarpX 24.02+ 1D
+    make_StructOfArrays< 5, 0, true>(m);  // WarpX 24.03+ 1D
 #elif AMREX_SPACEDIM == 2
-    make_StructOfArrays< 6, 0, true>(m);  // WarpX 24.02+ 2D
-    make_StructOfArrays< 7, 0, true>(m);  // WarpX 24.02+ RZ
+    make_StructOfArrays< 6, 0, true>(m);  // WarpX 24.03+ 2D
+    make_StructOfArrays< 7, 0, true>(m);  // WarpX 24.03+ RZ
 #elif AMREX_SPACEDIM == 3
-    make_StructOfArrays< 7, 0, true>(m);  // WarpX 24.02+ 3D
+    make_StructOfArrays< 7, 0, true>(m);  // WarpX 24.03+ 3D
 #endif
-    make_StructOfArrays< 8, 0, true>(m);  // ImpactX 24.02+
-    make_StructOfArrays<37, 1>(m);  // HiPACE++ 22.09 - 23.12
+    make_StructOfArrays< 8, 0, true>(m);  // ImpactX 24.03+
+    make_StructOfArrays<37, 1>(m);  // HiPACE++ 22.09 - 24.02
 }