From 794282f15b4fea6a0fd17d733adcbecc16b8efec Mon Sep 17 00:00:00 2001 From: Andrew Myers Date: Tue, 18 Apr 2023 09:05:21 -0700 Subject: [PATCH 1/2] Update for changes to Particle API to support pure SOA --- Source/Diagnostics/ReducedDiags/FieldProbeParticleContainer.cpp | 2 +- Source/Particles/WarpXParticleContainer.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Source/Diagnostics/ReducedDiags/FieldProbeParticleContainer.cpp b/Source/Diagnostics/ReducedDiags/FieldProbeParticleContainer.cpp index b1f20c4e7..edffa8ec7 100644 --- a/Source/Diagnostics/ReducedDiags/FieldProbeParticleContainer.cpp +++ b/Source/Diagnostics/ReducedDiags/FieldProbeParticleContainer.cpp @@ -92,7 +92,7 @@ FieldProbeParticleContainer::AddNParticles (int lev, * (particle_tile). */ - using PinnedTile = ParticleTile, NArrayReal, NArrayInt, amrex::PinnedArenaAllocator>; PinnedTile pinned_tile; pinned_tile.define(NumRuntimeRealComps(), NumRuntimeIntComps()); diff --git a/Source/Particles/WarpXParticleContainer.cpp b/Source/Particles/WarpXParticleContainer.cpp index ca9b99500..9c695759a 100644 --- a/Source/Particles/WarpXParticleContainer.cpp +++ b/Source/Particles/WarpXParticleContainer.cpp @@ -174,7 +174,7 @@ WarpXParticleContainer::AddNParticles (int /*lev*/, // Redistribute() will move them to proper places. auto& particle_tile = DefineAndReturnParticleTile(0, 0, 0); - using PinnedTile = ParticleTile, NArrayReal, NArrayInt, amrex::PinnedArenaAllocator>; PinnedTile pinned_tile; pinned_tile.define(NumRuntimeRealComps(), NumRuntimeIntComps()); From 635dfaa569ad71cd08d76f200209061ce539bf39 Mon Sep 17 00:00:00 2001 From: Andrew Myers Date: Tue, 18 Apr 2023 10:33:44 -0700 Subject: [PATCH 2/2] updating AMReX --- .github/workflows/cuda.yml | 2 +- Regression/WarpX-GPU-tests.ini | 2 +- Regression/WarpX-tests.ini | 2 +- cmake/dependencies/AMReX.cmake | 2 +- run_test.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 13380f469..eaefb362b 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -106,7 +106,7 @@ jobs: which nvcc || echo "nvcc not in PATH!" git clone https://github.com/AMReX-Codes/amrex.git ../amrex - cd amrex && git checkout --detach 843a7dff266273a0f5b7b9f6cc9233a278f41fe1 && cd - + cd amrex && git checkout --detach b0a037918f78a5e9f32988c4b0016093929954e7 && cd - make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_PSATD=TRUE USE_CCACHE=TRUE -j 2 build_nvhpc21-11-nvcc: diff --git a/Regression/WarpX-GPU-tests.ini b/Regression/WarpX-GPU-tests.ini index e8796be40..cf11d93c5 100644 --- a/Regression/WarpX-GPU-tests.ini +++ b/Regression/WarpX-GPU-tests.ini @@ -60,7 +60,7 @@ emailBody = Check https://ccse.lbl.gov/pub/GpuRegressionTesting/WarpX/ for more [AMReX] dir = /home/regtester/git/amrex/ -branch = 843a7dff266273a0f5b7b9f6cc9233a278f41fe1 +branch = b0a037918f78a5e9f32988c4b0016093929954e7 [source] dir = /home/regtester/git/WarpX diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 08c7a2137..c2584cb8c 100644 --- a/Regression/WarpX-tests.ini +++ b/Regression/WarpX-tests.ini @@ -59,7 +59,7 @@ emailBody = Check https://ccse.lbl.gov/pub/RegressionTesting/WarpX/ for more det [AMReX] dir = /home/regtester/AMReX_RegTesting/amrex/ -branch = 843a7dff266273a0f5b7b9f6cc9233a278f41fe1 +branch = b0a037918f78a5e9f32988c4b0016093929954e7 [source] dir = /home/regtester/AMReX_RegTesting/warpx diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 4ac6698d5..a105c201d 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -237,7 +237,7 @@ set(WarpX_amrex_src "" set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)") -set(WarpX_amrex_branch "843a7dff266273a0f5b7b9f6cc9233a278f41fe1" +set(WarpX_amrex_branch "b0a037918f78a5e9f32988c4b0016093929954e7" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") diff --git a/run_test.sh b/run_test.sh index 81a21fb89..7736a0c3d 100755 --- a/run_test.sh +++ b/run_test.sh @@ -71,7 +71,7 @@ python3 -m pip install --upgrade -r warpx/Regression/requirements.txt # Clone AMReX and warpx-data git clone https://github.com/AMReX-Codes/amrex.git -cd amrex && git checkout --detach 843a7dff266273a0f5b7b9f6cc9233a278f41fe1 && cd - +cd amrex && git checkout --detach b0a037918f78a5e9f32988c4b0016093929954e7 && cd - # warpx-data contains various required data sets git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git