AMReX-Codes · ax3l · Nov 10, 2025 · Nov 10, 2025 · Nov 10, 2025 · Nov 10, 2025
diff --git a/.github/workflows/catalyst.yml b/.github/workflows/catalyst.yml
@@ -10,6 +10,8 @@ jobs:
   check_changes:
     uses: ./.github/workflows/check_changes.yml
 
+  # Container build scripts:
+  # https://gitlab.kitware.com/christos.tsolakis/catalyst-amrex-docker-images
   catalyst:
     name: Catalyst
     runs-on: ubuntu-22.04
@@ -20,7 +22,7 @@ jobs:
       CC: gcc
       CMAKE_PREFIX_PATH: "/opt/conduit:/opt/catalyst"
     container:
-      image: kitware/paraview:ci-catalyst-amrex-warpx-20240701
+      image: kitware/paraview:ci-catalyst-amrex-warpx-20240828
     steps:
     - uses: actions/checkout@v5
     - name: Configure

diff --git a/.github/workflows/sensei.yml b/.github/workflows/sensei.yml
@@ -12,7 +12,9 @@ jobs:
   check_changes:
     uses: ./.github/workflows/check_changes.yml
 
+  # deprecated / unsupported
   test_sensei:
+    if: 0
     name: SENSEI Adaptor [test]
     runs-on: ubuntu-24.04
     needs: check_changes

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.25)
 
 #
 # Setting a cmake_policy to OLD is deprecated by definition and will raise a
@@ -27,11 +27,13 @@ endif()
 #
 # CMake 3.18+: CMAKE_CUDA_ARCHITECTURES
 # https://cmake.org/cmake/help/latest/policy/CMP0104.html
-# We have to migrate there, but maybe the new "native" option (CMake 3.24+)
-# is what we want to wait for:
+# We us the new "native" option (CMake 3.24+):
 # https://cmake.org/cmake/help/v3.24/prop_tgt/CUDA_ARCHITECTURES.html
+if(NOT DEFINED CMAKE_CUDA_ARCHITECTURES)
+    set(CMAKE_CUDA_ARCHITECTURES native)
+endif()
 if(POLICY CMP0104)
-    cmake_policy(SET CMP0104 OLD)
+    cmake_policy(SET CMP0104 NEW)
 endif()
 
 #
@@ -106,9 +108,6 @@ include( AMReXOptions )
 #
 if (AMReX_CUDA)
     enable_language(CUDA)
-    if(CMAKE_VERSION VERSION_LESS 3.20)
-        include(AMReX_SetupCUDA)
-    endif()
 endif ()
 
 #

diff --git a/Docs/sphinx_documentation/source/BuildingAMReX_Chapter.rst b/Docs/sphinx_documentation/source/BuildingAMReX_Chapter.rst
@@ -23,7 +23,7 @@ Fortran compiler that supports the Fortran 2003 standard, and a C
 compiler that supports the C99 standard.  Prerequisites for building
 with GNU Make include Python (>= 2.7, including 3) and standard tools
 available in any Unix-like environments (e.g., Perl and sed).  For
-building with CMake, the minimal requirement is version 3.18.
+building with CMake, the minimal requirement is version 3.25.
 
 Please note that we fully support AMReX for Linux systems in general and on the
 DOE supercomputers (e.g. Cori, Summit) in particular.  Many of our users do build

diff --git a/Docs/sphinx_documentation/source/GPU.rst b/Docs/sphinx_documentation/source/GPU.rst
@@ -251,7 +251,7 @@ check the :ref:`table <tab:cmakecudavar>` below.
    +------------------------------+-------------------------------------------------+-------------+-----------------+
    | Variable Name                | Description                                     | Default     | Possible values |
    +==============================+=================================================+=============+=================+
-   | AMReX_CUDA_ARCH              |  CUDA target architecture                       | Auto        | User-defined    |
+   | AMReX_CUDA_ARCH              |  CUDA target architecture                       | native      | User-defined    |
    +------------------------------+-------------------------------------------------+-------------+-----------------+
    | AMReX_CUDA_FASTMATH          |  Enable CUDA fastmath library                   | YES         | YES, NO         |
    +------------------------------+-------------------------------------------------+-------------+-----------------+
@@ -297,15 +297,15 @@ For example, on Cori GPUs you can specify the architecture as follows:
 
 ::
 
