From cd4aa364126b768ea19c6bc486f60073a5e0e20b Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 1 May 2023 09:53:59 -0700 Subject: [PATCH] Release: 23.05 (#126) The May release :) --- CMakeLists.txt | 2 +- cmake/dependencies/AMReX.cmake | 4 ++-- setup.py | 2 +- src/Particle/ParticleContainer_ImpactX.cpp | 4 ++-- src/Particle/ParticleContainer_WarpX.cpp | 4 ++-- src/Particle/StructOfArrays.cpp | 4 ++-- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f969dd41..c1fc42c6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.20.0) -project(pyAMReX VERSION 23.04) +project(pyAMReX VERSION 23.05) include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 71d8cef1..72f8f4c5 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -67,7 +67,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.04 CONFIG REQUIRED COMPONENTS PARTICLES PIC) + find_package(AMReX 23.05 CONFIG REQUIRED COMPONENTS PARTICLES PIC) message(STATUS "AMReX: Found version '${AMReX_VERSION}'") endif() endmacro() @@ -82,7 +82,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 "ee492f47704ae8b094ad9bb4b6f758d82606a61e" +set(pyAMReX_amrex_branch "23.05" CACHE STRING "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)") diff --git a/setup.py b/setup.py index 7d1d14ca..3974f246 100644 --- a/setup.py +++ b/setup.py @@ -222,7 +222,7 @@ def build_extension(self, ext): setup( name="amrex", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="23.04", + version="23.05", packages=["amrex"], # Python sources: package_dir={"": "src"}, diff --git a/src/Particle/ParticleContainer_ImpactX.cpp b/src/Particle/ParticleContainer_ImpactX.cpp index f75729e6..53530c0d 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.04 - make_ParticleContainer_and_Iterators, 8, 2>(m); // ImpactX 23.05+ + make_ParticleContainer_and_Iterators, 5, 0>(m); // ImpactX 22.07 - 23.05 + make_ParticleContainer_and_Iterators, 8, 2>(m); // ImpactX 23.06+ } diff --git a/src/Particle/ParticleContainer_WarpX.cpp b/src/Particle/ParticleContainer_WarpX.cpp index da8f328f..10c338ea 100644 --- a/src/Particle/ParticleContainer_WarpX.cpp +++ b/src/Particle/ParticleContainer_WarpX.cpp @@ -13,6 +13,6 @@ 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.04 1D-3D - //make_ParticleContainer_and_Iterators, 5, 0> (m); // WarpX 22.07 - 23.04 RZ + make_ParticleContainer_and_Iterators, 4, 0>(m); // WarpX 22.07 - 23.05 1D-3D + //make_ParticleContainer_and_Iterators, 5, 0> (m); // WarpX 22.07 - 23.05 RZ } diff --git a/src/Particle/StructOfArrays.cpp b/src/Particle/StructOfArrays.cpp index 613d302f..9f1f980f 100644 --- a/src/Particle/StructOfArrays.cpp +++ b/src/Particle/StructOfArrays.cpp @@ -72,7 +72,7 @@ void make_StructOfArrays(py::module &m) void init_StructOfArrays(py::module& m) { make_StructOfArrays< 2, 1>(m); make_StructOfArrays< 4, 0>(m); // HiPACE++ 22.07 - make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.04 - make_StructOfArrays< 8, 2>(m); // ImpactX 23.04+ + make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.06 + make_StructOfArrays< 8, 2>(m); // ImpactX 23.06+ make_StructOfArrays<37, 1>(m); // HiPACE++ 22.07 }