From f747e34732782abbce34a6fe8f4e7ac7317203ba Mon Sep 17 00:00:00 2001 From: Marco Garten Date: Tue, 9 Apr 2024 16:36:27 -0700 Subject: [PATCH 1/3] Prepare the April release of ImpactX. --- CMakeLists.txt | 2 +- cmake/dependencies/ABLASTR.cmake | 4 ++-- cmake/dependencies/pyAMReX.cmake | 4 ++-- cmake/dependencies/pybind11.cmake | 4 ++-- docs/source/conf.py | 4 ++-- setup.py | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 254c01951..c3e941d9f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.20.0) -project(ImpactX VERSION 24.03) +project(ImpactX VERSION 24.04) include(${ImpactX_SOURCE_DIR}/cmake/ImpactXFunctions.cmake) diff --git a/cmake/dependencies/ABLASTR.cmake b/cmake/dependencies/ABLASTR.cmake index 56a08fc11..88bc404a2 100644 --- a/cmake/dependencies/ABLASTR.cmake +++ b/cmake/dependencies/ABLASTR.cmake @@ -144,7 +144,7 @@ macro(find_ablastr) set(COMPONENT_DIM 3D) set(COMPONENT_PRECISION ${ImpactX_PRECISION} P${ImpactX_PRECISION}) - find_package(ABLASTR 24.03 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM}) + find_package(ABLASTR 24.04 CONFIG REQUIRED COMPONENTS ${COMPONENT_DIM}) message(STATUS "ABLASTR: Found version '${ABLASTR_VERSION}'") endif() @@ -178,7 +178,7 @@ set(ImpactX_openpmd_src "" set(ImpactX_ablastr_repo "https://github.com/ECP-WarpX/WarpX.git" CACHE STRING "Repository URI to pull and build ABLASTR from if(ImpactX_ablastr_internal)") -set(ImpactX_ablastr_branch "6b0a040d1289f31899c67c2182e4f558a8a8d9ba" +set(ImpactX_ablastr_branch "24.04" CACHE STRING "Repository branch for ImpactX_ablastr_repo if(ImpactX_ablastr_internal)") diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake index 7cbce2051..a26cd5054 100644 --- a/cmake/dependencies/pyAMReX.cmake +++ b/cmake/dependencies/pyAMReX.cmake @@ -64,7 +64,7 @@ function(find_pyamrex) endif() elseif(NOT ImpactX_pyamrex_internal) # TODO: MPI control - find_package(pyAMReX 24.03 CONFIG REQUIRED) + find_package(pyAMReX 24.04 CONFIG REQUIRED) message(STATUS "pyAMReX: Found version '${pyAMReX_VERSION}'") endif() endfunction() @@ -79,7 +79,7 @@ option(ImpactX_pyamrex_internal "Download & build pyAMReX" ON) set(ImpactX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git" CACHE STRING "Repository URI to pull and build pyamrex from if(ImpactX_pyamrex_internal)") -set(ImpactX_pyamrex_branch "bde190184effaf095f14e173df8f61f31ed67308" +set(ImpactX_pyamrex_branch "24.04" CACHE STRING "Repository branch for ImpactX_pyamrex_repo if(ImpactX_pyamrex_internal)") diff --git a/cmake/dependencies/pybind11.cmake b/cmake/dependencies/pybind11.cmake index 40f201120..a478fa09a 100644 --- a/cmake/dependencies/pybind11.cmake +++ b/cmake/dependencies/pybind11.cmake @@ -37,7 +37,7 @@ function(find_pybind11) mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED_FETCHEDpybind11) endif() else() - find_package(pybind11 2.11.1 CONFIG REQUIRED) + find_package(pybind11 2.12.0 CONFIG REQUIRED) message(STATUS "pybind11: Found version '${pybind11_VERSION}'") endif() endfunction() @@ -52,7 +52,7 @@ option(ImpactX_pybind11_internal "Download & build pybind11" ON) set(ImpactX_pybind11_repo "https://github.com/pybind/pybind11.git" CACHE STRING "Repository URI to pull and build pybind11 from if(ImpactX_pybind11_internal)") -set(ImpactX_pybind11_branch "v2.11.1" +set(ImpactX_pybind11_branch "v2.12.0" CACHE STRING "Repository branch for ImpactX_pybind11_repo if(ImpactX_pybind11_internal)") diff --git a/docs/source/conf.py b/docs/source/conf.py index e1e04a01d..4fb849dc6 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -73,9 +73,9 @@ # built documents. # # The short X.Y version. -version = "24.03" +version = "24.04" # The full version, including alpha/beta/rc tags. -release = "24.03" +release = "24.04" # 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 8399da332..1e4f11898 100644 --- a/setup.py +++ b/setup.py @@ -235,7 +235,7 @@ def build_extension(self, ext): setup( name="impactx", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="24.03", + version="24.04", packages=["impactx"], # Python sources: package_dir={"": "src/python"}, From 229a8827288876e8ac0e82397b7063f820cdb960 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 10 Apr 2024 11:41:25 +0200 Subject: [PATCH 2/3] Poisson Solver API Update New FFT solver options. --- src/particles/spacecharge/PoissonSolve.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/particles/spacecharge/PoissonSolve.cpp b/src/particles/spacecharge/PoissonSolve.cpp index aedc6affe..65606b4d6 100644 --- a/src/particles/spacecharge/PoissonSolve.cpp +++ b/src/particles/spacecharge/PoissonSolve.cpp @@ -88,6 +88,7 @@ namespace impactx::spacecharge sorted_phi.emplace_back(&phi[lev]); } + const bool is_solver_multigrid = true; const bool do_single_precision_comms = false; ablastr::fields::computePhi( sorted_rho, @@ -101,6 +102,7 @@ namespace impactx::spacecharge pc.GetParGDB()->DistributionMap(), pc.GetParGDB()->boxArray(), poisson_boundary_handler, + is_solver_multigrid, do_single_precision_comms, rel_ref_ratio /* From e03b9b0eed619c75560c84f279d7ae39a3286427 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 10 Apr 2024 11:45:58 +0200 Subject: [PATCH 3/3] pybind11: keep 2.11.1 for now --- cmake/dependencies/pybind11.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/dependencies/pybind11.cmake b/cmake/dependencies/pybind11.cmake index a478fa09a..40f201120 100644 --- a/cmake/dependencies/pybind11.cmake +++ b/cmake/dependencies/pybind11.cmake @@ -37,7 +37,7 @@ function(find_pybind11) mark_as_advanced(FETCHCONTENT_UPDATES_DISCONNECTED_FETCHEDpybind11) endif() else() - find_package(pybind11 2.12.0 CONFIG REQUIRED) + find_package(pybind11 2.11.1 CONFIG REQUIRED) message(STATUS "pybind11: Found version '${pybind11_VERSION}'") endif() endfunction() @@ -52,7 +52,7 @@ option(ImpactX_pybind11_internal "Download & build pybind11" ON) set(ImpactX_pybind11_repo "https://github.com/pybind/pybind11.git" CACHE STRING "Repository URI to pull and build pybind11 from if(ImpactX_pybind11_internal)") -set(ImpactX_pybind11_branch "v2.12.0" +set(ImpactX_pybind11_branch "v2.11.1" CACHE STRING "Repository branch for ImpactX_pybind11_repo if(ImpactX_pybind11_internal)")