-   cmake [options] -DAMReX_GPU_BACKEND=CUDA -DAMReX_CUDA_ARCH=Volta /path/to/amrex/source
+   cmake [options] -DAMReX_GPU_BACKEND=CUDA -DAMReX_CUDA_ARCH="80;90" /path/to/amrex/source
 
 
 If no architecture is specified, CMake will default to the architecture defined in the
 *environment variable* ``AMREX_CUDA_ARCH`` (note: all caps).
 If the latter is not defined, CMake will try to determine which GPU architecture is supported by the system.
 If more than one is found, CMake will build for all of them.
 If autodetection fails, a list of "common" architectures is assumed.
-`Multiple CUDA architectures <https://cmake.org/cmake/help/latest/module/FindCUDA.html#commands>`__ can also be set manually as semicolon-separated list, e.g. ``-DAMReX_CUDA_ARCH=7.0;8.0``.
+`Multiple CUDA architectures <https://cmake.org/cmake/help/latest/module/FindCUDA.html#commands>`__ can also be set manually as semicolon-separated list, e.g. ``-DAMReX_CUDA_ARCH="80;90"``.
 Building for multiple CUDA architectures will generally result in a larger library and longer build times.
 
 **Note that AMReX supports NVIDIA GPU architectures with compute capability 6.0 or higher and
@@ -323,8 +323,7 @@ the following code into the appropriate CMakeLists.txt file:
 
 
 If instead of using an external installation of AMReX you prefer to include AMReX as a subproject
-in your CMake setup, we strongly encourage you to use the ``AMReX_SetupCUDA`` module as shown below
-if the CMake version is less than 3.20:
+in your CMake setup (i.e., build AMReX on the fly), do this:
 
 .. highlight:: console
 
@@ -333,12 +332,7 @@ if the CMake version is less than 3.20:
    # Enable CUDA in your CMake project
    enable_language(CUDA)
 
-   # Include the AMReX-provided CUDA setup module -- OBSOLETE with CMake >= 3.20
-   if(CMAKE_VERSION VERSION_LESS 3.20)
-       include(AMReX_SetupCUDA)
-   endif()
-
-   # Include AMReX source directory ONLY AFTER the two steps above
+   # Include AMReX source directory ONLY AFTER enable_language
    add_subdirectory(/path/to/amrex/source/dir)
 
 

diff --git a/Tests/CMakeTestInstall/CMakeLists.txt b/Tests/CMakeTestInstall/CMakeLists.txt
@@ -3,7 +3,7 @@
 # building and running the code
 # in Tests/Amr/Advection_AmrCore/
 #
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.25)
 
 project(amrex-test-install)
 

diff --git a/Tests/SpackSmokeTest/CMakeLists.txt b/Tests/SpackSmokeTest/CMakeLists.txt
@@ -6,7 +6,7 @@
 # against a currently installed version of AMReX. The resulting
 # executable can then be ran to test functionality.
 
-cmake_minimum_required(VERSION 3.18)
+cmake_minimum_required(VERSION 3.25)
 
 project(amrex-test-install)
 
@@ -26,9 +26,6 @@ if (AMReX_GPU_BACKEND STREQUAL "CUDA")
     find_package(AMReX REQUIRED CUDA)
 
 elseif(AMReX_GPU_BACKEND STREQUAL "HIP")
-    if(CMAKE_VERSION VERSION_LESS 3.20)
-        message(FATAL_ERROR "HIP requires CMake version 3.20 or newer")
-    endif()
     find_package(AMReX REQUIRED HIP)
     find_package(rocrand REQUIRED CONFIG)
     find_package(rocprim REQUIRED CONFIG)
@@ -83,10 +80,13 @@ target_link_libraries(install_test PUBLIC AMReX::amrex)
 
 # Additional CUDA configuration commands
 if (AMReX_GPU_BACKEND STREQUAL "CUDA")
+    if (AMREX_CUDA_ARCHS)
+        set_target_properties(install_test PROPERTIES
+            CUDA_ARCHITECTURES "${AMREX_CUDA_ARCHS}")
+    endif()
     set_target_properties(install_test PROPERTIES
-        LANGUAGE CUDA
-        CUDA_ARCHITECTURES "${AMREX_CUDA_ARCHS}"
-        CUDA_SEPARABLE_COMPILATION  ON)
+            LANGUAGE CUDA
+            CUDA_SEPARABLE_COMPILATION  ON)
 
     get_target_property(Source_Files install_test SOURCES)
     list(FILTER Source_Files INCLUDE REGEX "\\.cpp$")

