From 39e64753c9f553d4b03af2eff70cc86a69b67e0c Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 5 Jan 2024 13:21:10 -0800 Subject: [PATCH] Release: 24.01 --- CMakeLists.txt | 2 +- cmake/dependencies/AMReX.cmake | 4 ++-- docs/source/conf.py | 4 ++-- setup.py | 2 +- src/Particle/ParticleContainer_ImpactX.cpp | 4 ++-- src/Particle/ParticleContainer_WarpX.cpp | 10 +++++----- src/Particle/StructOfArrays.cpp | 12 ++++++------ 7 files changed, 19 insertions(+), 19 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 73fe7857..d8b71114 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.20.0) -project(pyAMReX VERSION 23.12) +project(pyAMReX VERSION 24.01) include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 46e3f533..69086343 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/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 23.12 CONFIG REQUIRED COMPONENTS PARTICLES PIC) + find_package(AMReX 24.01 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 "ecaa46d0be4b5c79b8806e48e3469000d8bb7252" +set(pyAMReX_amrex_branch "24.01" CACHE STRING "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)") diff --git a/docs/source/conf.py b/docs/source/conf.py index 8c5ead30..c80a30cf 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -72,9 +72,9 @@ # built documents. # # The short X.Y version. -version = "23.12" +version = "24.01" # The full version, including alpha/beta/rc tags. -release = "23.12" +release = "24.01" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index f99f9803..3fbbd5a6 100644 --- a/setup.py +++ b/setup.py @@ -207,7 +207,7 @@ def build_extension(self, ext): setup( name="amrex", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="23.12", + version="24.01", packages=["amrex"], # Python sources: package_dir={"": "src"}, diff --git a/src/Particle/ParticleContainer_ImpactX.cpp b/src/Particle/ParticleContainer_ImpactX.cpp index 9a9cf704..1bbd0692 100644 --- a/src/Particle/ParticleContainer_ImpactX.cpp +++ b/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, 5, 0>(m); // ImpactX 22.07 - 23.12 - make_ParticleContainer_and_Iterators, 8, 0>(m); // ImpactX 24.01+ + make_ParticleContainer_and_Iterators, 5, 0>(m); // ImpactX 22.07 - 24.01 + make_ParticleContainer_and_Iterators, 8, 0>(m); // ImpactX 24.02+ } diff --git a/src/Particle/ParticleContainer_WarpX.cpp b/src/Particle/ParticleContainer_WarpX.cpp index 68c6ddcb..07bf36d6 100644 --- a/src/Particle/ParticleContainer_WarpX.cpp +++ b/src/Particle/ParticleContainer_WarpX.cpp @@ -13,14 +13,14 @@ 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, 4, 0>(m); // WarpX 22.07 - 23.12 1D-3D - //make_ParticleContainer_and_Iterators, 5, 0> (m); // WarpX 22.07 - 23.12 RZ + make_ParticleContainer_and_Iterators, 4, 0>(m); // WarpX 22.07 - 24.01 1D-3D + //make_ParticleContainer_and_Iterators, 5, 0> (m); // WarpX 22.07 - 24.01 RZ #if AMREX_SPACEDIM == 1 - make_ParticleContainer_and_Iterators, 5, 0>(m); // WarpX 24.01+ 1D + make_ParticleContainer_and_Iterators, 5, 0>(m); // WarpX 24.02+ 1D #elif AMREX_SPACEDIM == 2 - make_ParticleContainer_and_Iterators, 6, 0>(m); // WarpX 24.01+ 2D + make_ParticleContainer_and_Iterators, 6, 0>(m); // WarpX 24.02+ 2D #elif AMREX_SPACEDIM == 3 - make_ParticleContainer_and_Iterators, 7, 0>(m); // WarpX 24.01+ 3D + make_ParticleContainer_and_Iterators, 7, 0>(m); // WarpX 24.02+ 3D #endif } diff --git a/src/Particle/StructOfArrays.cpp b/src/Particle/StructOfArrays.cpp index 79e81a3b..cf605bc7 100644 --- a/src/Particle/StructOfArrays.cpp +++ b/src/Particle/StructOfArrays.cpp @@ -99,15 +99,15 @@ 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 - 23.12 - make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.12 + make_StructOfArrays< 4, 0>(m); // HiPACE++ 22.08 - 24.01 + make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 24.01 #if AMREX_SPACEDIM == 1 - make_StructOfArrays< 5, 0, true>(m); // WarpX 24.01+ 1D + make_StructOfArrays< 5, 0, true>(m); // WarpX 24.02+ 1D #elif AMREX_SPACEDIM == 2 - make_StructOfArrays< 6, 0, true>(m); // WarpX 24.01+ 2D + make_StructOfArrays< 6, 0, true>(m); // WarpX 24.02+ 2D #elif AMREX_SPACEDIM == 3 - make_StructOfArrays< 7, 0, true>(m); // WarpX 24.01+ 3D + make_StructOfArrays< 7, 0, true>(m); // WarpX 24.02+ 3D #endif - make_StructOfArrays< 8, 0, true>(m); // ImpactX 24.01+ + make_StructOfArrays< 8, 0, true>(m); // ImpactX 24.02+ make_StructOfArrays<37, 1>(m); // HiPACE++ 22.09 - 23.12 }