Skip to content

Commit

Permalink
Release: 23.11
Browse files Browse the repository at this point in the history
The November release 🎉
  • Loading branch information
ax3l committed Nov 3, 2023
1 parent ba18b0f commit 091cc95
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 15 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# Preamble ####################################################################
#
cmake_minimum_required(VERSION 3.20.0)
project(pyAMReX VERSION 23.10)
project(pyAMReX VERSION 23.11)

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

Expand Down
4 changes: 2 additions & 2 deletions cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ macro(find_amrex)
elseif(NOT pyAMReX_amrex_internal)
message(STATUS "Searching for pre-installed AMReX ...")
# https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#importing-amrex-into-your-cmake-project
find_package(AMReX 23.10 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
find_package(AMReX 23.11 CONFIG REQUIRED COMPONENTS PARTICLES PIC)
message(STATUS "AMReX: Found version '${AMReX_VERSION}'")
endif()
endmacro()
Expand All @@ -85,7 +85,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 "be6c6415467d09da6109d27cfa218868abc1f9db"
set(pyAMReX_amrex_branch "23.11"
CACHE STRING
"Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")

Expand Down
4 changes: 2 additions & 2 deletions docs/source/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -71,9 +71,9 @@
# built documents.
#
# The short X.Y version.
version = "23.10"
version = "23.11"
# The full version, including alpha/beta/rc tags.
release = "23.10"
release = "23.11"

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ def build_extension(self, ext):
setup(
name="amrex",
# note PEP-440 syntax: x.y.zaN but x.y.z.devN
version="23.10",
version="23.11",
packages=["amrex"],
# Python sources:
package_dir={"": "src"},
Expand Down
2 changes: 1 addition & 1 deletion src/Particle/Particle.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -327,6 +327,6 @@ void init_Particle(py::module& m) {
make_Particle< 3, 2 > (m);
make_Particle< 4, 0 > (m); // HiPACE++ 22.07
make_Particle< 5, 0 > (m); // ImpactX 22.07
make_Particle< 8, 2 > (m); // ImpactX 23.11+
make_Particle< 8, 2 > (m); // ImpactX 23.12+
make_Particle< 37, 1> (m); // HiPACE++ 22.07
}
2 changes: 1 addition & 1 deletion src/Particle/ParticleContainer_ImpactX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@ void init_ParticleContainer_ImpactX(py::module& m) {
// TODO: we might need to move all or most of the defines in here into a
// test/example submodule, so they do not collide with downstream projects
make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0>(m); // ImpactX 22.07 - 23.10
make_ParticleContainer_and_Iterators<SoAParticle<8, 2>, 8, 2>(m); // ImpactX 23.11+
make_ParticleContainer_and_Iterators<SoAParticle<8, 2>, 8, 2>(m); // ImpactX 23.12+
}
4 changes: 2 additions & 2 deletions src/Particle/ParticleContainer_WarpX.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@ void init_ParticleContainer_WarpX(py::module& m) {

// TODO: we might need to move all or most of the defines in here into a
// test/example submodule, so they do not collide with downstream projects
make_ParticleContainer_and_Iterators<Particle<0, 0>, 4, 0>(m); // WarpX 22.07 - 23.10 1D-3D
//make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0> (m); // WarpX 22.07 - 23.10 RZ
make_ParticleContainer_and_Iterators<Particle<0, 0>, 4, 0>(m); // WarpX 22.07 - 23.11 1D-3D
//make_ParticleContainer_and_Iterators<Particle<0, 0>, 5, 0> (m); // WarpX 22.07 - 23.11 RZ
}
2 changes: 1 addition & 1 deletion src/Particle/ParticleTile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -191,6 +191,6 @@ void init_ParticleTile(py::module& m) {
make_ParticleTile<ParticleType_1_1, 2, 1> (m);
make_ParticleTile<ParticleType_0_0, 4, 0> (m); // HiPACE++ 22.07
make_ParticleTile<ParticleType_0_0, 5, 0> (m); // ImpactX 22.07
make_ParticleTile<SoAParticleType_8_2, 8, 2> (m); // ImpactX 23.11+
make_ParticleTile<SoAParticleType_8_2, 8, 2> (m); // ImpactX 23.12+
make_ParticleTile<ParticleType_0_0, 37, 1> (m); // HiPACE++ 22.07
}
8 changes: 4 additions & 4 deletions src/Particle/StructOfArrays.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -89,8 +89,8 @@ void make_StructOfArrays(py::module &m)

void init_StructOfArrays(py::module& m) {
make_StructOfArrays< 2, 1>(m);
make_StructOfArrays< 4, 0>(m); // HiPACE++ 22.08 - 23.10
make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.10
make_StructOfArrays< 8, 2>(m); // ImpactX 23.11+
make_StructOfArrays<37, 1>(m); // HiPACE++ 22.09 - 23.10
make_StructOfArrays< 4, 0>(m); // HiPACE++ 22.08 - 23.11
make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.11
make_StructOfArrays< 8, 2>(m); // ImpactX 23.12+
make_StructOfArrays<37, 1>(m); // HiPACE++ 22.09 - 23.11
}

0 comments on commit 091cc95

Please sign in to comment.