diff --git a/Tools/CMake/AMReXCUDAOptions.cmake b/Tools/CMake/AMReXCUDAOptions.cmake
@@ -17,14 +17,15 @@ endmacro ()
 #
 message(STATUS "Enabled CUDA options:")
 
-set(AMReX_CUDA_ARCH_DEFAULT "Auto")
-if(DEFINED CMAKE_CUDA_ARCHITECTURES)
-   set(AMReX_CUDA_ARCH_DEFAULT "${CMAKE_CUDA_ARCHITECTURES}")
-endif ()
 if(DEFINED ENV{AMREX_CUDA_ARCH})
    set(AMReX_CUDA_ARCH_DEFAULT "$ENV{AMREX_CUDA_ARCH}")
-endif()
-set(AMReX_CUDA_ARCH ${AMReX_CUDA_ARCH_DEFAULT} CACHE STRING "CUDA architecture (Use 'Auto' for automatic detection)")
+elseif(DEFINED CMAKE_CUDA_ARCHITECTURES)
+   set(AMReX_CUDA_ARCH_DEFAULT "${CMAKE_CUDA_ARCHITECTURES}")
+else()
+   set(AMReX_CUDA_ARCH_DEFAULT "native")
+endif ()
+set(AMReX_CUDA_ARCH ${AMReX_CUDA_ARCH_DEFAULT} CACHE STRING "CUDA architecture (Use 'native' for automatic detection)")
+set(CMAKE_CUDA_ARCHITECTURES "${AMReX_CUDA_ARCH}" CACHE STRING "" FORCE)
 
 option(AMReX_CUDA_FASTMATH "Enable CUDA fastmath" ON)  # Note: inconsistent with AMReX_FASTMATH defaults
 cuda_print_option( AMReX_CUDA_FASTMATH )

diff --git a/Tools/CMake/AMReXConfig.cmake.in b/Tools/CMake/AMReXConfig.cmake.in
@@ -256,11 +256,7 @@ endif ()
 #
 # AMReX 21.06+ supports CUDA_ARCHITECTURES
 if (@AMReX_CUDA@)
-    if (CMAKE_VERSION VERSION_LESS 3.20)
-        include(AMReX_SetupCUDA)
-    else ()
-        find_dependency(CUDAToolkit REQUIRED)
-    endif ()
+    find_dependency(CUDAToolkit REQUIRED)
 endif ()
 
 # CMake targets
@@ -275,7 +271,7 @@ if (NOT TARGET AMReX::amrex)  # protection in case of multiple inclusions
 endif()
 
 # More Modern CUDA CMake
-if (@CMAKE_VERSION@ VERSION_GREATER_EQUAL 3.20 AND @AMReX_CUDA@)
+if (@AMReX_CUDA@)
     foreach(D IN LISTS AMReX_SPACEDIM)
         # CUDA architectures amrex was built for -- should we make
         set(AMREX_CUDA_ARCHS @AMREX_CUDA_ARCHS@ CACHE INTERNAL "CUDA archs AMReX is built for")

diff --git a/Tools/CMake/AMReXFlagsTargets.cmake b/Tools/CMake/AMReXFlagsTargets.cmake
@@ -25,42 +25,21 @@ include_guard(GLOBAL)
 #     <lang> = cxx,fortran,cuda
 #     <id>   = gnu,intel,pgi,cray,clang,appleclang,crayclang,ibmclang,intelllvm,msvc,nvidia,nvhpc,xlclang
 #
