From 51192389944dbad7a6784621bfc1c2ab4aa41e13 Mon Sep 17 00:00:00 2001 From: Remi Lehe Date: Tue, 4 May 2021 08:38:44 -0700 Subject: [PATCH] New release 21.05 (#1931) * Deploy new Azure worker, for the embedded boundary test * Correct missing end of line * Update amrex version * Update PICSAR version * Update WarpX version --- CMakeLists.txt | 2 +- Docs/source/conf.py | 4 ++-- LICENSE.txt | 2 +- Python/setup.py | 2 +- cmake/dependencies/AMReX.cmake | 4 ++-- cmake/dependencies/PICSAR.cmake | 4 ++-- run_test.sh | 4 ++-- setup.py | 2 +- 8 files changed, 12 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index a308ec4a6cf..c91a37a75da 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.15.0) -project(WarpX VERSION 21.04) +project(WarpX VERSION 21.05) include(${WarpX_SOURCE_DIR}/cmake/WarpXFunctions.cmake) diff --git a/Docs/source/conf.py b/Docs/source/conf.py index f4d60c3327a..514ab026a04 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.04' +version = u'21.05' # The full version, including alpha/beta/rc tags. -release = u'21.04' +release = u'21.05' # 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 71b9326546c..6effc6a5bce 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,4 +1,4 @@ -WarpX v21.04 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.05 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 d7ecaa13085..b3f9629eaa3 100644 --- a/Python/setup.py +++ b/Python/setup.py @@ -54,7 +54,7 @@ package_data = {} setup(name = 'pywarpx', - version = '21.04', + version = '21.05', packages = ['pywarpx'], package_dir = {'pywarpx': 'pywarpx'}, description = """Wrapper of WarpX""", diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 70d04c5ef43..e7a5f23fd67 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -178,7 +178,7 @@ macro(find_amrex) endif() set(COMPONENT_PRECISION ${WarpX_PRECISION} P${WarpX_PRECISION}) - find_package(AMReX 21.04 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} TINYP LSOLVERS) + find_package(AMReX 21.05 CONFIG REQUIRED COMPONENTS ${COMPONENT_ASCENT} ${COMPONENT_DIM} ${COMPONENT_EB} PARTICLES ${COMPONENT_PIC} ${COMPONENT_PRECISION} TINYP LSOLVERS) message(STATUS "AMReX: Found version '${AMReX_VERSION}'") endif() endmacro() @@ -192,7 +192,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 "1796dd911bae1ae0b58ae92e4e023bdb00a0f44a" +set(WarpX_amrex_branch "cff96a9f23638819cff688071ff2588d8cfadd63" 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 87e1afe68af..46b5f3e50fa 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.04 CONFIG REQUIRED QED) + #find_package(PICSAR 21.05 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 "3a948c4eb74b5355727b27eb0a7b2a215be69610" + set(WarpX_picsar_branch "c16b642e3dcf860480dd1dd21cefa3874f395773" CACHE STRING "Repository branch for WarpX_picsar_repo if(WarpX_picsar_internal)") diff --git a/run_test.sh b/run_test.sh index 72b680b92e5..62a3f9de7ff 100755 --- a/run_test.sh +++ b/run_test.sh @@ -51,10 +51,10 @@ echo "cd $PWD" # Clone PICSAR and AMReX git clone https://github.com/AMReX-Codes/amrex.git -cd amrex && git checkout 1796dd911bae1ae0b58ae92e4e023bdb00a0f44a && cd - +cd amrex && git checkout cff96a9f23638819cff688071ff2588d8cfadd63 && cd - # Use QED brach for QED tests git clone https://github.com/ECP-WarpX/picsar.git -cd picsar && git checkout 3a948c4eb74b5355727b27eb0a7b2a215be69610 && cd - +cd picsar && git checkout c16b642e3dcf860480dd1dd21cefa3874f395773 && cd - # Clone the AMReX regression test utility git clone https://github.com/ECP-WarpX/regression_testing.git diff --git a/setup.py b/setup.py index 8afc619fc46..6bffea699da 100644 --- a/setup.py +++ b/setup.py @@ -233,7 +233,7 @@ def build_extension(self, ext): setup( name='pywarpx', # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version = '21.04', + version = '21.05', 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.',