From af19382c715782593e4cc985a25f94ed4692d50a Mon Sep 17 00:00:00 2001 From: Dave Grote Date: Wed, 15 Nov 2023 09:36:28 -0800 Subject: [PATCH] Update AMReX to latest commit --- .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 6b810e1cbb0..2bad793571e 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -108,7 +108,7 @@ jobs: which nvcc || echo "nvcc not in PATH!" git clone https://github.com/AMReX-Codes/amrex.git ../amrex - cd ../amrex && git checkout --detach d36463103daed09a40cdea235041a6ab79ff280c && cd - + cd ../amrex && git checkout --detach 15a0bb9a8c1b34136632b16c5511375e9d56b184 && 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 c9ddc4e377d..5184106415c 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 = d36463103daed09a40cdea235041a6ab79ff280c +branch = 15a0bb9a8c1b34136632b16c5511375e9d56b184 [source] dir = /home/regtester/git/WarpX diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 1dd8ac3366d..d913684ae7c 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 = d36463103daed09a40cdea235041a6ab79ff280c +branch = 15a0bb9a8c1b34136632b16c5511375e9d56b184 [source] dir = /home/regtester/AMReX_RegTesting/warpx diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 488310b7cc2..0a108a1b36d 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -269,7 +269,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 "d36463103daed09a40cdea235041a6ab79ff280c" +set(WarpX_amrex_branch "15a0bb9a8c1b34136632b16c5511375e9d56b184" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") diff --git a/run_test.sh b/run_test.sh index e6ab5b166ca..d861dfb9cd4 100755 --- a/run_test.sh +++ b/run_test.sh @@ -68,7 +68,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 d36463103daed09a40cdea235041a6ab79ff280c && cd - +cd amrex && git checkout --detach 15a0bb9a8c1b34136632b16c5511375e9d56b184 && cd - # warpx-data contains various required data sets git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git # openPMD-example-datasets contains various required data sets