File tree Expand file tree Collapse file tree 11 files changed +14
-14
lines changed Expand file tree Collapse file tree 11 files changed +14
-14
lines changed Original file line number Diff line number Diff line change @@ -108,7 +108,7 @@ jobs:
108108 which nvcc || echo "nvcc not in PATH!"
109109
110110 git clone https://github.com/AMReX-Codes/amrex.git ../amrex
111- cd ../amrex && git checkout --detach be6c6415467d09da6109d27cfa218868abc1f9db && cd -
111+ cd ../amrex && git checkout --detach 23.11 && cd -
112112 make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
113113
114114 build_nvhpc21-11-nvcc :
Original file line number Diff line number Diff line change 11# Preamble ####################################################################
22#
33cmake_minimum_required (VERSION 3.20.0)
4- project (WarpX VERSION 23.10 )
4+ project (WarpX VERSION 23.11 )
55
66include (${WarpX_SOURCE_DIR} /cmake/WarpXFunctions.cmake)
77
Original file line number Diff line number Diff line change 7979# built documents.
8080#
8181# The short X.Y version.
82- version = u'23.10 '
82+ version = u'23.11 '
8383# The full version, including alpha/beta/rc tags.
84- release = u'23.10 '
84+ release = u'23.11 '
8585
8686# The language for content autogenerated by Sphinx. Refer to documentation
8787# for a list of supported languages.
Original file line number Diff line number Diff line change 5454 package_data = {}
5555
5656setup (name = 'pywarpx' ,
57- version = '23.10 ' ,
57+ version = '23.11 ' ,
5858 packages = ['pywarpx' ],
5959 package_dir = {'pywarpx' : 'pywarpx' },
6060 description = """Wrapper of WarpX""" ,
Original file line number Diff line number Diff line change @@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
6060
6161[AMReX]
6262dir = /home/regtester/git/amrex/
63- branch = be6c6415467d09da6109d27cfa218868abc1f9db
63+ branch = 23.11
6464
6565[source]
6666dir = /home/regtester/git/WarpX
Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det
5959
6060[AMReX]
6161dir = /home/regtester/AMReX_RegTesting/amrex/
62- branch = be6c6415467d09da6109d27cfa218868abc1f9db
62+ branch = 23.11
6363
6464[source]
6565dir = /home/regtester/AMReX_RegTesting/warpx
Original file line number Diff line number Diff line change 5555# find_package(AMReX YY.MM CONFIG ...
5656pyamrex_minimal = f"unknown (format issue in { pyamrex_cmake_path } )"
5757with open (pyamrex_cmake_path , encoding = 'utf-8' ) as f :
58- r_minimal = re .findall (r'.*find_package\(AMReX \s+(.+)\s+CONFIG\s+.*' ,
58+ r_minimal = re .findall (r'.*find_package\(pyAMReX \s+(.+)\s+CONFIG\s+.*' ,
5959 f .read (), re .MULTILINE )
6060 if len (r_minimal ) >= 1 :
6161 pyamrex_minimal = r_minimal [0 ]
Original file line number Diff line number Diff 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 23.10 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIMS} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} LSOLVERS)
253+ find_package (AMReX 23.11 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 ""
269269set (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 "be6c6415467d09da6109d27cfa218868abc1f9db "
272+ set (WarpX_amrex_branch "23.11 "
273273 CACHE STRING
274274 "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)" )
275275
Original file line number Diff line number Diff 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.10 CONFIG REQUIRED)
67+ find_package (pyAMReX 23.11 CONFIG REQUIRED)
6868 message (STATUS "pyAMReX: Found version '${pyAMReX_VERSION} '" )
6969 endif ()
7070endfunction ()
@@ -79,7 +79,7 @@ option(WarpX_pyamrex_internal "Download & build pyAMReX" ON)
7979set (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 "056d332d68fa98b9e9509d05ec3b1a3d8ef37673 "
82+ set (WarpX_pyamrex_branch "23.11 "
8383 CACHE STRING
8484 "Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)" )
8585
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt
6868
6969# Clone AMReX and warpx-data
7070git clone https://github.com/AMReX-Codes/amrex.git
71- cd amrex && git checkout --detach be6c6415467d09da6109d27cfa218868abc1f9db && cd -
71+ cd amrex && git checkout --detach 23.11 && cd -
7272# warpx-data contains various required data sets
7373git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
7474# openPMD-example-datasets contains various required data sets
You can’t perform that action at this time.
0 commit comments