Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AMReX/pyAMReX/PICSAR: weekly update #5512

Merged
merged 2 commits into from
Dec 17, 2024
Merged

AMReX/pyAMReX/PICSAR: weekly update #5512

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7a7a093
AMReX/pyAMReX/PICSAR: weekly update
EZoni Dec 16, 2024
4e6ba4f
Fix missing dependencies for cuSPARSE
EZoni Dec 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/cuda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ jobs:
which nvcc || echo "nvcc not in PATH!"

git clone https://github.com/AMReX-Codes/amrex.git ../amrex
cd ../amrex && git checkout --detach 96db0a665ff1e6bbe638490fd02d3aafb9188f6b && cd -
cd ../amrex && git checkout --detach b3f67385e62f387b548389222840486c0fffca57 && 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
1 change: 1 addition & 0 deletions .github/workflows/dependencies/hip.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ sudo apt-get install -y --no-install-recommends \
rocm-dev \
rocfft-dev \
rocprim-dev \
rocsparse-dev \
rocrand-dev \
hiprand-dev

Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dependencies/nvcc11-3.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ sudo apt-get install -y \
cuda-nvml-dev-11-3 \
cuda-nvtx-11-3 \
libcufft-dev-11-3 \
libcurand-dev-11-3
libcurand-dev-11-3 \
libcusparse-dev-11-3
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@WeiqunZhang @atmyers Does this mean that installation instructions for e.g. Perlmutter should be updated to make sure that cusparse is installed?
https://warpx.readthedocs.io/en/latest/install/hpc/perlmutter.html

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's part of the cuda package already installed on perlmutter. I don't we need anything special.

sudo ln -s cuda-11.3 /usr/local/cuda

# if we run out of temporary storage in CI:
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/dependencies/nvcc11-8.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ sudo apt-get install -y \
cuda-nvml-dev-11-8 \
cuda-nvtx-11-8 \
libcufft-dev-11-8 \
libcurand-dev-11-8
libcurand-dev-11-8 \
libcusparse-dev-11-8
sudo ln -s cuda-11.8 /usr/local/cuda

# if we run out of temporary storage in CI:
Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies/AMReX.cmake
View file
Open in desktop
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 "96db0a665ff1e6bbe638490fd02d3aafb9188f6b"
set(WarpX_amrex_branch "b3f67385e62f387b548389222840486c0fffca57"
CACHE STRING
"Repository branch for WarpX_amrex_repo if(WarpX_amrex_internal)")

Expand Down
2 changes: 1 addition & 1 deletion cmake/dependencies/pyAMReX.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ option(WarpX_pyamrex_internal "Download & build pyAMReX" ON)
set(WarpX_pyamrex_repo "https://github.com/AMReX-Codes/pyamrex.git"
CACHE STRING
"Repository URI to pull and build pyamrex from if(WarpX_pyamrex_internal)")
set(WarpX_pyamrex_branch "24.12"
set(WarpX_pyamrex_branch "cba1ca5098fd4edc83b2ae630c0391140fac55f4"
CACHE STRING
"Repository branch for WarpX_pyamrex_repo if(WarpX_pyamrex_internal)")

Expand Down
Loading