From a1da4cb1c93fd21d447bc90cc69e86aa9b2fa5a8 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Fri, 17 Jun 2022 01:22:01 +0700 Subject: [PATCH 1/2] Update AMReX I want to pull in a new feature to ABLASTR for inputs control that just landed in AMReX. Needed for ImpactX. --- .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 e45b7fe0b34..ef8a540ff2a 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 833e61c076a708ae1680eab68713a2d40637085d && cd - + cd amrex && git checkout --detach bf79c456a9a5fe6b22f3ba51b5973cd44b03c244 && 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 9af1b2d94c7..f790d6d2159 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 = 833e61c076a708ae1680eab68713a2d40637085d +branch = bf79c456a9a5fe6b22f3ba51b5973cd44b03c244 [source] dir = /home/regtester/git/WarpX diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 457294fc071..ef3bf201324 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 = 833e61c076a708ae1680eab68713a2d40637085d +branch = bf79c456a9a5fe6b22f3ba51b5973cd44b03c244 [source] dir = /home/regtester/AMReX_RegTesting/warpx diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index ca8b3fd97e4..57dda4c0a5f 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -241,7 +241,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 "833e61c076a708ae1680eab68713a2d40637085d" +set(WarpX_amrex_branch "bf79c456a9a5fe6b22f3ba51b5973cd44b03c244" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") diff --git a/run_test.sh b/run_test.sh index e12abfe20ab..e3d6c3dfdfb 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 833e61c076a708ae1680eab68713a2d40637085d && cd - +cd amrex && git checkout --detach bf79c456a9a5fe6b22f3ba51b5973cd44b03c244 && cd - # warpx-data contains various required data sets git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git From 44637bd417b9d86f51aa734d98e24762ebe89d7b Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Mon, 20 Jun 2022 00:52:41 -0700 Subject: [PATCH 2/2] [Hack] Try Andrew's AMReX PR 2839 --- cmake/dependencies/AMReX.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 57dda4c0a5f..b04c9490c93 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -238,10 +238,10 @@ set(WarpX_amrex_src "" "Local path to AMReX source directory (preferred if set)") # Git fetcher -set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" +set(WarpX_amrex_repo "https://github.com/atmyers/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(WarpX_amrex_internal)") -set(WarpX_amrex_branch "bf79c456a9a5fe6b22f3ba51b5973cd44b03c244" +set(WarpX_amrex_branch "roundoff_float_double" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")