From 0e809732a2ef032801ee9a64b5266edcd75a0213 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 1 Dec 2021 19:15:39 -0800 Subject: [PATCH] Release 21.12 (#2614) * AMReX: 21.12 * PICSAR: 21.12 * WarpX: 21.12 --- CMakeLists.txt | 2 +- Docs/source/conf.py | 4 ++-- LICENSE.txt | 2 +- Python/setup.py | 2 +- Regression/WarpX-GPU-tests.ini | 4 ++-- Regression/WarpX-tests.ini | 4 ++-- cmake/dependencies/AMReX.cmake | 4 ++-- cmake/dependencies/PICSAR.cmake | 4 ++-- run_test.sh | 4 ++-- setup.py | 2 +- 10 files changed, 16 insertions(+), 16 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 907befd01eb..04092ba962d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.15.0) -project(WarpX VERSION 21.11) +project(WarpX VERSION 21.12) include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake) diff --git a/Docs/source/conf.py b/Docs/source/conf.py index a91dbb23477..eab022751b4 100644 --- a/Docs/source/conf.py +++ b/Docs/source/conf.py @@ -66,9 +66,9 @@ # built documents. # # The short X.Y version. -version = u'21.11' +version = u'21.12' # The full version, including alpha/beta/rc tags. -release = u'21.11' +release = u'21.12' # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/LICENSE.txt b/LICENSE.txt index d29eb6ea2c4..3f7c16fb87e 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -WarpX v21.11 Copyright (c) 2018-2021, 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 v21.12 Copyright (c) 2018-2021, 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: diff --git a/Python/setup.py b/Python/setup.py index 8142a59e653..a15585f834d 100644 --- a/Python/setup.py +++ b/Python/setup.py @@ -54,7 +54,7 @@ package_data = {} setup(name = 'pywarpx', - version = '21.11', + version = '21.12', packages = ['pywarpx'], package_dir = {'pywarpx': 'pywarpx'}, description = """Wrapper of WarpX""", diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini index ae9179ad68d..15036db14ef 100644 --- a/Regression/WarpX-GPU-tests.ini +++ b/Regression/WarpX-GPU-tests.ini @@ -48,7 +48,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more [AMReX] dir = /home/regtester/git/amrex/ -branch = 1d50bfc1c1da79614c853f9823efdf33f9003cc5 +branch = 21.12 [source] dir = /home/regtester/git/WarpX @@ -56,7 +56,7 @@ branch = development [extra-PICSAR] dir = /home/regtester/git/picsar/ -branch = 8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef +branch = 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15 # individual problems follow diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 3abb44c864c..eaf92e3bd8f 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -48,7 +48,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det [AMReX] dir = /home/regtester/AMReX_RegTesting/amrex/ -branch = 1d50bfc1c1da79614c853f9823efdf33f9003cc5 +branch = 21.12 [source] dir = /home/regtester/AMReX_RegTesting/warpx @@ -56,7 +56,7 @@ branch = development [extra-PICSAR] dir = /home/regtester/AMReX_RegTesting/picsar/ -branch = 8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef +branch = 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15 # individual problems follow diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 4c01620140b..0e3f1d46855 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -225,7 +225,7 @@ macro(find_amrex) endif() set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PRECISION}) - find_package(AMReX 21.11 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} ${COMPONENT_SENSEI} TINYP LSOLVERS) + find_package(AMReX 21.12 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() @@ -239,7 +239,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 "1d50bfc1c1da79614c853f9823efdf33f9003cc5" +set(WarpX_amrex_branch "21.12" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") diff --git a/cmake/dependencies/PICSAR.cmake b/cmake/dependencies/PICSAR.cmake index 9402deb6401..e2f6bdb0bb9 100644 --- a/cmake/dependencies/PICSAR.cmake +++ b/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 21.11 CONFIG REQUIRED QED) + #find_package(PICSAR 21.12 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 "8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef" + set(WarpX_picsar_branch "7b5449f92a4b30a095cc4a67f0a8b1fc69680e15" CACHE STRING "Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)") diff --git a/run_test.sh b/run_test.sh index 7ff758dd9ab..724bdc83c67 100755 --- a/run_test.sh +++ b/run_test.sh @@ -51,10 +51,10 @@ echo "cd $PWD" # Clone PICSAR, AMReX and warpx-data git clone https://github.com/AMReX-Codes/amrex.git -cd amrex && git checkout --detach 1d50bfc1c1da79614c853f9823efdf33f9003cc5 && cd - +cd amrex && git checkout --detach 21.12 && cd - # Use QED brach for QED tests git clone https://github.com/ECP-WarpX/picsar.git -cd picsar && git checkout --detach 8ff12fbf118b9aba7cfe602cb1a5e6da32bf7eef && cd - +cd picsar && git checkout --detach 7b5449f92a4b30a095cc4a67f0a8b1fc69680e15 && cd - # warpx-data contains various required data sets git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git diff --git a/setup.py b/setup.py index 2693c3c40ed..25e5d6b225f 100644 --- a/setup.py +++ b/setup.py @@ -253,7 +253,7 @@ def build_extension(self, ext): setup( name='pywarpx', # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version = '21.11', + version = '21.12', 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.',