Skip to content

Commit 12414e4

Browse files
authored
Release 23.10 (#4344)
* AMReX: 23.10 * pyAMReX: 23.10 * WarpX: 23.10
1 parent 7905cb9 commit 12414e4

File tree

10 files changed

+13
-13
lines changed

10 files changed

+13
-13
lines changed

.github/workflows/cuda.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ jobs:
111111
which nvcc || echo "nvcc not in PATH!"
112112
113113
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
114-
cd ../amrex && git checkout --detach 2e99628138df3b5b0ecf50b0c1201d5547f821a0 && cd -
114+
cd ../amrex && git checkout --detach 23.10 && cd -
115115
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
116116
117117
build_nvhpc21-11-nvcc:

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 23.09)
4+
project(WarpX VERSION 23.10)
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
@@ -79,9 +79,9 @@
7979
# built documents.
8080
#
8181
# The short X.Y version.
82-
version = u'23.09'
82+
version = u'23.10'
8383
# The full version, including alpha/beta/rc tags.
84-
release = u'23.09'
84+
release = u'23.10'
8585

8686
# The language for content autogenerated by Sphinx. Refer to documentation
8787
# 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 = '23.09',
57+
version = '23.10',
5858
packages = ['pywarpx'],
5959
package_dir = {'pywarpx': 'pywarpx'},
6060
description = """Wrapper of WarpX""",

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 = 2e99628138df3b5b0ecf50b0c1201d5547f821a0
63+
branch = 23.10
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 = 2e99628138df3b5b0ecf50b0c1201d5547f821a0
62+
branch = 23.10
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
@@ -243,7 +243,7 @@ macro(find_amrex)
243243
endif()
244244
set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION})
245245

246-
find_package(AMReX 23.09 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIMS} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
246+
find_package(AMReX 23.10 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIMS} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
247247
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
248248
endif()
249249
endmacro()
@@ -257,7 +257,7 @@ set(WarpX_amrex_src ""
257257
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
258258
CACHE STRING
259259
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
260-
set(WarpX_amrex_branch "2e99628138df3b5b0ecf50b0c1201d5547f821a0"
260+
set(WarpX_amrex_branch "23.10"
261261
CACHE STRING
262262
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
263263

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 23.07 CONFIG REQUIRED)
67+
find_package(pyAMReX 23.10 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 "development"
82+
set(WarpX_pyamrex_branch "23.10"
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
@@ -71,7 +71,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt
7171

7272
# Clone AMReX and warpx-data
7373
git clone https://github.com/AMReX-Codes/amrex.git
74-
cd amrex && git checkout --detach 2e99628138df3b5b0ecf50b0c1201d5547f821a0 && cd -
74+
cd amrex && git checkout --detach 23.10 && cd -
7575
# warpx-data contains various required data sets
7676
git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
7777
# openPMD-example-datasets contains various required data sets

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ def build_extension(self, ext):
283283
setup(
284284
name='pywarpx',
285285
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
286-
version = '23.09',
286+
version = '23.10',
287287
packages = ['pywarpx'],
288288
package_dir = {'pywarpx': 'Python/pywarpx'},
289289
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)