Skip to content

Commit

Permalink
AMReX: Update to latest development (#232)
Browse files Browse the repository at this point in the history
* AMReX: Update to latest development

Update to latest commit in `development`.

Introduces the new `idcpu` treatment in pure SoA particles:
AMReX-Codes/amrex#3585

* ImpactX 2024: Pure SoA Update

* AMReX: Update to latest development
  • Loading branch information
ax3l authored Dec 12, 2023
1 parent 2b8f2a4 commit d9787b4
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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 "23.12"
set(pyAMReX_amrex_branch "ecaa46d0be4b5c79b8806e48e3469000d8bb7252"
CACHE STRING
"Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)")

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.12+
make_Particle< 8, 0 > (m); // ImpactX 24.01+
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.12
make_ParticleContainer_and_Iterators<SoAParticle<8, 2>, 8, 2>(m); // ImpactX 24.01+
make_ParticleContainer_and_Iterators<SoAParticle<8, 0>, 8, 0>(m); // ImpactX 24.01+
}
4 changes: 2 additions & 2 deletions src/Particle/ParticleTile.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -184,13 +184,13 @@ void init_ParticleTile(py::module& m) {
// AMReX legacy AoS position + id/cpu particle ype
using ParticleType_0_0 = Particle<0, 0>;
using ParticleType_1_1 = Particle<1, 1>;
using SoAParticleType_8_2 = SoAParticle<8, 2>;
using SoAParticleType_8_0 = SoAParticle<8, 0>;

// 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_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.12+
make_ParticleTile<SoAParticleType_8_0, 8, 0> (m); // ImpactX 23.12+
make_ParticleTile<ParticleType_0_0, 37, 1> (m); // HiPACE++ 22.07
}
2 changes: 1 addition & 1 deletion src/Particle/StructOfArrays.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -91,6 +91,6 @@ void init_StructOfArrays(py::module& m) {
make_StructOfArrays< 2, 1>(m);
make_StructOfArrays< 4, 0>(m); // HiPACE++ 22.08 - 23.12
make_StructOfArrays< 5, 0>(m); // ImpactX 22.07 - 23.12
make_StructOfArrays< 8, 2>(m); // ImpactX 24.01+
make_StructOfArrays< 8, 0>(m); // ImpactX 24.01+
make_StructOfArrays<37, 1>(m); // HiPACE++ 22.09 - 23.12
}

0 comments on commit d9787b4

Please sign in to comment.