Skip to content

Commit

Permalink
AMReX/pyAMReX/PICSAR: Weekly Update (#5680)
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
ax3l authored Feb 19, 2025
1 parent 2168472 commit 04b0cb1
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 12 deletions.
16 changes: 6 additions & 10 deletions .azure-pipelines.yml
Original file line number Diff line number Diff line change
Expand Up @@ -66,16 +66,6 @@ jobs:
cacheHitVar: CCACHE_CACHE_RESTORED
displayName: Cache Ccache Objects

- task: Cache@2
continueOnError: true
inputs:
key: 'Python3 | "$(System.JobName)" | .azure-pipelines.yml'
restoreKeys: |
Python3 | "$(System.JobName)" | .azure-pipelines.yml
path: /home/vsts/.local/lib/python3.8
cacheHitVar: PYTHON38_CACHE_RESTORED
displayName: Cache Python Libraries

- bash: |
set -o nounset errexit pipefail
cat /proc/cpuinfo | grep "model name" | sort -u
Expand Down Expand Up @@ -176,3 +166,9 @@ jobs:
-exec cat {} \;
displayName: 'Logs'
condition: always()
- bash: |
# clean out so the Post-job Cache "tar" command has more disk space available
rm -rf build
displayName: 'Clean Build Directory'
condition: always()
2 changes: 1 addition & 1 deletion .github/workflows/cuda.yml
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ jobs:
which nvcc || echo "nvcc not in PATH!"
git clone https://github.com/AMReX-Codes/amrex.git ../amrex
cd ../amrex && git checkout --detach 275f55f25fec350dfedb54f75a19200b52ced93f && cd -
cd ../amrex && git checkout --detach b364becad939a490bca4e7f8b23f7392c558a311 && cd -
make COMP=gcc QED=FALSE USE_MPI=TRUE USE_GPU=TRUE USE_OMP=FALSE USE_FFT=TRUE USE_CCACHE=TRUE -j 4
ccache -s
Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies/AMReX.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,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 "275f55f25fec350dfedb54f75a19200b52ced93f"
set(WarpX_amrex_branch "b364becad939a490bca4e7f8b23f7392c558a311"
CACHE STRING
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")

Expand Down

0 comments on commit 04b0cb1

Please sign in to comment.