From 8839c1863ec30a8ee88837c57fe3bae3c9f0f783 Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 26 Jul 2023 00:24:28 -0700 Subject: [PATCH 1/2] AMReX: Update (Plotfile Write) Update AMReX to latest `development` to include compile fixes for `ParticleTransformation` and plotfile writing. --- .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 a9f4a84b51b..0c03d760bf1 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 0eb494d34427552ac934fa4c1b636503c8ab3a7a && cd - + cd ../amrex && git checkout --detach b75dd9d5279263768c418ce19285f87de37209f9 && 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 9db54f3f2ab..2d8ff1df445 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 = 0eb494d34427552ac934fa4c1b636503c8ab3a7a +branch = b75dd9d5279263768c418ce19285f87de37209f9 [source] dir = /home/regtester/git/WarpX diff --git a/Regression/WarpX-tests.ini b/Regression/WarpX-tests.ini index 8a1951c4d60..150cebd5ad6 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 = 0eb494d34427552ac934fa4c1b636503c8ab3a7a +branch = b75dd9d5279263768c418ce19285f87de37209f9 [source] dir = /home/regtester/AMReX_RegTesting/warpx diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index e827fb58a61..1055147ccac 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -243,7 +243,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 "0eb494d34427552ac934fa4c1b636503c8ab3a7a" +set(WarpX_amrex_branch "b75dd9d5279263768c418ce19285f87de37209f9" CACHE STRING "Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)") diff --git a/run_test.sh b/run_test.sh index 9c89e67c63a..f34f67cb436 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 0eb494d34427552ac934fa4c1b636503c8ab3a7a && cd - +cd amrex && git checkout --detach b75dd9d5279263768c418ce19285f87de37209f9 && 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 From cb2fbc46b5e7553e329376b164dff98583a86e5a Mon Sep 17 00:00:00 2001 From: Axel Huebl Date: Wed, 26 Jul 2023 00:57:10 -0700 Subject: [PATCH 2/2] Azure: Increase timeoutInMinutes 2hrs to 3hrs for uncached builds. Need to check why some of the combinations rebuild currently. --- .azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml index d198916af4e..1806bdb00d1 100644 --- a/.azure-pipelines.yml +++ b/.azure-pipelines.yml @@ -41,7 +41,7 @@ jobs: WARPX_CI_EB: 'TRUE' # default: 60; maximum: 360 - timeoutInMinutes: 120 + timeoutInMinutes: 180 steps: # set up caches: