SUNDAILS commit hash is broken on released spack-packages

Author: Sbozzolo

spack_repo/local/packages/sundials/0001-add-missing-README-to-examples-cvode-hip.patch

@@ -0,0 +1,22 @@
+From 5466501b51cc329aeea234f562aa85bedf870321 Mon Sep 17 00:00:00 2001
+From: "Cody J. Balos" <[email protected]>
+Date: Mon, 8 Mar 2021 13:28:11 -0800
+Subject: [PATCH] add missing README to examples/cvode/hip
+
+---
+ examples/cvode/hip/README | 3 +++
+ 1 file changed, 3 insertions(+)
+ create mode 100644 examples/cvode/hip/README
+
+diff --git a/examples/cvode/hip/README b/examples/cvode/hip/README
+new file mode 100644
+index 000000000..8480fbf7d
+--- /dev/null
++++ b/examples/cvode/hip/README
+@@ -0,0 +1,3 @@
++List of Hip CVODE examples
++
++  cvAdvDiff_kry_hip                 : 2-D advection-diffusion (nonstiff)
+-- 
+2.29.1
+

spack_repo/local/packages/sundials/5.5.0-xsdk-patches.patch

@@ -0,0 +1,75 @@
+From 0e197ce186ffae8213c297786811401861d249c1 Mon Sep 17 00:00:00 2001
+From: "Cody J. Balos" <[email protected]>
+Date: Wed, 4 Nov 2020 10:43:36 -0800
+Subject: [PATCH 1/2] fix expansion of generator expression
+
+---
+ src/sunlinsol/superludist/CMakeLists.txt | 2 +-
+ src/sunmatrix/slunrloc/CMakeLists.txt    | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/src/sunlinsol/superludist/CMakeLists.txt b/src/sunlinsol/superludist/CMakeLists.txt
+index ac1ece36c..5b59d6bfd 100644
+--- a/src/sunlinsol/superludist/CMakeLists.txt
++++ b/src/sunlinsol/superludist/CMakeLists.txt
+@@ -32,7 +32,7 @@ sundials_add_library(sundials_sunlinsolsuperludist
+     sundials_generic_obj
+   LINK_LIBRARIES
+   PUBLIC sundials_sunmatrixslunrloc SUNDIALS::SUPERLUDIST
+-    $<IF:$<BOOL:SUPERLUDIST_OpenMP>,OpenMP::OpenMP_C,>
++    $<IF:$<BOOL:${SUPERLUDIST_OpenMP}>,OpenMP::OpenMP_C,>
+   COMPILE_OPTIONS
+     PRIVATE ${_compile_options}
+   OUTPUT_NAME
+diff --git a/src/sunmatrix/slunrloc/CMakeLists.txt b/src/sunmatrix/slunrloc/CMakeLists.txt
+index 25ee00dd3..7713435d9 100644
+--- a/src/sunmatrix/slunrloc/CMakeLists.txt
++++ b/src/sunmatrix/slunrloc/CMakeLists.txt
+@@ -34,7 +34,7 @@ sundials_add_library(sundials_sunmatrixslunrloc
+     sundials_generic_obj
+   LINK_LIBRARIES
+     PUBLIC SUNDIALS::SUPERLUDIST
+-    $<IF:$<BOOL:SUPERLUDIST_OpenMP>,OpenMP::OpenMP_C,>
++    $<IF:$<BOOL:${SUPERLUDIST_OpenMP}>,OpenMP::OpenMP_C,>
+   COMPILE_OPTIONS
+     PRIVATE ${_compile_options}
+   OUTPUT_NAME
+-- 
+2.29.1
+
+
+From 09cd3ab587f8999d068946d8be180da0a3c6ad32 Mon Sep 17 00:00:00 2001
+From: "Cody J. Balos" <[email protected]>
+Date: Tue, 3 Nov 2020 11:43:58 -0800
+Subject: [PATCH 2/2] dont use NULL in ltest for Hypre
+
+---
+ cmake/tpl/SundialsHypre.cmake | 7 +++----
+ 1 file changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/cmake/tpl/SundialsHypre.cmake b/cmake/tpl/SundialsHypre.cmake
+index 9633f1c11..19d4bf201 100644
+--- a/cmake/tpl/SundialsHypre.cmake
++++ b/cmake/tpl/SundialsHypre.cmake
+@@ -78,15 +78,14 @@ if(HYPRE_FOUND AND (NOT HYPRE_WORKS))
+   "ADD_EXECUTABLE(ltest ltest.c)\n"
+   "TARGET_LINK_LIBRARIES(ltest ${HYPRE_LIBRARIES})\n")
+ 
+-  # Create a C source file which calls a hypre function
+   file(WRITE ${HYPRE_TEST_DIR}/ltest.c
+   "\#include \"HYPRE_parcsr_ls.h\"\n"
+   "int main(){\n"
+   "HYPRE_ParVector par_b;\n"
+   "HYPRE_IJVector b;\n"
+-  "par_b = NULL;\n"
+-  "b = NULL;\n"
+-  "if (par_b != NULL || b != NULL) return(1);\n"
++  "par_b = 0;\n"
++  "b = 0;\n"
++  "if (par_b != 0 || b != 0) return(1);\n"
+   "else return(0);\n"
+   "}\n")
+ 
+-- 
+2.29.1
+

spack_repo/local/packages/sundials/Change-HIP_PLATFORM-from-HCC-to-AMD-and-NVCC-to-NVIDIA.patch

@@ -0,0 +1,28 @@
+From d4afbed86fc4f9925e55367267b3796a522ba5d5 Mon Sep 17 00:00:00 2001
+From: Renjith Ravindran <[email protected]>
+Date: Sun, 14 Jan 2024 10:20:21 +0000
+Subject: [PATCH] Change HIP_PLATFORM from HCC to AMD and NVCC to NVIDIA
+
+---
+ include/sundials/sundials_hip_policies.hpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/include/sundials/sundials_hip_policies.hpp b/include/sundials/sundials_hip_policies.hpp
+index d759bbc..f6dfe41 100644
+--- a/include/sundials/sundials_hip_policies.hpp
++++ b/include/sundials/sundials_hip_policies.hpp
+@@ -30,9 +30,9 @@ namespace sundials
+ namespace hip
+ {
+ 
+-#if defined(__HIP_PLATFORM_HCC__)
++#if defined(__HIP_PLATFORM_AMD__)
+ constexpr const sunindextype WARP_SIZE = 64;
+-#elif defined(__HIP_PLATFORM_NVCC__)
++#elif defined(__HIP_PLATFORM_NVIDIA__)
+ constexpr const sunindextype WARP_SIZE = 32;
+ #endif
+ constexpr const sunindextype MAX_BLOCK_SIZE = 1024;
+-- 
+2.39.3
+

spack_repo/local/packages/sundials/FindPackageMultipass.cmake.patch

@@ -0,0 +1,69 @@
+diff --git a/config/FindPackageMultipass.cmake b/config/FindPackageMultipass.cmake
+index 128eee9..847c246 100644
+--- a/config/FindPackageMultipass.cmake
++++ b/config/FindPackageMultipass.cmake
+@@ -138,7 +138,10 @@ macro (MULTIPASS_SOURCE_RUNS includes libraries source runs language)
+   math (EXPR _tmp "${MULTIPASS_TEST_COUNT} + 1") # Why can't I add to a cache variable?
+   set (MULTIPASS_TEST_COUNT ${_tmp} CACHE INTERNAL "Unique test ID")
+   set (testname MULTIPASS_TEST_${MULTIPASS_TEST_COUNT}_${runs})
+-  set (testdir ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeTmp)
++  set (testdir ${PROJECT_BINARY_DIR}/PETSC_test)
++  if (NOT EXISTS ${testdir})
++    file(MAKE_DIRECTORY ${testdir})
++  endif ()
+   set (CMAKE_REQUIRED_INCLUDES ${includes})
+   set (CMAKE_REQUIRED_LIBRARIES ${libraries})
+   # if MPI is available, use it for the test
+@@ -148,24 +151,38 @@ macro (MULTIPASS_SOURCE_RUNS includes libraries source runs language)
+     set (REQUIRED_COMPILER ${CMAKE_${language}_COMPILER})
+   endif ()
+   if(${language} STREQUAL "C")
+-    file(WRITE ${testdir}/src.c "${source}")
+-    try_run(${testname} _compiles ${testdir} ${testdir}/src.c
+-            CMAKE_FLAGS -DCMAKE_C_COMPILER=${REQUIRED_COMPILER} -DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}
+-            LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+-  elseif(${language} STREQUAL "CXX")
+-    file(WRITE ${testdir}/src.cxx "${source}")
+-    try_run(${testname} _compiles ${testdir} ${testdir}/src.cxx
+-            CMAKE_FLAGS -DCMAKE_CXX_COMPILER=${REQUIRED_COMPILER} -DINCLUDE_DIRECTORIES=${CMAKE_REQUIRED_INCLUDES}
+-            LINK_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES})
+-  endif()
+-  # ${testname} is the exit code returned by try_run,
+-  # so 0 is success and anything else is a failure.
+-  if (${testname})
+-    set (${runs} FALSE)
++    set (extension c)
+   else ()
++    set (extension cxx)
++  endif ()
++  # Create simple test code
++  file(WRITE ${testdir}/src.${extension} "${source}")
++  # Create a CMakeLists.txt file for the test code
++  file(WRITE ${testdir}/CMakeLists.txt
++    "cmake_minimum_required(VERSION 3.5)\n"
++    "project(ctest ${language})\n"
++    "set(CMAKE_VERBOSE_MAKEFILE ON)\n"
++    "set(CMAKE_${language}_COMPILER \"${REQUIRED_COMPILER}\")\n"
++    "set(CMAKE_${language}_FLAGS \"${CMAKE_${language}_FLAGS}\")\n"
++    "include_directories(${CMAKE_REQUIRED_INCLUDES})\n"
++    "add_executable(ctest src.${extension})\n"
++    "target_link_libraries(ctest ${CMAKE_REQUIRED_LIBRARIES})\n")
++  # Attempt to compile the test code
++  try_compile(${testname} ${testdir} ${testdir} ctest
++    OUTPUT_VARIABLE _output)
++  # Write output compiling the test code
++  file(WRITE ${testdir}/src.out "${_output}")
++  # To ensure we do not use stuff from the previous attempts,
++  # we must remove the CMakeFiles directory.
++  file(REMOVE_RECURSE ${testdir}/CMakeFiles)
++  # Process test result
++  if (${testname})
+     set (${runs} TRUE)
++  else ()
++    set (${runs} FALSE)
+   endif ()
+   unset (_compiles)
++  unset (_output)
+ endmacro (MULTIPASS_SOURCE_RUNS)
+ 
+ 

spack_repo/local/packages/sundials/nvector-pic.patch

@@ -0,0 +1,24 @@
+diff -ruN spack-src/examples/nvector/CMakeLists.txt spack-src-patched/examples/nvector/CMakeLists.txt
+--- spack-src/examples/nvector/CMakeLists.txt	2022-04-22 16:55:14.000000000 +0000
++++ spack-src-patched/examples/nvector/CMakeLists.txt	2022-08-03 16:34:47.789320825 +0000
+@@ -25,6 +25,10 @@
+ 
+ # Build the nvector test utilities
+ add_library(test_nvector_obj OBJECT test_nvector.c)
++if(BUILD_SHARED_LIBS)
++  # need PIC when shared libs are used since the example executables will link to the shared lib
++  set_property(TARGET test_nvector_obj PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++endif()
+ target_link_libraries(test_nvector_obj PRIVATE sundials_nvecserial)
+ 
+ if(ENABLE_MPI AND MPI_C_FOUND)
+@@ -33,6 +37,9 @@
+   add_subdirectory(mpiplusx)
+   # Build the mpi nvector test utilities
+   add_library(test_nvectormpi_obj OBJECT test_mpinvector.c)
++  if(BUILD_SHARED_LIBS)
++    set_property(TARGET test_nvectormpi_obj PROPERTY POSITION_INDEPENDENT_CODE TRUE)
++  endif()
+   target_link_libraries(test_nvectormpi_obj PRIVATE MPI::MPI_C sundials_nvecparallel)
+ endif()
+ add_subdirectory(manyvector)