Skip to content

Commit ff201a9

Browse files
EZonirho-novatron
authored andcommitted
Release: 25.05 (BLAST-WarpX#5865)
Weekly update to latest AMReX, pyAMReX, PICSAR: ``` ./Tools/Release/updateAMReX.py ./Tools/Release/updatepyAMReX.py ./Tools/Release/updatePICSAR.py ``` WarpX release 25.05: ``` ./Tools/Release/newVersion.sh ``` To-do: - [x] Merge AMReX-Codes/pyamrex#442 - [x] Merge BLAST-WarpX#5820 - [x] Mark as ready for review and run CI
1 parent e6d71ba commit ff201a9

File tree

7 files changed

+10
-10
lines changed

7 files changed

+10
-10
lines changed

.github/workflows/cuda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ jobs:
123123
which nvcc || echo "nvcc not in PATH!"
124124
125125
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
126-
cd ../amrex && git checkout --detach eb137e3644c452707549abd04fa502b822590b08 && cd -
126+
cd ../amrex && git checkout --detach 25.05 && cd -
127127
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4
128128
129129
ccache -s

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Preamble ####################################################################
22
#
33
cmake_minimum_required(VERSION 3.24.0)
4-
project(WarpX VERSION 25.04)
4+
project(WarpX VERSION 25.05)
55

66
include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake)
77

Docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,9 @@ def __init__(self, *args, **kwargs):
112112
# built documents.
113113
#
114114
# The short X.Y version.
115-
version = "25.04"
115+
version = "25.05"
116116
# The full version, including alpha/beta/rc tags.
117-
release = "25.04"
117+
release = "25.05"
118118

119119
# The language for content autogenerated by Sphinx. Refer to documentation
120120
# for a list of supported languages.

Python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565

6666
setup(
6767
name="pywarpx",
68-
version="25.04",
68+
version="25.05",
6969
packages=["pywarpx"],
7070
package_dir={"pywarpx": "pywarpx"},
7171
description="""Wrapper of WarpX""",

cmake/dependencies/AMReX.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -271,7 +271,7 @@ macro(find_amrex)
271271
endif()
272272
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION})
273273

274-
find_package(AMReX 25.04 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_CATALYST} ${COMPONENT_DIMS} ${COMPONENT_EB} ${COMPONENT_FFT} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS)
274+
find_package(AMReX 25.05 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_CATALYST} ${COMPONENT_DIMS} ${COMPONENT_EB} ${COMPONENT_FFT} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS)
275275
# note: TINYP skipped because user-configured and optional
276276

277277
# AMReX CMake helper scripts
@@ -294,7 +294,7 @@ set(WarpX_amrex_src ""
294294
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
295295
CACHE STRING
296296
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
297-
set(WarpX_amrex_branch "eb137e3644c452707549abd04fa502b822590b08"
297+
set(WarpX_amrex_branch "25.05"
298298
CACHE STRING
299299
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
300300

cmake/dependencies/pyAMReX.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ function(find_pyamrex)
5959
endif()
6060
elseif(NOT WarpX_pyamrex_internal)
6161
# TODO: MPI control
62-
find_package(pyAMReX 25.04 CONFIG REQUIRED)
62+
find_package(pyAMReX 25.05 CONFIG REQUIRED)
6363
message(STATUS "pyAMReX: Found version '${pyAMReX_VERSION}'")
6464
endif()
6565
endfunction()
@@ -74,7 +74,7 @@ option(WarpX_pyamrex_internal "Download & build pyAMReX" ON)
7474
set(WarpX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
7575
CACHE STRING
7676
"Repository URI to pull and build pyamrex from if(WarpX_pyamrex_internal)")
77-
set(WarpX_pyamrex_branch "d9e7fd083cb797bb5e873853b3e1ce2d9a4534ad"
77+
set(WarpX_pyamrex_branch "25.05"
7878
CACHE STRING
7979
"Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)")
8080

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,7 +280,7 @@ def build_extension(self, ext):
280280
setup(
281281
name="pywarpx",
282282
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
283-
version="25.04",
283+
version="25.05",
284284
packages=["pywarpx"],
285285
package_dir={"pywarpx": "Python/pywarpx"},
286286
author="Jean-Luc Vay, David P. Grote, Maxence Thévenet, Rémi Lehe, Andrew Myers, Weiqun Zhang, Axel Huebl, et al.",

0 commit comments

Comments
 (0)