diff --git a/.github/workflows/dependencies/dependencies_nvcc11.sh b/.github/workflows/dependencies/dependencies_nvcc11.sh index 92f022a3..cf91137c 100755 --- a/.github/workflows/dependencies/dependencies_nvcc11.sh +++ b/.github/workflows/dependencies/dependencies_nvcc11.sh @@ -35,5 +35,6 @@ sudo apt-get install -y \ cuda-minimal-build-11-2 \ cuda-nvml-dev-11-2 \ cuda-nvtx-11-2 \ - libcurand-dev-11-2 + libcurand-dev-11-2 \ + libcusparse-dev-11-2 sudo ln -s cuda-11.2 /usr/local/cuda diff --git a/.github/workflows/dependencies/hip.sh b/.github/workflows/dependencies/hip.sh index 3b5299ac..9a556ad2 100755 --- a/.github/workflows/dependencies/hip.sh +++ b/.github/workflows/dependencies/hip.sh @@ -52,6 +52,7 @@ sudo apt-get install -y --no-install-recommends \ rocfft-dev \ rocprim-dev \ rocrand-dev \ + rocsparse-dev \ hiprand-dev # activate diff --git a/CMakeLists.txt b/CMakeLists.txt index 8e8098ee..ceb5baeb 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,7 +1,7 @@ # Preamble #################################################################### # cmake_minimum_required(VERSION 3.24.0) -project(pyAMReX VERSION 24.12) +project(pyAMReX VERSION 25.01) include(${pyAMReX_SOURCE_DIR}/cmake/pyAMReXFunctions.cmake) diff --git a/cmake/dependencies/AMReX.cmake b/cmake/dependencies/AMReX.cmake index 27124361..f5eb55ef 100644 --- a/cmake/dependencies/AMReX.cmake +++ b/cmake/dependencies/AMReX.cmake @@ -67,7 +67,7 @@ macro(find_amrex) message(STATUS "Searching for pre-installed AMReX ...") # https://amrex-codes.github.io/amrex/docs_html/BuildingAMReX.html#importing-amrex-into-your-cmake-project # not strictly required yet to compile pyAMReX: EB - find_package(AMReX 24.12 CONFIG REQUIRED COMPONENTS PARTICLES PIC) + find_package(AMReX 25.01 CONFIG REQUIRED COMPONENTS PARTICLES PIC) message(STATUS "AMReX: Found version '${AMReX_VERSION}'") if(AMReX_GPU_BACKEND STREQUAL CUDA) @@ -86,7 +86,7 @@ option(pyAMReX_amrex_internal "Download & build AMReX" ON) set(pyAMReX_amrex_repo "https://github.com/AMReX-Codes/amrex.git" CACHE STRING "Repository URI to pull and build AMReX from if(pyAMReX_amrex_internal)") -set(pyAMReX_amrex_branch "24.12" +set(pyAMReX_amrex_branch "25.01" CACHE STRING "Repository branch for pyAMReX_amrex_repo if(pyAMReX_amrex_internal)") diff --git a/docs/source/conf.py b/docs/source/conf.py index e458ee1f..04ebe0bb 100644 --- a/docs/source/conf.py +++ b/docs/source/conf.py @@ -72,9 +72,9 @@ # built documents. # # The short X.Y version. -version = "24.12" +version = "25.01" # The full version, including alpha/beta/rc tags. -release = "24.12" +release = "25.01" # The language for content autogenerated by Sphinx. Refer to documentation # for a list of supported languages. diff --git a/setup.py b/setup.py index 197358d8..46078779 100644 --- a/setup.py +++ b/setup.py @@ -217,7 +217,7 @@ def build_extension(self, ext): setup( name="amrex", # note PEP-440 syntax: x.y.zaN but x.y.z.devN - version="24.12", + version="25.01", packages=["amrex"], # Python sources: package_dir={"": "src"},