Skip to content

Commit 206b081

Browse files
authored
Release 24.02 (#4660)
* AMReX: 24.02 * pyAMReX: 24.02 * WarpX: 24.02
1 parent 1093f61 commit 206b081

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

.github/workflows/cuda.yml

+1-1
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 689144d157a0106faf3d0ae89f8d90b0250cf975 && cd -
118+
cd ../amrex && git checkout --detach 24.02 && cd -
119119
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
120120
121121
ccache -s

CMakeLists.txt

+1-1
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.01)
4+
project(WarpX VERSION 24.02)
55

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

Docs/source/conf.py

+2-2
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.01'
106+
version = u'24.02'
107107
# The full version, including alpha/beta/rc tags.
108-
release = u'24.01'
108+
release = u'24.02'
109109

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

Python/setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
package_data = {}
5555

5656
setup(name = 'pywarpx',
57-
version = '24.01',
57+
version = '24.02',
5858
packages = ['pywarpx'],
5959
package_dir = {'pywarpx': 'pywarpx'},
6060
description = """Wrapper of WarpX""",

Regression/WarpX-GPU-tests.ini

+1-1
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 = 689144d157a0106faf3d0ae89f8d90b0250cf975
63+
branch = 24.02
6464

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

Regression/WarpX-tests.ini

+1-1
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 = 689144d157a0106faf3d0ae89f8d90b0250cf975
62+
branch = 24.02
6363

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

cmake/dependencies/AMReX.cmake

+2-2
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.01 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIMS} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS)
253+
find_package(AMReX 24.02 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
@@ -269,7 +269,7 @@ set(WarpX_amrex_src ""
269269
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
270270
CACHE STRING
271271
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
272-
set(WarpX_amrex_branch "689144d157a0106faf3d0ae89f8d90b0250cf975"
272+
set(WarpX_amrex_branch "24.02"
273273
CACHE STRING
274274
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
275275

cmake/dependencies/pyAMReX.cmake

+2-2
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.01 CONFIG REQUIRED)
67+
find_package(pyAMReX 24.02 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 "cdf03496f6809527b97950e077508ca4b201fa9b"
82+
set(WarpX_pyamrex_branch "24.02"
8383
CACHE STRING
8484
"Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)")
8585

run_test.sh

+1-1
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 689144d157a0106faf3d0ae89f8d90b0250cf975 && cd -
71+
cd amrex && git checkout --detach 24.02 && 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

setup.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ def build_extension(self, ext):
278278
setup(
279279
name='pywarpx',
280280
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
281-
version = '24.01',
281+
version = '24.02',
282282
packages = ['pywarpx'],
283283
package_dir = {'pywarpx': 'Python/pywarpx'},
284284
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)