Skip to content

Commit 0a1284c

Browse files
authored
Release 24.05 (#4928)
* AMReX: 24.05 * pyAMReX: 24.05 * WarpX: 24.05 * `Python_restart_eb`: Reset Checksum
1 parent c70a6c5 commit 0a1284c

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

.github/workflows/cuda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ jobs:
115115
which nvcc || echo "nvcc not in PATH!"
116116
117117
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
118-
cd ../amrex && git checkout --detach d857968968ae2cdf18f39ee50df96529e326ff39 && cd -
118+
cd ../amrex && git checkout --detach 24.05 && cd -
119119
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 4
120120
121121
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.20.0)
4-
project(WarpX VERSION 24.04)
4+
project(WarpX VERSION 24.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
@@ -103,9 +103,9 @@ def __init__(self, *args, **kwargs):
103103
# built documents.
104104
#
105105
# The short X.Y version.
106-
version = u'24.04'
106+
version = u'24.05'
107107
# The full version, including alpha/beta/rc tags.
108-
release = u'24.04'
108+
release = u'24.05'
109109

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

Python/setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
package_data = {}
5555

5656
setup(name = 'pywarpx',
57-
version = '24.04',
57+
version = '24.05',
5858
packages = ['pywarpx'],
5959
package_dir = {'pywarpx': 'pywarpx'},
6060
description = """Wrapper of WarpX""",
Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"lev=0": {
3-
"Bx": 148618.63186220315,
4-
"By": 148618.63186220315,
5-
"Bz": 3385.851454453729,
6-
"Ex": 55362729623335.9,
7-
"Ey": 55362729623335.89,
8-
"Ez": 68396725892689.86
3+
"Bx": 148673.005859208,
4+
"By": 148673.00585920806,
5+
"Bz": 3371.758117878558,
6+
"Ex": 55378581103426.71,
7+
"Ey": 55378581103426.72,
8+
"Ez": 68412803445328.25
99
}
10-
}
10+
}

Regression/WarpX-GPU-tests.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
6060

6161
[AMReX]
6262
dir = /home/regtester/git/amrex/
63-
branch = d857968968ae2cdf18f39ee50df96529e326ff39
63+
branch = 24.05
6464

6565
[source]
6666
dir = /home/regtester/git/WarpX

Regression/WarpX-tests.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det
5959

6060
[AMReX]
6161
dir = /home/regtester/AMReX_RegTesting/amrex/
62-
branch = d857968968ae2cdf18f39ee50df96529e326ff39
62+
branch = 24.05
6363

6464
[source]
6565
dir = /home/regtester/AMReX_RegTesting/warpx

cmake/dependencies/AMReX.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ macro(find_amrex)
250250
endif()
251251
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION})
252252

253-
find_package(AMReX 24.04 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIMS} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS)
253+
find_package(AMReX 24.05 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIMS} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS)
254254
# note: TINYP skipped because user-configured and optional
255255

256256
# AMReX CMake helper scripts
@@ -273,7 +273,7 @@ set(WarpX_amrex_src ""
273273
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
274274
CACHE STRING
275275
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
276-
set(WarpX_amrex_branch "d857968968ae2cdf18f39ee50df96529e326ff39"
276+
set(WarpX_amrex_branch "24.05"
277277
CACHE STRING
278278
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
279279

cmake/dependencies/pyAMReX.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ function(find_pyamrex)
6464
endif()
6565
elseif(NOT WarpX_pyamrex_internal)
6666
# TODO: MPI control
67-
find_package(pyAMReX 24.04 CONFIG REQUIRED)
67+
find_package(pyAMReX 24.05 CONFIG REQUIRED)
6868
message(STATUS "pyAMReX: Found version '${pyAMReX_VERSION}'")
6969
endif()
7070
endfunction()
@@ -79,7 +79,7 @@ option(WarpX_pyamrex_internal "Download & build pyAMReX" ON)
7979
set(WarpX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
8080
CACHE STRING
8181
"Repository URI to pull and build pyamrex from if(WarpX_pyamrex_internal)")
82-
set(WarpX_pyamrex_branch "f370d38ab410dbf1b3a90683c97291841ebeb3f5"
82+
set(WarpX_pyamrex_branch "24.05"
8383
CACHE STRING
8484
"Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)")
8585

run_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt
6868

6969
# Clone AMReX and warpx-data
7070
git clone https://github.com/AMReX-Codes/amrex.git
71-
cd amrex && git checkout --detach d857968968ae2cdf18f39ee50df96529e326ff39 && cd -
71+
cd amrex && git checkout --detach 24.05 && cd -
7272
# warpx-data contains various required data sets
7373
git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
7474
# openPMD-example-datasets contains various required data sets

0 commit comments

Comments
 (0)