Skip to content

Commit 5b34b84

Browse files
authored
Release 24.09 (#5214)
* AMReX: 24.09 * PICSAR: 24.09 * pyAMReX: 24.09 * WarpX: 24.09
1 parent 418b71a commit 5b34b84

File tree

8 files changed

+11
-11
lines changed

8 files changed

+11
-11
lines changed

.github/workflows/cuda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ jobs:
131131
which nvcc || echo "nvcc not in PATH!"
132132
133133
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
134-
cd ../amrex && git checkout --detach 12002e7283284281503ed4ae5e79ae02e006b897 && cd -
134+
cd ../amrex && git checkout --detach 24.09 && cd -
135135
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4
136136
137137
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 24.08)
4+
project(WarpX VERSION 24.09)
55

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

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 = 12002e7283284281503ed4ae5e79ae02e006b897
63+
branch = 24.09
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 = 12002e7283284281503ed4ae5e79ae02e006b897
62+
branch = 24.09
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
@@ -256,7 +256,7 @@ macro(find_amrex)
256256
endif()
257257
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION})
258258

259-
find_package(AMReX 24.08 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_CATALYST} ${COMPONENT_DIMS} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS)
259+
find_package(AMReX 24.09 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_CATALYST} ${COMPONENT_DIMS} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS)
260260
# note: TINYP skipped because user-configured and optional
261261

262262
# AMReX CMake helper scripts
@@ -279,7 +279,7 @@ set(WarpX_amrex_src ""
279279
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
280280
CACHE STRING
281281
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
282-
set(WarpX_amrex_branch "12002e7283284281503ed4ae5e79ae02e006b897"
282+
set(WarpX_amrex_branch "24.09"
283283
CACHE STRING
284284
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
285285

cmake/dependencies/PICSAR.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function(find_picsar)
8888
#message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'")
8989
else()
9090
# not supported by PICSAR (yet)
91-
#find_package(PICSAR 23.11 CONFIG REQUIRED QED)
91+
#find_package(PICSAR 24.09 CONFIG REQUIRED QED)
9292
#message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
9393
message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
9494
"library yet. "
@@ -109,7 +109,7 @@ if(WarpX_QED)
109109
set(WarpX_picsar_repo "https://github.com/ECP-WarpX/picsar.git"
110110
CACHE STRING
111111
"Repository URI to pull and build PICSAR from if(WarpX_picsar_internal)")
112-
set(WarpX_picsar_branch "44a2dfdf0f8cae93f12328664e055703989e7185"
112+
set(WarpX_picsar_branch "24.09"
113113
CACHE STRING
114114
"Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)")
115115

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 24.08 CONFIG REQUIRED)
62+
find_package(pyAMReX 24.09 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 "6061d62ec1bd0d5c9a853f5005714fa79864707e"
77+
set(WarpX_pyamrex_branch "24.09"
7878
CACHE STRING
7979
"Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)")
8080

run_test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ python3 -m pip cache purge
7272

7373
# Clone AMReX and warpx-data
7474
git clone https://github.com/AMReX-Codes/amrex.git
75-
cd amrex && git checkout --detach 12002e7283284281503ed4ae5e79ae02e006b897 && cd -
75+
cd amrex && git checkout --detach 24.09 && cd -
7676
# warpx-data contains various required data sets
7777
git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
7878
# openPMD-example-datasets contains various required data sets

0 commit comments

Comments
 (0)