Skip to content

Commit

Permalink
Release 24.09 (#5214)
Browse files Browse the repository at this point in the history
* AMReX: 24.09

* PICSAR: 24.09

* pyAMReX: 24.09

* WarpX: 24.09
  • Loading branch information
ax3l authored Sep 5, 2024
1 parent 418b71a commit 5b34b84
Show file tree
Hide file tree
Showing 8 changed files with 11 additions and 11 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ jobs:
which nvcc || echo "nvcc not in PATH!"
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
cd ../amrex && git checkout --detach 12002e7283284281503ed4ae5e79ae02e006b897 && cd -
cd ../amrex && git checkout --detach 24.09 && 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
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Preamble ####################################################################
#
cmake_minimum_required(VERSION 3.24.0)
project(WarpX VERSION 24.08)
project(WarpX VERSION 24.09)

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

Expand Down
2 changes: 1 addition & 1 deletion Regression/WarpX-GPU-tests.ini
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more

[AMReX]
dir = /home/regtester/git/amrex/
branch = 12002e7283284281503ed4ae5e79ae02e006b897
branch = 24.09

[source]
dir = /home/regtester/git/WarpX
Expand Down
2 changes: 1 addition & 1 deletion Regression/WarpX-tests.ini
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det

[AMReX]
dir = /home/regtester/AMReX_RegTesting/amrex/
branch = 12002e7283284281503ed4ae5e79ae02e006b897
branch = 24.09

[source]
dir = /home/regtester/AMReX_RegTesting/warpx
Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -256,7 +256,7 @@ macro(find_amrex)
endif()
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION})

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

# AMReX CMake helper scripts
Expand All @@ -279,7 +279,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 "12002e7283284281503ed4ae5e79ae02e006b897"
set(WarpX_amrex_branch "24.09"
CACHE STRING
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/PICSAR.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@ function(find_picsar)
#message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'")
else()
# not supported by PICSAR (yet)
#find_package(PICSAR 23.11 CONFIG REQUIRED QED)
#find_package(PICSAR 24.09 CONFIG REQUIRED QED)
#message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
"library yet. "
Expand All @@ -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 "44a2dfdf0f8cae93f12328664e055703989e7185"
set(WarpX_picsar_branch "24.09"
CACHE STRING
"Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)")

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/pyAMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ function(find_pyamrex)
endif()
elseif(NOT WarpX_pyamrex_internal)
# TODO: MPI control
find_package(pyAMReX 24.08 CONFIG REQUIRED)
find_package(pyAMReX 24.09 CONFIG REQUIRED)
message(STATUS "pyAMReX: Found version '${pyAMReX_VERSION}'")
endif()
endfunction()
Expand All @@ -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 "6061d62ec1bd0d5c9a853f5005714fa79864707e"
set(WarpX_pyamrex_branch "24.09"
CACHE STRING
"Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)")

Expand Down
2 changes: 1 addition & 1 deletion run_test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ python3 -m pip cache purge

# Clone AMReX and warpx-data
git clone https://github.com/AMReX-Codes/amrex.git
cd amrex && git checkout --detach 12002e7283284281503ed4ae5e79ae02e006b897 && cd -
cd amrex && git checkout --detach 24.09 && cd -
# warpx-data contains various required data sets
git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
# openPMD-example-datasets contains various required data sets
Expand Down

0 comments on commit 5b34b84

Please sign in to comment.