Release 22.07 (ECP-WarpX#3211)

* AMReX: 22.07

* PICSAR: 22.07

* WarpX: 22.07

* SENSEI: Update to 4.0.0

* AMReX: 22.07-4-gcbdc6580ee

Include SENSEI build fixes.

.github/workflows/cuda.yml

@@ -106,7 +106,7 @@ jobs:
         which nvcc || echo "nvcc not in PATH!"
 
         git clone https://github.com/AMReX-Codes/amrex.git ../amrex
-        cd amrex && git checkout --detach 027f2ff77fed33a191cfc735d8adaabb42d21743 && cd -
+        cd amrex && git checkout --detach cbdc6580ee3d78cccdd37172e4ba077ee181f483 && cd -
         make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2
 
   build_nvhpc21-11-nvcc:

.github/workflows/insitu.yml

@@ -16,17 +16,16 @@ jobs:
       CC: clang
       CXXFLAGS: "-Werror -Wshadow -Woverloaded-virtual -Wunreachable-code -Wno-error=pass-failed"
       CMAKE_GENERATOR: Ninja
-      CMAKE_PREFIX_PATH: /root/install/sensei/develop/lib/cmake
+      CMAKE_PREFIX_PATH: /root/install/sensei/v4.0.0/lib64/cmake
     container:
-      image: ryankrattiger/sensei:fedora33-vtk-mpi-20210616
+      image: senseiinsitu/ci:fedora35-amrex-20220613
     steps:
     - uses: actions/checkout@v2
     - name: Configure
       run: |
         cmake -S . -B build     \
           -DWarpX_SENSEI=ON     \
-          -DWarpX_COMPUTE=NOACC \
-          -DCMAKE_CXX_STANDARD=14
+          -DWarpX_COMPUTE=NOACC
     - name: Build
       run: |
         cmake --build build -j 2

CMakeLists.txt

@@ -1,7 +1,7 @@
 # Preamble ####################################################################
 #
 cmake_minimum_required(VERSION 3.18.0)
-project(WarpX VERSION 22.06)
+project(WarpX VERSION 22.07)
 
 include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake)
 

Docs/source/conf.py

@@ -71,9 +71,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = u'22.06'
+version = u'22.07'
 # The full version, including alpha/beta/rc tags.
-release = u'22.06'
+release = u'22.07'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

LICENSE.txt

@@ -1,4 +1,4 @@
-WarpX v22.06 Copyright (c) 2018-2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
+WarpX v22.07 Copyright (c) 2018-2022, The Regents of the University of California, through Lawrence Berkeley National Laboratory, and Lawrence Livermore National Security, LLC, for the operation of Lawrence Livermore National Laboratory (subject to receipt of any required approvals from the U.S. Dept. of Energy). All rights reserved.
 
 
 Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:

Python/setup.py

@@ -54,7 +54,7 @@
     package_data = {}
 
 setup(name = 'pywarpx',
-      version = '22.06',
+      version = '22.07',
       packages = ['pywarpx'],
       package_dir = {'pywarpx': 'pywarpx'},
       description = """Wrapper of WarpX""",

Regression/WarpX-GPU-tests.ini

@@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more
 
 [AMReX]
 dir = /home/regtester/git/amrex/
-branch = 027f2ff77fed33a191cfc735d8adaabb42d21743
+branch = cbdc6580ee3d78cccdd37172e4ba077ee181f483
 
 [source]
 dir = /home/regtester/git/WarpX

Regression/WarpX-tests.ini

@@ -59,7 +59,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det
 
 [AMReX]
 dir = /home/regtester/AMReX_RegTesting/amrex/
-branch = 027f2ff77fed33a191cfc735d8adaabb42d21743
+branch = cbdc6580ee3d78cccdd37172e4ba077ee181f483
 
 [source]
 dir = /home/regtester/AMReX_RegTesting/warpx

cmake/dependencies/AMReX.cmake

@@ -227,7 +227,7 @@ macro(find_amrex)
         endif()
         set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PARTICLE_PRECISION})
 
-        find_package(AMReX 22.06 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
+        find_package(AMReX 22.07 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS)
         message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
     endif()
 endmacro()
@@ -241,7 +241,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 "027f2ff77fed33a191cfc735d8adaabb42d21743"
+set(WarpX_amrex_branch "cbdc6580ee3d78cccdd37172e4ba077ee181f483"
     CACHE STRING
     "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
 

cmake/dependencies/PICSAR.cmake

@@ -82,7 +82,7 @@ function(find_picsar)
         #message(STATUS "PICSAR: Using version '${PICSAR_VERSION}'")
     else()
         # not supported by PICSAR (yet)
-        #find_package(PICSAR 22.06 CONFIG REQUIRED QED)
+        #find_package(PICSAR 22.07 CONFIG REQUIRED QED)
         #message(STATUS "PICSAR: Found version '${PICSAR_VERSION}'")
         message(FATAL_ERROR "PICSAR: Cannot be used as externally installed "
             "library yet. "
@@ -103,7 +103,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 "2becfe0665590063fdfca10abaa05c4c1bd3ec22"
+    set(WarpX_picsar_branch "4252e567089fce30d2a3a82d78998e8d3d8220c2"
         CACHE STRING
         "Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)")
 

run_test.sh

@@ -71,7 +71,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt
 
 # Clone AMReX and warpx-data
 git clone https://github.com/AMReX-Codes/amrex.git
-cd amrex && git checkout --detach 027f2ff77fed33a191cfc735d8adaabb42d21743 && cd -
+cd amrex && git checkout --detach cbdc6580ee3d78cccdd37172e4ba077ee181f483 && cd -
 # warpx-data contains various required data sets
 git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git
 

setup.py

@@ -272,7 +272,7 @@ def build_extension(self, ext):
 setup(
     name='pywarpx',
     # note PEP-440 syntax: x.y.zaN but x.y.z.devN
-    version = '22.06',
+    version = '22.07',
     packages = ['pywarpx'],
     package_dir = {'pywarpx': 'Python/pywarpx'},
     author='Jean-Luc Vay, David P. Grote, Maxence Thévenet, Rémi Lehe, Andrew Myers, Weiqun Zhang, Axel Huebl, et al.',