Skip to content

Commit 156ab79

Browse files
ax3lax3l
authored
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.
1 parent a6f5470 commit 156ab79

32 files changed

+104
-104
lines changed

‎.github/workflows/macos.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,17 @@ env:
1111

1212
jobs:
1313
appleclang:
14-
name: AppleClang@12.0 w/o MPI
14+
name: AppleClang@14.0 w/o MPI
1515
runs-on: macos-latest
1616
if: github.event.pull_request.draft == false
1717
steps:
18-
- uses: actions/checkout@v2
18+
- uses: actions/checkout@v3
1919
- name: Dependencies
2020
run: .github/workflows/dependencies/dependencies_mac.sh
2121
- name: Build & Install
2222
run: |
2323
python3 -m pip install -U pip setuptools wheel pytest
24-
python3 -m pip install -U cmake==3.23.3
24+
python3 -m pip install -U cmake
2525
python3 -m pip install -v .
2626
python3 -c "import amrex; print(amrex.__version__)"
2727
- name: Unit tests

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# Preamble ####################################################################
22
#
33
cmake_minimum_required(VERSION 3.20.0)
4-
project(pyAMReX VERSION 22.12)
4+
project(pyAMReX VERSION 23.01)
55

66
include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake)
77

‎cmake/dependencies/AMReX.cmake‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON)
8282
set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
8383
CACHE STRING
8484
"Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)")
85-
set(pyAMReX_amrex_branch "22.12"
85+
set(pyAMReX_amrex_branch "23.01"
8686
CACHE STRING
8787
"Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")
8888

‎setup.py‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python3
22
#
3-
# Copyright 2021-2022 The AMReX Community
3+
# Copyright 2021-2023 The AMReX Community
44
#
55
# Authors: Axel Huebl
66
# License: BSD-3-Clause-LBNL
@@ -185,7 +185,7 @@ def build_extension(self, ext):
185185
AMReX_src = os.environ.get("AMREX_SRC")
186186
AMReX_internal = os.environ.get("AMREX_INTERNAL", "ON")
187187
AMReX_repo = os.environ.get("AMREX_REPO", "https://github.com/AMReX-Codes/amrex.git")
188-
AMReX_branch = os.environ.get("AMREX_BRANCH", "22.12")
188+
AMReX_branch = os.environ.get("AMREX_BRANCH", "23.01")
189189
pybind11_internal = os.environ.get("PYBIND11_INTERNAL", "ON")
190190

191191
# https://cmake.org/cmake/help/v3.0/command/if.html
@@ -220,16 +220,16 @@ def build_extension(self, ext):
220220
setup(
221221
name="amrex",
222222
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
223-
version="22.12",
223+
version="23.01",
224224
packages=["amrex"],
225225
# Python sources:
226226
package_dir={"": "src"},
227227
# pyAMReX authors:
228-
author="Axel Huebl, Shreyas Ananthan, Steven R. Brandt, Andrew Myers, Weiqun Zhang, et al.",
229-
author_email="[email protected], [email protected], [email protected], atmyers@lbl.gov, [email protected]",
228+
author="Axel Huebl, Ryan Sandberg, Shreyas Ananthan, Remi Lehe, Weiqun Zhang, et al.",
229+
author_email="[email protected], [email protected], [email protected], rlehe@lbl.gov, [email protected]",
230230
# wheel/pypi packages:
231-
maintainer="Axel Huebl, Shreyas Ananthan, Steven R. Brandt, Andrew Myers",
232-
maintainer_email="[email protected], [email protected], [email protected], [email protected]",
231+
maintainer="Axel Huebl",
232+
maintainer_email="[email protected]",
233233
description="AMReX: Software Framework for Block Structured AMR",
234234
long_description=long_description,
235235
long_description_content_type="text/markdown",

‎src/AmrCore/AmrMesh.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Authors: Axel Huebl
44
* License: BSD-3-Clause-LBNL
55
*/
6-
#include <pybind11/pybind11.h>
7-
#include <pybind11/stl.h>
8-
96
#include <AMReX_Config.H>
107
#include <AMReX_AmrMesh.H>
118

9+
#include <pybind11/pybind11.h>
10+
#include <pybind11/stl.h>
11+
1212
#include <sstream>
1313

1414
namespace py = pybind11;

‎src/Base/AMReX.cpp‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
#include <pybind11/pybind11.h>
2-
#include <pybind11/stl.h>
3-
41
#include <AMReX_Config.H>
52
#include <AMReX.H>
63
#include <AMReX_Vector.H>
74
#include <AMReX_ParmParse.H>
85

6+
#include <pybind11/pybind11.h>
7+
#include <pybind11/stl.h>
8+
99
#include <string>
1010

1111
namespace py = pybind11;

‎src/Base/Arena.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33
* Authors: Axel Huebl
44
* License: BSD-3-Clause-LBNL
55
*/
6+
#include <AMReX_Arena.H>
7+
68
#include <pybind11/pybind11.h>
79
#include <pybind11/numpy.h>
810
#include <pybind11/stl.h>
911

10-
#include <AMReX_Arena.H>
11-
1212
namespace py = pybind11;
1313
using namespace amrex;
1414

‎src/Base/Array4.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
* Authors: Axel Huebl
44
* License: BSD-3-Clause-LBNL
55
*/
6-
#include <pybind11/pybind11.h>
7-
#include <pybind11/numpy.h>
8-
#include <pybind11/stl.h>
9-
106
#include <AMReX_Array4.H>
117
#include <AMReX_BLassert.H>
128
#include <AMReX_IntVect.H>
139

10+
#include <pybind11/pybind11.h>
11+
#include <pybind11/numpy.h>
12+
#include <pybind11/stl.h>
13+
1414
#include <cstdint>
1515
#include <sstream>
1616
#include <type_traits>

‎src/Base/BaseFab.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,11 @@
33
* Authors: Axel Huebl
44
* License: BSD-3-Clause-LBNL
55
*/
6+
#include <AMReX_FArrayBox.H>
7+
68
#include <pybind11/pybind11.h>
79
#include <pybind11/stl.h>
810

9-
#include <AMReX_FArrayBox.H>
10-
1111
#include <istream>
1212

1313
namespace py = pybind11;

‎src/Base/Box.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
* Authors: Axel Huebl
44
* License: BSD-3-Clause-LBNL
55
*/
6-
#include <pybind11/pybind11.h>
7-
#include <pybind11/operators.h>
8-
#include <pybind11/stl.h>
9-
106
#include <AMReX_Config.H>
117
#include <AMReX_Box.H>
128
#include <AMReX_IntVect.H>
139

10+
#include <pybind11/pybind11.h>
11+
#include <pybind11/operators.h>
12+
#include <pybind11/stl.h>
13+
1414
#include <sstream>
1515
#include <optional>
1616

0 commit comments

Comments
 (0)