-if (CMAKE_VERSION VERSION_LESS 3.20)
-   foreach (_language CXX Fortran CUDA )
-      set(_comp_lang   "$<COMPILE_LANGUAGE:${_language}>")
-      string(TOLOWER "${_language}" _lang)
-
-      foreach (_comp GNU Intel PGI Cray Clang AppleClang CrayClang IBMClang IntelLLVM MSVC NVIDIA NVHPC XLClang )
-         string(TOLOWER "${_comp}" _id)
-         # Define variables
-         set(_comp_id              "$<${_language}_COMPILER_ID:${_comp}>")
-         set(_${_lang}_${_id}      "$<AND:${_comp_lang},${_comp_id}>")
-         set(_${_lang}_${_id}_dbg  "$<AND:${_comp_lang},${_comp_id},$<CONFIG:Debug>>")
-         set(_${_lang}_${_id}_rel  "$<AND:${_comp_lang},${_comp_id},$<CONFIG:Release>>")
-         set(_${_lang}_${_id}_rwdbg "$<AND:${_comp_lang},${_comp_id},$<CONFIG:RelWithDebInfo>>")
-         unset(_comp_id)
-      endforeach ()
-
-      unset(_comp_lang)
-      unset(_lang)
-   endforeach ()
-else ()
-   foreach (_language CXX Fortran CUDA )
-      string(TOLOWER "${_language}" _lang)
-
-      foreach (_comp GNU Intel PGI Cray Clang AppleClang CrayClang IBMClang IntelLLVM MSVC NVIDIA NVHPC XLClang )
-         string(TOLOWER "${_comp}" _id)
-         # Define variables
-         set(_${_lang}_${_id}      "$<COMPILE_LANG_AND_ID:${_language},${_comp}>")
-         set(_${_lang}_${_id}_dbg  "$<AND:${_${_lang}_${_id}},$<CONFIG:Debug>>")
-         set(_${_lang}_${_id}_rel  "$<AND:${_${_lang}_${_id}},$<CONFIG:Release>>")
-         set(_${_lang}_${_id}_rwdbg "$<AND:${_${_lang}_${_id}},$<CONFIG:RelWithDebInfo>>")
-         unset(_id)
-      endforeach ()
-
-      unset(_lang)
-   endforeach ()
-endif ()
+foreach (_language CXX Fortran CUDA )
+  string(TOLOWER "${_language}" _lang)
+
+  foreach (_comp GNU Intel PGI Cray Clang AppleClang CrayClang IBMClang IntelLLVM MSVC NVIDIA NVHPC XLClang )
+     string(TOLOWER "${_comp}" _id)
+     # Define variables
+     set(_${_lang}_${_id}      "$<COMPILE_LANG_AND_ID:${_language},${_comp}>")
+     set(_${_lang}_${_id}_dbg  "$<AND:${_${_lang}_${_id}},$<CONFIG:Debug>>")
+     set(_${_lang}_${_id}_rel  "$<AND:${_${_lang}_${_id}},$<CONFIG:Release>>")
+     set(_${_lang}_${_id}_rwdbg "$<AND:${_${_lang}_${_id}},$<CONFIG:RelWithDebInfo>>")
+     unset(_id)
+  endforeach ()
+
+  unset(_lang)
+endforeach ()
 
 
 #

diff --git a/Tools/CMake/AMReXParallelBackends.cmake b/Tools/CMake/AMReXParallelBackends.cmake
@@ -70,9 +70,7 @@ endif ()
 #
 #
 #
-if (  AMReX_GPU_BACKEND STREQUAL "CUDA"
-      AND
-      CMAKE_VERSION VERSION_GREATER_EQUAL 3.20 )
+if (AMReX_GPU_BACKEND STREQUAL "CUDA")
 
    find_package(CUDAToolkit REQUIRED)
    foreach(D IN LISTS AMReX_SPACEDIM)
