From 72e0b468d4f291330a0dca271b5817566ce1de94 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 4 Feb 2025 10:43:10 -0800 Subject: [PATCH 1/6] PICSAR: 25.02 in Scripts --- Tools/Release/releasePR.py | 2 +- Tools/Release/weeklyUpdate.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/Release/releasePR.py b/Tools/Release/releasePR.py index 9dfa178e5b4..8891ba13864 100755 --- a/Tools/Release/releasePR.py +++ b/Tools/Release/releasePR.py @@ -93,7 +93,7 @@ def concat_answers(answers): # PICSAR New Version ########################################################## -PICSAR_version = "24.09" +PICSAR_version = "25.02" answers = concat_answers(["y", PICSAR_version, PICSAR_version, "y"]) process = subprocess.Popen( diff --git a/Tools/Release/weeklyUpdate.py b/Tools/Release/weeklyUpdate.py index 005c8c5d373..3c1b8ae6d44 100755 --- a/Tools/Release/weeklyUpdate.py +++ b/Tools/Release/weeklyUpdate.py @@ -88,7 +88,7 @@ def concat_answers(answers): # PICSAR New Version ########################################################## -PICSAR_version = "24.09" +PICSAR_version = "25.02" answers = concat_answers(["y", PICSAR_version, PICSAR_version, "y"]) process = subprocess.Popen( From baeba825f1a000c780963ff3b35e705338153ac2 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 4 Feb 2025 10:43:29 -0800 Subject: [PATCH 2/6] AMReX: 25.02 Signed-off-by: Axel Huebl --- .github/workflows/cuda.yml | 2 +- cmake/dependencies/AMReX.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 12a68d327f7..21f762f4819 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -127,7 +127,7 @@ jobs: which nvcc || echo "nvcc not in PATH!" git clone https://github.com/AMReX-Codes/amrex.git ../amrex - cd ../amrex && git checkout --detach 69f1ac884c6aba4d9881260819ade3bb25ed8aad && cd - + cd ../amrex && git checkout --detach 25.02 && cd - make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4 ccache -s diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 9c8907e835b..83feb0ff1db 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -271,7 +271,7 @@ macro(find_amrex) endif() set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION}) - find_package(AMReX 25.01 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_CATALYST} ${COMPONENT_DIMS} ${COMPONENT_EB} ${COMPONENT_FFT} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS) + find_package(AMReX 25.02 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_CATALYST} ${COMPONENT_DIMS} ${COMPONENT_EB} ${COMPONENT_FFT} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS) # note: TINYP skipped because user-configured and optional # AMReX CMake helper scripts @@ -294,7 +294,7 @@ set(WarpX_amrex_src "" set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)") -set(WarpX_amrex_branch "69f1ac884c6aba4d9881260819ade3bb25ed8aad" +set(WarpX_amrex_branch "25.02" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") From 4f961f84cacab9750a34b2787ed8de99be0e439b Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 4 Feb 2025 10:43:32 -0800 Subject: [PATCH 3/6] PICSAR: 25.02 Signed-off-by: Axel Huebl --- cmake/dependencies/PICSAR.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/dependencies/PICSAR.cmake b/cmake/dependencies/PICSAR.cmake index 9eb9162238a..33a19fc3fe3 100644 --- a/cmake/dependencies/PICSAR.cmake +++ b/cmake/dependencies/PICSAR.cmake @@ -88,7 +88,7 @@ function(find_picsar) #message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'") else() # not supported by PICSAR (yet) - #find_package(PICSAR 24.09 CONFIG REQUIRED QED) + #find_package(PICSAR 25.02 CONFIG REQUIRED QED) #message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'") message(FATAL_ERROR "PICSAR: Cannot be used as externally installed " "library yet. " @@ -109,7 +109,7 @@ if(WarpX_QED) set(WarpX_picsar_repo "https://github.com/ECP-WarpX/picsar.git" CACHE STRING "Repository URI to pull and build PICSAR from if(WarpX_picsar_internal)") - set(WarpX_picsar_branch "24.09" + set(WarpX_picsar_branch "25.02" CACHE STRING "Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)") From aa42c2a4ef17005f7d1bef09b18b51f482c8f018 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 4 Feb 2025 10:43:34 -0800 Subject: [PATCH 4/6] pyAMReX: 25.02 Signed-off-by: Axel Huebl --- cmake/dependencies/pyAMReX.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake index 257bc264f21..975644ebf2b 100644 --- a/cmake/dependencies/pyAMReX.cmake +++ b/cmake/dependencies/pyAMReX.cmake @@ -59,7 +59,7 @@ function(find_pyamrex) endif() elseif(NOT WarpX_pyamrex_internal) # TODO: MPI control - find_package(pyAMReX 25.01 CONFIG REQUIRED) + find_package(pyAMReX 25.02 CONFIG REQUIRED) message(STATUS "pyAMReX: Found version '${pyAMReX_VERSION}'") endif() endfunction() @@ -74,7 +74,7 @@ option(WarpX_pyamrex_internal "Download & build pyAMReX" ON) set(WarpX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git" CACHE STRING "Repository URI to pull and build pyamrex from if(WarpX_pyamrex_internal)") -set(WarpX_pyamrex_branch "458c9ae7ab3cd4ca4e4e9736e82c60f9a7e7606c" +set(WarpX_pyamrex_branch "25.02" CACHE STRING "Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)") From 098047916d1bd7b92141dd9d450adbe0393c4b00 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 4 Feb 2025 10:43:37 -0800 Subject: [PATCH 5/6] WarpX: 25.02 Signed-off-by: Axel Huebl --- CMakeLists.txt | 2 +- Docs/source/conf.py | 4 ++-- Python/setup.py | 2 +- setup.py | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 24e9338982e..bb3ee66f786 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.24.0) -project(WarpX VERSION 25.01) +project(WarpX VERSION 25.02) include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake) diff --git a/Docs/source/conf.py b/Docs/source/conf.py index 247e11faa4f..666aaf858fa 100644 --- a/Docs/source/conf.py +++ b/Docs/source/conf.py @@ -107,9 +107,9 @@ def __init__(self, *args, **kwargs): # built documents. # # The short X.Y version. -version = "25.01" +version = "25.02" # The full version, including alpha/beta/rc tags. -release = "25.01" +release = "25.02" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/Python/setup.py b/Python/setup.py index a50b467c070..e0ec6c98a7d 100644 --- a/Python/setup.py +++ b/Python/setup.py @@ -65,7 +65,7 @@ setup( name="pywarpx", - version="25.01", + version="25.02", packages=["pywarpx"], package_dir={"pywarpx": "pywarpx"}, description="""Wrapper of WarpX""", diff --git a/setup.py b/setup.py index 9538adcb106..fae11aa0654 100644 --- a/setup.py +++ b/setup.py @@ -280,7 +280,7 @@ def build_extension(self, ext): setup( name="pywarpx", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="25.01", + version="25.02", packages=["pywarpx"], package_dir={"pywarpx": "Python/pywarpx"}, author="Jean-Luc Vay, David P. Grote, Maxence Thévenet, Rémi Lehe, Andrew Myers, Weiqun Zhang, Axel Huebl, et al.", From 7e6eb121406a47fba7bcab876f32311d376ccc7b Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 4 Feb 2025 10:46:39 -0800 Subject: [PATCH 6/6] PICSAR: 25.01 --- Tools/Release/releasePR.py | 2 +- Tools/Release/weeklyUpdate.py | 2 +- cmake/dependencies/PICSAR.cmake | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Tools/Release/releasePR.py b/Tools/Release/releasePR.py index 8891ba13864..47a380901b1 100755 --- a/Tools/Release/releasePR.py +++ b/Tools/Release/releasePR.py @@ -93,7 +93,7 @@ def concat_answers(answers): # PICSAR New Version ########################################################## -PICSAR_version = "25.02" +PICSAR_version = "25.01" answers = concat_answers(["y", PICSAR_version, PICSAR_version, "y"]) process = subprocess.Popen( diff --git a/Tools/Release/weeklyUpdate.py b/Tools/Release/weeklyUpdate.py index 3c1b8ae6d44..6c32993f79e 100755 --- a/Tools/Release/weeklyUpdate.py +++ b/Tools/Release/weeklyUpdate.py @@ -88,7 +88,7 @@ def concat_answers(answers): # PICSAR New Version ########################################################## -PICSAR_version = "25.02" +PICSAR_version = "25.01" answers = concat_answers(["y", PICSAR_version, PICSAR_version, "y"]) process = subprocess.Popen( diff --git a/cmake/dependencies/PICSAR.cmake b/cmake/dependencies/PICSAR.cmake index 33a19fc3fe3..d5249b61641 100644 --- a/cmake/dependencies/PICSAR.cmake +++ b/cmake/dependencies/PICSAR.cmake @@ -88,7 +88,7 @@ function(find_picsar) #message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'") else() # not supported by PICSAR (yet) - #find_package(PICSAR 25.02 CONFIG REQUIRED QED) + #find_package(PICSAR 25.01 CONFIG REQUIRED QED) #message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'") message(FATAL_ERROR "PICSAR: Cannot be used as externally installed " "library yet. " @@ -109,7 +109,7 @@ if(WarpX_QED) set(WarpX_picsar_repo "https://github.com/ECP-WarpX/picsar.git" CACHE STRING "Repository URI to pull and build PICSAR from if(WarpX_picsar_internal)") - set(WarpX_picsar_branch "25.02" + set(WarpX_picsar_branch "25.01" CACHE STRING "Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)")