Skip to content

Commit 04b0cb1

Browse files
authored
AMReX/pyAMReX/PICSAR: Weekly Update (#5680)
Weekly update to latest AMReX. Weekly update to latest pyAMReX (no changes). Weekly update to latest PICSAR (no changes). ```console ./Tools/Release/updateAMReX.py ./Tools/Release/updatepyAMReX.py ./Tools/Release/updatePICSAR.py ``` This pulls in AMReX-Codes/amrex#4337, fixing regressions from #5669 (GPU segfaults on particle redistribute) Signed-off-by: Axel Huebl <axel.huebl@plasma.ninja>
1 parent 2168472 commit 04b0cb1

File tree

3 files changed

+8
-12
lines changed

3 files changed

+8
-12
lines changed

.azure-pipelines.yml

+6-10
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,6 @@ jobs:
6666
cacheHitVar: CCACHE_CACHE_RESTORED
6767
displayName: Cache Ccache Objects
6868

69-
- task: Cache@2
70-
continueOnError: true
71-
inputs:
72-
key: 'Python3 | "$(System.JobName)" | .azure-pipelines.yml'
73-
restoreKeys: |
74-
Python3 | "$(System.JobName)" | .azure-pipelines.yml
75-
path: /home/vsts/.local/lib/python3.8
76-
cacheHitVar: PYTHON38_CACHE_RESTORED
77-
displayName: Cache Python Libraries
78-
7969
- bash: |
8070
set -o nounset errexit pipefail
8171
cat /proc/cpuinfo | grep "model name" | sort -u
@@ -176,3 +166,9 @@ jobs:
176166
-exec cat {} \;
177167
displayName: 'Logs'
178168
condition: always()
169+
170+
- bash: |
171+
# clean out so the Post-job Cache "tar" command has more disk space available
172+
rm -rf build
173+
displayName: 'Clean Build Directory'
174+
condition: always()

.github/workflows/cuda.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -127,7 +127,7 @@ jobs:
127127
which nvcc || echo "nvcc not in PATH!"
128128
129129
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
130-
cd ../amrex && git checkout --detach 275f55f25fec350dfedb54f75a19200b52ced93f && cd -
130+
cd ../amrex && git checkout --detach b364becad939a490bca4e7f8b23f7392c558a311 && cd -
131131
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4
132132
133133
ccache -s

cmake/dependencies/AMReX.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -294,7 +294,7 @@ set(WarpX_amrex_src ""
294294
set(WarpX_amrex_repo "https://github.com/AMReX-Codes/amrex.git"
295295
CACHE STRING
296296
"Repository URI to pull and build AMReX from if(WarpX_amrex_internal)")
297-
set(WarpX_amrex_branch "275f55f25fec350dfedb54f75a19200b52ced93f"
297+
set(WarpX_amrex_branch "b364becad939a490bca4e7f8b23f7392c558a311"
298298
CACHE STRING
299299
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
300300

0 commit comments

Comments
 (0)