@@ -82,11 +80,9 @@ if (  AMReX_GPU_BACKEND STREQUAL "CUDA"
            target_link_libraries(amrex_${D}d PUBLIC CUDA::cusparse)
        endif ()
 
-       if(CMAKE_CUDA_COMPILER_VERSION VERSION_LESS 11.2)
-           # nvToolsExt: if tiny profiler or base profiler are on.
-           if (AMReX_TINY_PROFILE OR AMReX_BASE_PROFILE)
-               target_link_libraries(amrex_${D}d PUBLIC CUDA::nvToolsExt)
-           endif ()
+       # if tiny profiler or base profiler are on we add range annotations
+       if (AMReX_TINY_PROFILE OR AMReX_BASE_PROFILE)
+           target_link_libraries(amrex_${D}d PUBLIC CUDA::nvtx3)
        endif ()
    endforeach()
 
@@ -110,13 +106,14 @@ if (  AMReX_GPU_BACKEND STREQUAL "CUDA"
   endforeach()
 
    # Take care of cuda archs
-   set_cuda_architectures(AMReX_CUDA_ARCH)
-   foreach(D IN LISTS AMReX_SPACEDIM)
-       set_target_properties(amrex_${D}d
-          PROPERTIES
-          CUDA_ARCHITECTURES "${AMREX_CUDA_ARCHS}"
-          )
-   endforeach()
+   if (AMREX_CUDA_ARCHS)
+       foreach(D IN LISTS AMReX_SPACEDIM)
+           set_target_properties(amrex_${D}d
+              PROPERTIES
+              CUDA_ARCHITECTURES "${AMREX_CUDA_ARCHS}"
+              )
+       endforeach()
+   endif()
 
    #
    # CUDA specific warnings
@@ -378,14 +375,9 @@ if (AMReX_HIP)
        foreach(D IN LISTS AMReX_SPACEDIM)
            target_compile_options(amrex_${D}d PUBLIC
               $<$<COMPILE_LANGUAGE:CXX>:-fgpu-rdc> )
-           if(CMAKE_VERSION VERSION_LESS 3.18)
-               target_link_options(amrex_${D}d PUBLIC
-                  -fgpu-rdc)
-           else()
-               target_link_options(amrex_${D}d PUBLIC
-                  "$<$<LINK_LANGUAGE:HIP>:-fgpu-rdc>"
-                  "$<$<LINK_LANGUAGE:CXX>:-fgpu-rdc>")
-           endif()
+           target_link_options(amrex_${D}d PUBLIC
+              "$<$<LINK_LANGUAGE:HIP>:-fgpu-rdc>"
+              "$<$<LINK_LANGUAGE:CXX>:-fgpu-rdc>")
        endforeach()
    endif()
 endif ()
diff --git a/Tools/CMake/AMReXTargetHelpers.cmake b/Tools/CMake/AMReXTargetHelpers.cmake
@@ -127,12 +127,11 @@ function (setup_target_for_cuda_compilation _target)
       PROPERTIES
       CUDA_SEPARABLE_COMPILATION ${AMReX_GPU_RDC}      # This adds -dc
    )
-   set_cpp_sources_to_cuda_language(${_target})
-
-   if (CMAKE_VERSION VERSION_GREATER_EQUAL 3.20)
+   if (AMREX_CUDA_ARCHS)
       set_target_properties( ${_target}
          PROPERTIES
          CUDA_ARCHITECTURES "${AMREX_CUDA_ARCHS}"
          )
    endif ()
+   set_cpp_sources_to_cuda_language(${_target})
 endfunction ()
diff --git a/Tools/CMake/AMReXThirdPartyLibraries.cmake b/Tools/CMake/AMReXThirdPartyLibraries.cmake
@@ -59,13 +59,7 @@ if (AMReX_HDF5)
     endif ()
 
     foreach(D IN LISTS AMReX_SPACEDIM)
-        if (TARGET hdf5::hdf5)  # CMake >= 3.19
-           target_link_libraries(amrex_${D}d PUBLIC hdf5::hdf5)
-        else ()  # CMake < 3.19 -- Remove when minimum cmake version is bumped up
-           target_include_directories(amrex_${D}d PUBLIC ${HDF5_INCLUDE_DIRS})
-           target_compile_definitions(amrex_${D}d PUBLIC ${HDF5_DEFINITIONS})
-           target_link_libraries(amrex_${D}d PUBLIC ${HDF5_LIBRARIES})
-        endif ()
+       target_link_libraries(amrex_${D}d PUBLIC hdf5::hdf5)
     endforeach()
 
 endif ()
@@ -81,12 +75,7 @@ if (AMReX_HDF5_ZFP)
    endif ()
 
    foreach(D IN LISTS AMReX_SPACEDIM)
-       if (TARGET h5z_zfp::h5z_zfp)  # CMake >= 3.19
-          target_link_libraries(amrex_${D}d PUBLIC h5z_zfp::h5z_zfp)
-       else ()  # CMake < 3.19 -- Remove when minimum cmake version is bumped up
-          target_include_directories(amrex_${D}d PUBLIC ${H5Z_ZFP_INCLUDE_DIR})
-          target_link_libraries(amrex_${D}d PUBLIC ${H5Z_ZFP_LIBRARY})
-       endif ()
+      target_link_libraries(amrex_${D}d PUBLIC h5z_zfp::h5z_zfp)
    endforeach()
 endif ()