feat: remove obsolete spack configs and compilation flags

CMakeLists.txt

@@ -259,8 +259,9 @@ ExternalProject_Add( hdf5
                      URL_HASH SHA256=${HDF5_URL_HASH}
                      PREFIX ${PROJECT_BINARY_DIR}/hdf5
                      INSTALL_DIR ${HDF5_DIR}
-                     BUILD_COMMAND make -j ${NUM_PROC}
-                     INSTALL_COMMAND make install
+                     BUILD_COMMAND ${TPL_BUILD_COMMAND}
+                     INSTALL_COMMAND ${TPL_INSTALL_COMMAND}
+                     CMAKE_GENERATOR ${TPL_GENERATOR}
                      CMAKE_ARGS -D CMAKE_C_COMPILER:STRING=${HDF5_C_COMPILER}
                                 -D CMAKE_CXX_COMPILER:STRING=${HDF5_CXX_COMPILER}
                                 -D CMAKE_C_FLAGS:STRING=${C_FLAGS_NO_WARNINGS}
@@ -396,6 +397,19 @@ set(RAJA_URL_HASH "2774a569f19a7d8e37d1e166d197c828c6b614e7f8ef6d16ccbfb144b8284
 
 message(STATUS "Building RAJA found at ${RAJA_URL}")
 
+# RDNA GPUs use 32-lane wavefronts, while the CDNA GPUs targeted by the
+# default RAJA configuration use 64-lane wavefronts.  Keep this override
+# configurable so callers can select the wave size explicitly when needed.
+if( ENABLE_HIP )
+    set( RAJA_HIP_WAVESIZE_DEFAULT 64 )
+    if( CMAKE_HIP_ARCHITECTURES MATCHES "(^|;)gfx(10|11)" )
+        set( RAJA_HIP_WAVESIZE_DEFAULT 32 )
+    endif()
+    set( RAJA_HIP_WAVESIZE "${RAJA_HIP_WAVESIZE_DEFAULT}" CACHE STRING
+         "RAJA HIP wavefront size (32 for RDNA, 64 for CDNA)" )
+    message( STATUS "RAJA HIP wavefront size = ${RAJA_HIP_WAVESIZE}" )
+endif()
+
 # RAJA's vectorization layer does not compile with the ROCm toolchain.
 if( ENABLE_HIP )
     set( RAJA_ENABLE_VECTORIZATION OFF )
@@ -421,6 +435,7 @@ ExternalProject_Add( raja
                                 -D RAJA_ENABLE_NV_TOOLS_EXT:BOOL=${ENABLE_CUDA_NVTOOLSEXT}
                                 -D RAJA_ENABLE_ROCTX:BOOL=${ENABLE_ROCTX}
                                 -D CMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER}
+                                -D CMAKE_CUDA_HOST_COMPILER:FILEPATH=${CMAKE_CUDA_HOST_COMPILER}
                                 -D CUDA_TOOLKIT_ROOT_DIR=${CUDA_TOOLKIT_ROOT_DIR}
                                 -D CUB_DIR:PATH=${CUB_DIR}
                                 -D CMAKE_CUDA_ARCHITECTURES:STRING=${CMAKE_CUDA_ARCHITECTURES}
@@ -432,13 +447,15 @@ ExternalProject_Add( raja
                                 -D hip_DIR=${HIP_ROOT}/lib/cmake/hip
                                 -D ROCPRIM_DIR=${HIP_ROOT}
                                 -D CMAKE_HIP_ARCHITECTURES:STRING=${CMAKE_HIP_ARCHITECTURES}
+                                -D RAJA_HIP_WAVESIZE:STRING=${RAJA_HIP_WAVESIZE}
                                 -D ENABLE_TESTS:BOOL=OFF
                                 -D ENABLE_EXAMPLES:BOOL=OFF
                                 -D ENABLE_OPENMP:BOOL=${ENABLE_OPENMP}
                                 -D CMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR>
                                 -D CMAKE_INSTALL_LIBDIR:PATH=lib
                                 -D BUILD_SHARED_LIBS=${BUILD_SHARED_LIBS}
                                 -D CMAKE_POSITION_INDEPENDENT_CODE=${CMAKE_POSITION_INDEPENDENT_CODE}
+                                -D RAJA_ENABLE_EXERCISES:BOOL=OFF
                     )
 
 list(APPEND build_list raja )
@@ -470,6 +487,7 @@ ExternalProject_Add( chai
                                 -D ENABLE_CUDA:BOOL=${ENABLE_CUDA}
                                 -D CHAI_ENABLE_CUDA:BOOL=${ENABLE_CUDA}
                                 -D CMAKE_CUDA_COMPILER=${CMAKE_CUDA_COMPILER}
+                                -D CMAKE_CUDA_HOST_COMPILER:FILEPATH=${CMAKE_CUDA_HOST_COMPILER}
                                 -D CUDA_TOOLKIT_ROOT_DIR=${CUDA_TOOLKIT_ROOT_DIR}
                                 -D CMAKE_CUDA_ARCHITECTURES:STRING=${CMAKE_CUDA_ARCHITECTURES}
                                 -D CMAKE_CUDA_FLAGS:STRING=${CHAI_CUDA_FLAGS}
@@ -851,7 +869,7 @@ list(APPEND build_list metis )
 if( ENABLE_MPI AND ENABLE_SUPERLU_DIST )
   set(SUPERLU_DIR "${CMAKE_INSTALL_PREFIX}/superlu_dist")
   set(SUPERLU_URL "https://github.com/xiaoyeli/superlu_dist/archive/0f6efc3.tar.gz")
-  set(SUPERLU_URL_HASH "49cd47da22fe72a37011e8dfaf94bd63ad8d61cc8144eac7a571bcbd0a2edf58a")
+  set(SUPERLU_URL_HASH "49cd47da22fe72a37011e8dfaf94bd63ad8d61cc8144eac7a571bcbd0a2edf58")
 
   if ( CMAKE_CXX_COMPILER_ID STREQUAL "Clang" AND CMAKE_CXX_COMPILER_VERSION VERSION_GREATER 16.0 )
     set(SUPERLU_C_FLAGS "-fPIC ${C_FLAGS_NO_WARNINGS}")
@@ -962,6 +980,23 @@ if( ENABLE_HYPRE )
 --with-umpire-lib-dirs=${CHAI_DIR}/lib \
 --with-umpire-libs=umpire " )
 
+      if( NOT "${CMAKE_CUDA_FLAGS}" STREQUAL "" )
+        set( HYPRE_CUDA_FLAGS "${HYPRE_CUDA_FLAGS} --with-extra-CUFLAGS=\"${CMAKE_CUDA_FLAGS}\"" )
+      endif()
+
+      if( ENABLE_MPI )
+        if( MPI_C_INCLUDE_DIRS )
+          list( GET MPI_C_INCLUDE_DIRS 0 HYPRE_MPI_INCLUDE_DIR )
+        elseif( MPI_C_COMPILER )
+          get_filename_component( HYPRE_MPI_BIN_DIR ${MPI_C_COMPILER} DIRECTORY )
+          get_filename_component( HYPRE_MPI_PREFIX_DIR ${HYPRE_MPI_BIN_DIR} DIRECTORY )
+          set( HYPRE_MPI_INCLUDE_DIR "${HYPRE_MPI_PREFIX_DIR}/include" )
+        endif()
+        if( HYPRE_MPI_INCLUDE_DIR )
+          set( HYPRE_CUDA_FLAGS "${HYPRE_CUDA_FLAGS} --with-MPI-include=${HYPRE_MPI_INCLUDE_DIR}" )
+        endif()
+      endif()
+
       if( ENABLE_HYPRE_GPU_AWARE_MPI )
         set( HYPRE_CUDA_FLAGS "${HYPRE_CUDA_FLAGS} --enable-gpu-aware-mpi" )
       endif()
@@ -1251,9 +1286,10 @@ if( ENABLE_SCOTCH )
                         URL ${SCOTCH_URL}
                         URL_HASH SHA256=${SCOTCH_URL_HASH}
                         INSTALL_DIR ${SCOTCH_DIR}
-                        BUILD_COMMAND ${TPL_BUILD_COMMAND}
-                        INSTALL_COMMAND ${TPL_INSTALL_COMMAND}
-                        CMAKE_GENERATOR ${TPL_GENERATOR}
+                        BINARY_DIR ${PROJECT_BINARY_DIR}/scotch/src/scotch-make-build
+                        BUILD_COMMAND make -j ${NUM_PROC}
+                        INSTALL_COMMAND make install
+                        CMAKE_GENERATOR "Unix Makefiles"
                         CMAKE_ARGS -D CMAKE_BUILD_TYPE:STRING=${CMAKE_BUILD_TYPE}
                                     -D BUILD_PTSCOTCH:BOOL=ON
                                     -D BUILD_LIBSCOTCHMETIS:BOOL=OFF