diff options
| author |  Axel Huebl <axel.huebl@plasma.ninja>
| 2022-12-22 23:15:19 +0100 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2022-12-22 22:15:19 +0000 |
| commit | def83e6e157ad1fb7fbb7580e11a096f7eb7b24e (patch) | |
| tree | 97fb6194717e88ca5b1d5fdd9fb516d0b2b01fca | |
| parent | 850a07d586ef82530066a54dd766622469b03849 (diff) | |
| download | WarpX-def83e6e157ad1fb7fbb7580e11a096f7eb7b24e.tar.gz WarpX-def83e6e157ad1fb7fbb7580e11a096f7eb7b24e.tar.zst WarpX-def83e6e157ad1fb7fbb7580e11a096f7eb7b24e.zip | |
Update AMReX (GCC 7.5 & Ascent) (#3592)
| -rw-r--r-- | .github/workflows/cuda.yml | 2 | ||||
| -rw-r--r-- | Regression/WarpX-GPU-tests.ini | 2 | ||||
| -rw-r--r-- | Regression/WarpX-tests.ini | 2 | ||||
| -rw-r--r-- | cmake/dependencies/AMReX.cmake | 2 | ||||
| -rwxr-xr-x | run_test.sh | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index 5b2a12b06..99128d88f 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -110,7 +110,7 @@ jobs: which nvcc || echo "nvcc not in PATH!" git clone https://github.com/AMReX-Codes/amrex.git ../amrex - cd amrex && git checkout --detach 2a8c71b8bf42bbc376b049aae828c4a2dfd8363b && cd - + cd amrex && git checkout --detach c03306944aafdf9ee21c896fcfcab6cf7a5e4ad3 && 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 e3b335bfc..148ac9c24 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 = 2a8c71b8bf42bbc376b049aae828c4a2dfd8363b +branch = c03306944aafdf9ee21c896fcfcab6cf7a5e4ad3 [source] dir = /home/regtester/git/WarpX diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index fab984763..954cfe22a 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 = 2a8c71b8bf42bbc376b049aae828c4a2dfd8363b +branch = c03306944aafdf9ee21c896fcfcab6cf7a5e4ad3 [source] dir = /home/regtester/AMReX_RegTesting/warpx diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index e96ae0ec4..af5bcc949 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -240,7 +240,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 "2a8c71b8bf42bbc376b049aae828c4a2dfd8363b" +set(WarpX_amrex_branch "c03306944aafdf9ee21c896fcfcab6cf7a5e4ad3" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") diff --git a/run_test.sh b/run_test.sh index e3cab0197..e60e2e09f 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 2a8c71b8bf42bbc376b049aae828c4a2dfd8363b && cd - +cd amrex && git checkout --detach c03306944aafdf9ee21c896fcfcab6cf7a5e4ad3 && cd - # warpx-data contains various required data sets git clone --depth 1 https://github.com/ECP-WarpX/warpx-data.git |