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 `<cmath>` includes.
AMReX-Codes · Jan 3, 2023 · 156ab79 · 156ab79
1 parent a6f5470
commit 156ab79
Show file tree

Hide file tree

Showing 32 changed files with 104 additions and 104 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -3,12 +3,12 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_AmrMesh.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
 #include <sstream>
 
 namespace py = pybind11;

diff --git a/src/Base/AMReX.cpp b/src/Base/AMReX.cpp
@@ -1,11 +1,11 @@
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX.H>
 #include <AMReX_Vector.H>
 #include <AMReX_ParmParse.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
 #include <string>
 
 namespace py = pybind11;

diff --git a/src/Base/Arena.cpp b/src/Base/Arena.cpp
@@ -3,12 +3,12 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
+#include <AMReX_Arena.H>
+
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
 #include <pybind11/stl.h>
 
-#include <AMReX_Arena.H>
-
 namespace py = pybind11;
 using namespace amrex;
 

diff --git a/src/Base/Array4.cpp b/src/Base/Array4.cpp
@@ -3,14 +3,14 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/numpy.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Array4.H>
 #include <AMReX_BLassert.H>
 #include <AMReX_IntVect.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/numpy.h>
+#include <pybind11/stl.h>
+
 #include <cstdint>
 #include <sstream>
 #include <type_traits>

diff --git a/src/Base/BaseFab.cpp b/src/Base/BaseFab.cpp
@@ -3,11 +3,11 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
+#include <AMReX_FArrayBox.H>
+
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include <AMReX_FArrayBox.H>
-
 #include <istream>
 
 namespace py = pybind11;

diff --git a/src/Base/Box.cpp b/src/Base/Box.cpp
@@ -3,14 +3,14 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/operators.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_Box.H>
 #include <AMReX_IntVect.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/operators.h>
+#include <pybind11/stl.h>
+
 #include <sstream>
 #include <optional>
 

diff --git a/src/Base/BoxArray.cpp b/src/Base/BoxArray.cpp
@@ -3,13 +3,13 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_IntVect.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
 #include <sstream>
 
 namespace py = pybind11;

diff --git a/src/Base/CoordSys.cpp b/src/Base/CoordSys.cpp
@@ -1,9 +1,9 @@
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_CoordSys.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
 #include <sstream>
 
 namespace py = pybind11;

diff --git a/src/Base/Dim3.cpp b/src/Base/Dim3.cpp
@@ -1,9 +1,9 @@
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_Dim3.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
 #include <sstream>
 
 namespace py = pybind11;

diff --git a/src/Base/DistributionMapping.cpp b/src/Base/DistributionMapping.cpp
@@ -3,14 +3,14 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_DistributionMapping.H>
 #include <AMReX_Vector.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
 #include <sstream>
 
 namespace py = pybind11;

diff --git a/src/Base/FArrayBox.cpp b/src/Base/FArrayBox.cpp
@@ -3,11 +3,11 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
+#include <AMReX_FArrayBox.H>
+
 #include <pybind11/pybind11.h>
 #include <pybind11/stl.h>
 
-#include <AMReX_FArrayBox.H>
-
 #include <istream>
 #include <ostream>
 #include <string>

diff --git a/src/Base/Geometry.cpp b/src/Base/Geometry.cpp
@@ -1,13 +1,13 @@
-#include <pybind11/pybind11.h>
-// #include <pybind11/operators.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_Geometry.H>
 #include <AMReX_CoordSys.H>
 #include <AMReX_MultiFab.H>
 #include <AMReX_Periodicity.H>
 
+#include <pybind11/pybind11.h>
+// #include <pybind11/operators.h>
+#include <pybind11/stl.h>
+
 #include <sstream>
 #include <string>
 #include <stdexcept>

diff --git a/src/Base/IntVect.cpp b/src/Base/IntVect.cpp
@@ -3,14 +3,14 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-#include <pybind11/numpy.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_Dim3.H>
 #include <AMReX_IntVect.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+#include <pybind11/numpy.h>
+
 #include <array>
 #include <sstream>
 #include <string>

diff --git a/src/Base/Iterator.H b/src/Base/Iterator.H
@@ -3,9 +3,6 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_BoxArray.H>
 #include <AMReX_DistributionMapping.H>
@@ -14,6 +11,9 @@
 #include <AMReX_FabArrayBase.H>
 #include <AMReX_MultiFab.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
 #include <memory>
 #include <string>
 

diff --git a/src/Base/MultiFab.cpp b/src/Base/MultiFab.cpp
@@ -3,9 +3,6 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/stl.h>
-
 #include "Base/Iterator.H"
 
 #include <AMReX_Config.H>
@@ -16,6 +13,9 @@
 #include <AMReX_FabArrayBase.H>
 #include <AMReX_MultiFab.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/stl.h>
+
 #include <memory>
 #include <string>
 

diff --git a/src/Base/PODVector.cpp b/src/Base/PODVector.cpp
@@ -3,13 +3,13 @@
  * Authors: Ryan Sandberg
  * License: BSD-3-Clause-LBNL
  */
+#include <AMReX_Config.H>
+#include <AMReX_PODVector.H>
+
 #include <pybind11/pybind11.h>
 #include <pybind11/numpy.h>
 #include <pybind11/stl.h>
 
-#include <AMReX_Config.H>
-#include <AMReX_PODVector.H>
-
 #include <sstream>
 
 

diff --git a/src/Base/ParallelDescriptor.cpp b/src/Base/ParallelDescriptor.cpp
@@ -3,13 +3,13 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
+#include <AMReX_Config.H>
+#include <AMReX_ParallelDescriptor.H>
+
 #include <pybind11/pybind11.h>
 #include <pybind11/operators.h>
 #include <pybind11/stl.h>
 
-#include <AMReX_Config.H>
-#include <AMReX_ParallelDescriptor.H>
-
 #include <sstream>
 #include <optional>
 

diff --git a/src/Base/ParmParse.cpp b/src/Base/ParmParse.cpp
@@ -3,15 +3,15 @@
  * Authors: Axel Huebl
  * License: BSD-3-Clause-LBNL
  */
-#include <pybind11/pybind11.h>
-#include <pybind11/operators.h>
-#include <pybind11/stl.h>
-
 #include <AMReX_Config.H>
 #include <AMReX_Box.H>
 #include <AMReX_IntVect.H>
 #include <AMReX_ParmParse.H>
 
+#include <pybind11/pybind11.h>
+#include <pybind11/operators.h>
+#include <pybind11/stl.h>
+
 #include <string>
 #include <vector>