Skip to content

Commit 6b2ca8b

Browse files
authored
AMReX/pyAMReX/PICSAR: weekly update (#5512)
- Weekly update to latest AMReX: ```console ./Tools/Release/updateAMReX.py ``` - Weekly update to latest pyAMReX: ```console ./Tools/Release/updatepyAMReX.py ``` - Weekly update to latest PICSAR (no changes since 24.09): ```console ./Tools/Release/updatePICSAR.py ```
1 parent 22a6551 commit 6b2ca8b

File tree

6 files changed

+8
-5
lines changed

6 files changed

+8
-5
lines changed

.github/workflows/cuda.yml

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

.github/workflows/dependencies/hip.sh

+1
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@ sudo apt-get install -y --no-install-recommends \
5353
rocm-dev \
5454
rocfft-dev \
5555
rocprim-dev \
56+
rocsparse-dev \
5657
rocrand-dev \
5758
hiprand-dev
5859

.github/workflows/dependencies/nvcc11-3.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ sudo apt-get install -y \
4141
cuda-nvml-dev-11-3 \
4242
cuda-nvtx-11-3 \
4343
libcufft-dev-11-3 \
44-
libcurand-dev-11-3
44+
libcurand-dev-11-3 \
45+
libcusparse-dev-11-3
4546
sudo ln -s cuda-11.3 /usr/local/cuda
4647

4748
# if we run out of temporary storage in CI:

.github/workflows/dependencies/nvcc11-8.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ sudo apt-get install -y \
4141
cuda-nvml-dev-11-8 \
4242
cuda-nvtx-11-8 \
4343
libcufft-dev-11-8 \
44-
libcurand-dev-11-8
44+
libcurand-dev-11-8 \
45+
libcusparse-dev-11-8
4546
sudo ln -s cuda-11.8 /usr/local/cuda
4647

4748
# if we run out of temporary storage in CI:

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 "96db0a665ff1e6bbe638490fd02d3aafb9188f6b"
297+
set(WarpX_amrex_branch "b3f67385e62f387b548389222840486c0fffca57"
298298
CACHE STRING
299299
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")
300300

cmake/dependencies/pyAMReX.cmake

+1-1
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ option(WarpX_pyamrex_internal "Download & build pyAMReX" ON)
7474
set(WarpX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
7575
CACHE STRING
7676
"Repository URI to pull and build pyamrex from if(WarpX_pyamrex_internal)")
77-
set(WarpX_pyamrex_branch "24.12"
77+
set(WarpX_pyamrex_branch "cba1ca5098fd4edc83b2ae630c0391140fac55f4"
7878
CACHE STRING
7979
"Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)")
8080

0 commit comments

Comments
 (0)