From 7a7a09321b1e30fbd13d432f338ab31394a406af Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 16 Dec 2024 11:48:12 -0800 Subject: [PATCH 1/2] AMReX/pyAMReX/PICSAR: weekly update --- .github/workflows/cuda.yml | 2 +- cmake/dependencies/AMReX.cmake | 2 +- cmake/dependencies/pyAMReX.cmake | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/cuda.yml b/.github/workflows/cuda.yml index a7cd884039b..e4967bea790 100644 --- a/.github/workflows/cuda.yml +++ b/.github/workflows/cuda.yml @@ -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 diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 3733b729004..0066a3103cd 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -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)") diff --git a/cmake/dependencies/pyAMReX.cmake b/cmake/dependencies/pyAMReX.cmake index 6f0e07bf79e..93c4cc63e5a 100644 --- a/cmake/dependencies/pyAMReX.cmake +++ b/cmake/dependencies/pyAMReX.cmake @@ -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)") From 4e6ba4f9e00c6cb71e4b6dbefb4632ab0bde3538 Mon Sep 17 00:00:00 2001 From: Edoardo Zoni Date: Mon, 16 Dec 2024 15:48:40 -0800 Subject: [PATCH 2/2] Fix missing dependencies for cuSPARSE --- .github/workflows/dependencies/hip.sh | 1 + .github/workflows/dependencies/nvcc11-3.sh | 3 ++- .github/workflows/dependencies/nvcc11-8.sh | 3 ++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dependencies/hip.sh b/.github/workflows/dependencies/hip.sh index 1154bb05e58..bf15c2f7101 100755 --- a/.github/workflows/dependencies/hip.sh +++ b/.github/workflows/dependencies/hip.sh @@ -53,6 +53,7 @@ sudo apt-get install -y --no-install-recommends \ rocm-dev \ rocfft-dev \ rocprim-dev \ + rocsparse-dev \ rocrand-dev \ hiprand-dev diff --git a/.github/workflows/dependencies/nvcc11-3.sh b/.github/workflows/dependencies/nvcc11-3.sh index 92e2717e425..050b58b5947 100755 --- a/.github/workflows/dependencies/nvcc11-3.sh +++ b/.github/workflows/dependencies/nvcc11-3.sh @@ -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 sudo ln -s cuda-11.3 /usr/local/cuda # if we run out of temporary storage in CI: diff --git a/.github/workflows/dependencies/nvcc11-8.sh b/.github/workflows/dependencies/nvcc11-8.sh index 6089360392b..608f6c7a817 100755 --- a/.github/workflows/dependencies/nvcc11-8.sh +++ b/.github/workflows/dependencies/nvcc11-8.sh @@ -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: