From 156ab79a6d27dce99e9cc8c919189263bd7978b2 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Tue, 3 Jan 2023 11:23:48 +0100 Subject: [PATCH] Release: 23.01 (#100) * Release: 23.01 * Update Authors * Update macOS CI * Include Order: AMReX, pybind11, stdlib Avoid dragging CPython includes & defines into AMReX headers, e.g., that would control `` includes. --- .github/workflows/macos.yml | 6 +++--- CMakeLists.txt | 2 +- cmake/dependencies/AMReX.cmake | 2 +- setup.py | 14 +++++++------- src/AmrCore/AmrMesh.cpp | 6 +++--- src/Base/AMReX.cpp | 6 +++--- src/Base/Arena.cpp | 4 ++-- src/Base/Array4.cpp | 8 ++++---- src/Base/BaseFab.cpp | 4 ++-- src/Base/Box.cpp | 8 ++++---- src/Base/BoxArray.cpp | 6 +++--- src/Base/CoordSys.cpp | 6 +++--- src/Base/Dim3.cpp | 6 +++--- src/Base/DistributionMapping.cpp | 6 +++--- src/Base/FArrayBox.cpp | 4 ++-- src/Base/Geometry.cpp | 8 ++++---- src/Base/IntVect.cpp | 8 ++++---- src/Base/Iterator.H | 6 +++--- src/Base/MultiFab.cpp | 6 +++--- src/Base/PODVector.cpp | 6 +++--- src/Base/ParallelDescriptor.cpp | 6 +++--- src/Base/ParmParse.cpp | 8 ++++---- src/Base/Periodicity.cpp | 8 ++++---- src/Base/RealBox.cpp | 8 ++++---- src/Base/RealVect.cpp | 8 ++++---- src/Base/Vector.cpp | 6 +++--- src/Particle/ArrayOfStructs.cpp | 6 +++--- src/Particle/Particle.cpp | 8 ++++---- src/Particle/ParticleContainer.cpp | 6 +++--- src/Particle/ParticleTile.cpp | 6 +++--- src/Particle/StructOfArrays.cpp | 6 +++--- src/pyAMReX.cpp | 10 +++++----- 32 files changed, 104 insertions(+), 104 deletions(-) diff --git a/.github/workflows/macos.yml b/.github/workflows/macos.yml index ca863266..aa0829c1 100644 --- a/.github/workflows/macos.yml +++ b/.github/workflows/macos.yml @@ -11,17 +11,17 @@ env: jobs: appleclang: - name: AppleClang@12.0 w/o MPI + name: AppleClang@14.0 w/o MPI runs-on: macos-latest if: github.event.pull_request.draft == false steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v3 - name: Dependencies run: .github/workflows/dependencies/dependencies_mac.sh - name: Build & Install run: | python3 -m pip install -U pip setuptools wheel pytest - python3 -m pip install -U cmake==3.23.3 + python3 -m pip install -U cmake python3 -m pip install -v . python3 -c "import amrex; print(amrex.__version__)" - name: Unit tests diff --git a/CMakeLists.txt b/CMakeLists.txt index 733c1c18..0d75c552 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.20.0) -project(pyAMReX VERSION 22.12) +project(pyAMReX VERSION 23.01) include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 66736b57..39609caa 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -82,7 +82,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON) set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)") -set(pyAMReX_amrex_branch "22.12" +set(pyAMReX_amrex_branch "23.01" CACHE STRING "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)") diff --git a/setup.py b/setup.py index 4c434852..8e6cc70e 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,6 @@ #!/usr/bin/env python3 # -# Copyright 2021-2022 The AMReX Community +# Copyright 2021-2023 The AMReX Community # # Authors: Axel Huebl # License: BSD-3-Clause-LBNL @@ -185,7 +185,7 @@ def build_extension(self, ext): AMReX_src = os.environ.get("AMREX_SRC") AMReX_internal = os.environ.get("AMREX_INTERNAL", "ON") AMReX_repo = os.environ.get("AMREX_REPO", "https://github.com/AMReX-Codes/amrex.git") -AMReX_branch = os.environ.get("AMREX_BRANCH", "22.12") +AMReX_branch = os.environ.get("AMREX_BRANCH", "23.01") pybind11_internal = os.environ.get("PYBIND11_INTERNAL", "ON") # https://cmake.org/cmake/help/v3.0/command/if.html @@ -220,16 +220,16 @@ def build_extension(self, ext): setup( name="amrex", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="22.12", + version="23.01", packages=["amrex"], # Python sources: package_dir={"": "src"}, # pyAMReX authors: - author="Axel Huebl, Shreyas Ananthan, Steven R. Brandt, Andrew Myers, Weiqun Zhang, et al.", - author_email="axelhuebl@lbl.gov, shreyas.ananthan@nrel.gov, sbrandt@cct.lsu.edu, atmyers@lbl.gov, weiqunzhang@lbl.gov", + author="Axel Huebl, Ryan Sandberg, Shreyas Ananthan, Remi Lehe, Weiqun Zhang, et al.", + author_email="axelhuebl@lbl.gov, rsandberg@lbl.gov, shreyas.ananthan@nrel.gov, rlehe@lbl.gov, weiqunzhang@lbl.gov", # wheel/pypi packages: - maintainer="Axel Huebl, Shreyas Ananthan, Steven R. Brandt, Andrew Myers", - maintainer_email="axelhuebl@lbl.gov, shreyas.ananthan@nrel.gov, sbrandt@cct.lsu.edu, atmyers@lbl.gov", + maintainer="Axel Huebl", + maintainer_email="axelhuebl@lbl.gov", description="AMReX: Software Framework for Block Structured AMR", long_description=long_description, long_description_content_type="text/markdown", diff --git a/src/AmrCore/AmrMesh.cpp b/src/AmrCore/AmrMesh.cpp index 2fa07ef1..a49010cb 100644 --- a/src/AmrCore/AmrMesh.cpp +++ b/src/AmrCore/AmrMesh.cpp @@ -3,12 +3,12 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include - #include #include +#include +#include + #include namespace py = pybind11; diff --git a/src/Base/AMReX.cpp b/src/Base/AMReX.cpp index c1107682..51146411 100644 --- a/src/Base/AMReX.cpp +++ b/src/Base/AMReX.cpp @@ -1,11 +1,11 @@ -#include -#include - #include #include #include #include +#include +#include + #include namespace py = pybind11; diff --git a/src/Base/Arena.cpp b/src/Base/Arena.cpp index 95f39a4f..cb018179 100644 --- a/src/Base/Arena.cpp +++ b/src/Base/Arena.cpp @@ -3,12 +3,12 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ +#include + #include #include #include -#include - namespace py = pybind11; using namespace amrex; diff --git a/src/Base/Array4.cpp b/src/Base/Array4.cpp index 623af5b7..b014795d 100644 --- a/src/Base/Array4.cpp +++ b/src/Base/Array4.cpp @@ -3,14 +3,14 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include -#include - #include #include #include +#include +#include +#include + #include #include #include diff --git a/src/Base/BaseFab.cpp b/src/Base/BaseFab.cpp index 9b764485..e5d696f6 100644 --- a/src/Base/BaseFab.cpp +++ b/src/Base/BaseFab.cpp @@ -3,11 +3,11 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ +#include + #include #include -#include - #include namespace py = pybind11; diff --git a/src/Base/Box.cpp b/src/Base/Box.cpp index 647f899e..404d8c90 100644 --- a/src/Base/Box.cpp +++ b/src/Base/Box.cpp @@ -3,14 +3,14 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include -#include - #include #include #include +#include +#include +#include + #include #include diff --git a/src/Base/BoxArray.cpp b/src/Base/BoxArray.cpp index 802b6da5..f025b609 100644 --- a/src/Base/BoxArray.cpp +++ b/src/Base/BoxArray.cpp @@ -3,13 +3,13 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include - #include #include #include +#include +#include + #include namespace py = pybind11; diff --git a/src/Base/CoordSys.cpp b/src/Base/CoordSys.cpp index 2e605c9a..689e4fbb 100644 --- a/src/Base/CoordSys.cpp +++ b/src/Base/CoordSys.cpp @@ -1,9 +1,9 @@ -#include -#include - #include #include +#include +#include + #include namespace py = pybind11; diff --git a/src/Base/Dim3.cpp b/src/Base/Dim3.cpp index 2d2d77dc..21381fbc 100644 --- a/src/Base/Dim3.cpp +++ b/src/Base/Dim3.cpp @@ -1,9 +1,9 @@ -#include -#include - #include #include +#include +#include + #include namespace py = pybind11; diff --git a/src/Base/DistributionMapping.cpp b/src/Base/DistributionMapping.cpp index 2a32a55d..c7b536b4 100644 --- a/src/Base/DistributionMapping.cpp +++ b/src/Base/DistributionMapping.cpp @@ -3,14 +3,14 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include - #include #include #include #include +#include +#include + #include namespace py = pybind11; diff --git a/src/Base/FArrayBox.cpp b/src/Base/FArrayBox.cpp index 1d6bd1e7..76590df4 100644 --- a/src/Base/FArrayBox.cpp +++ b/src/Base/FArrayBox.cpp @@ -3,11 +3,11 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ +#include + #include #include -#include - #include #include #include diff --git a/src/Base/Geometry.cpp b/src/Base/Geometry.cpp index e3c39e5f..bab92b77 100644 --- a/src/Base/Geometry.cpp +++ b/src/Base/Geometry.cpp @@ -1,13 +1,13 @@ -#include -// #include -#include - #include #include #include #include #include +#include +// #include +#include + #include #include #include diff --git a/src/Base/IntVect.cpp b/src/Base/IntVect.cpp index ef75dc3d..e3544890 100644 --- a/src/Base/IntVect.cpp +++ b/src/Base/IntVect.cpp @@ -3,14 +3,14 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include -#include - #include #include #include +#include +#include +#include + #include #include #include diff --git a/src/Base/Iterator.H b/src/Base/Iterator.H index f79fb892..61437959 100644 --- a/src/Base/Iterator.H +++ b/src/Base/Iterator.H @@ -3,9 +3,6 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include - #include #include #include @@ -14,6 +11,9 @@ #include #include +#include +#include + #include #include diff --git a/src/Base/MultiFab.cpp b/src/Base/MultiFab.cpp index 9f751fc5..a8ea16ff 100644 --- a/src/Base/MultiFab.cpp +++ b/src/Base/MultiFab.cpp @@ -3,9 +3,6 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include - #include "Base/Iterator.H" #include @@ -16,6 +13,9 @@ #include #include +#include +#include + #include #include diff --git a/src/Base/PODVector.cpp b/src/Base/PODVector.cpp index 376713fb..a8b5a541 100644 --- a/src/Base/PODVector.cpp +++ b/src/Base/PODVector.cpp @@ -3,13 +3,13 @@ * Authors: Ryan Sandberg * License: BSD-3-Clause-LBNL */ +#include +#include + #include #include #include -#include -#include - #include diff --git a/src/Base/ParallelDescriptor.cpp b/src/Base/ParallelDescriptor.cpp index 0131ed35..257941d4 100644 --- a/src/Base/ParallelDescriptor.cpp +++ b/src/Base/ParallelDescriptor.cpp @@ -3,13 +3,13 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ +#include +#include + #include #include #include -#include -#include - #include #include diff --git a/src/Base/ParmParse.cpp b/src/Base/ParmParse.cpp index 125b9788..f3be0871 100644 --- a/src/Base/ParmParse.cpp +++ b/src/Base/ParmParse.cpp @@ -3,15 +3,15 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include -#include - #include #include #include #include +#include +#include +#include + #include #include diff --git a/src/Base/Periodicity.cpp b/src/Base/Periodicity.cpp index b742fa7d..e791185a 100644 --- a/src/Base/Periodicity.cpp +++ b/src/Base/Periodicity.cpp @@ -3,15 +3,15 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include -#include - #include #include #include #include +#include +#include +#include + #include #include diff --git a/src/Base/RealBox.cpp b/src/Base/RealBox.cpp index 2da91fb7..da62ddf3 100644 --- a/src/Base/RealBox.cpp +++ b/src/Base/RealBox.cpp @@ -3,10 +3,6 @@ * Authors: Ryan Sandberg * License: BSD-3-Clause-LBNL */ -#include -#include -#include - #include #include #include @@ -16,6 +12,10 @@ #include #include +#include +#include +#include + #include #include #include diff --git a/src/Base/RealVect.cpp b/src/Base/RealVect.cpp index 3360912b..2cafc9da 100644 --- a/src/Base/RealVect.cpp +++ b/src/Base/RealVect.cpp @@ -3,14 +3,14 @@ * Authors: Ryan Sandberg * License: BSD-3-Clause-LBNL */ -#include -#include -#include - #include #include #include +#include +#include +#include + #include #include #include diff --git a/src/Base/Vector.cpp b/src/Base/Vector.cpp index 1f48e042..900d649b 100644 --- a/src/Base/Vector.cpp +++ b/src/Base/Vector.cpp @@ -3,14 +3,14 @@ * Authors: Ryan Sandberg * License: BSD-3-Clause-LBNL */ +#include +#include + #include #include #include #include -#include -#include - #include #include #include diff --git a/src/Particle/ArrayOfStructs.cpp b/src/Particle/ArrayOfStructs.cpp index 75449031..634c01e3 100644 --- a/src/Particle/ArrayOfStructs.cpp +++ b/src/Particle/ArrayOfStructs.cpp @@ -3,12 +3,12 @@ * Authors: Ryan Sandberg * License: BSD-3-Clause-LBNL */ -#include -#include - #include #include +#include +#include + #include namespace py = pybind11; diff --git a/src/Particle/Particle.cpp b/src/Particle/Particle.cpp index aa742484..9ea4f275 100644 --- a/src/Particle/Particle.cpp +++ b/src/Particle/Particle.cpp @@ -3,16 +3,16 @@ * Authors: Ryan Sandberg * License: BSD-3-Clause-LBNL */ -#include -#include -#include - #include #include #include #include #include +#include +#include +#include + #include #include #include diff --git a/src/Particle/ParticleContainer.cpp b/src/Particle/ParticleContainer.cpp index 1bacb77b..3c59032e 100644 --- a/src/Particle/ParticleContainer.cpp +++ b/src/Particle/ParticleContainer.cpp @@ -3,9 +3,6 @@ * Authors: Ryan Sandberg * License: BSD-3-Clause-LBNL */ -#include -#include - #include "Base/Iterator.H" #include @@ -16,6 +13,9 @@ #include #include +#include +#include + #include #include diff --git a/src/Particle/ParticleTile.cpp b/src/Particle/ParticleTile.cpp index 6bd5bd9e..a08b9064 100644 --- a/src/Particle/ParticleTile.cpp +++ b/src/Particle/ParticleTile.cpp @@ -3,14 +3,14 @@ * Authors: Ryan Sandberg * License: BSD-3-Clause-LBNL */ -#include -#include - #include #include #include #include +#include +#include + #include namespace py = pybind11; diff --git a/src/Particle/StructOfArrays.cpp b/src/Particle/StructOfArrays.cpp index 27eee473..fca90e46 100644 --- a/src/Particle/StructOfArrays.cpp +++ b/src/Particle/StructOfArrays.cpp @@ -3,12 +3,12 @@ * Authors: Ryan Sandberg * License: BSD-3-Clause-LBNL */ -#include -#include - #include #include +#include +#include + #include namespace py = pybind11; diff --git a/src/pyAMReX.cpp b/src/pyAMReX.cpp index 8b862285..0bee2fb2 100644 --- a/src/pyAMReX.cpp +++ b/src/pyAMReX.cpp @@ -3,12 +3,12 @@ * Authors: Axel Huebl * License: BSD-3-Clause-LBNL */ -#include -#include - #include #include +#include +#include + #define STRINGIFY(x) #x #define MACRO_STRINGIFY(x) STRINGIFY(x) @@ -114,8 +114,8 @@ PYBIND11_MODULE(amrex_pybind, m) { // authors m.attr("__author__") = - "Axel Huebl, Shreyas Ananthan, Steven R. Brandt, Andrew Myers, " - "Ryan T. Sandberg, Weiqun Zhang, et al."; + "Axel Huebl, Ryan Sandberg, Shreyas Ananthan, Remi Lehe, " + "Weiqun Zhang, et al."; // API runtime build-time feature variants // m.attr("variants") = amrex::getVariants();