sundials: add v7.1.1, v6.7.0, v5.8.0, add optional deps, fix CMake names

recipes/sundials/all/conan-cuda-support.cmake

@@ -0,0 +1,9 @@
+find_dependency(CUDAToolkit REQUIRED)
+
+target_link_libraries(SUNDIALS::nveccuda INTERFACE CUDA::cudart)
+if(TARGET SUNDIALS::sunmatrixcusparse)
+    target_link_libraries(SUNDIALS::sunmatrixcusparse INTERFACE CUDA::cusparse)
+endif()
+if(TARGET SUNDIALS::sunlinsolcusolversp)
+    target_link_libraries(SUNDIALS::sunlinsolcusolversp INTERFACE CUDA::cusolver)
+endif()

recipes/sundials/all/conandata.yml

@@ -1,4 +1,13 @@
 sources:
+  "7.1.1":
+    url: "https://github.com/LLNL/sundials/releases/download/v7.1.1/sundials-7.1.1.tar.gz"
+    sha256: "ea7d6edfb52448ddfdc1ec48f89a721fe6c0a259c10f8ef56f60fcded87a94bb"
+  "6.7.0":
+    url: "https://github.com/LLNL/sundials/releases/download/v6.7.0/sundials-6.7.0.tar.gz"
+    sha256: "5f113a1564a9d2d98ff95249f4871a4c815a05dbb9b8866a82b13ab158c37adb"
+  "5.8.0":
+    url: "https://github.com/LLNL/sundials/releases/download/v5.8.0/sundials-5.8.0.tar.gz"
+    sha256: "d4ed403351f72434d347df592da6c91a69452071860525385b3339c824e8a213"
   "5.4.0":
     url: "https://github.com/LLNL/sundials/releases/download/v5.4.0/sundials-5.4.0.tar.gz"
     sha256: "a60ba8155ca12261cf7623efcf9fd4232e95bcfefe480993ef71324176cb395b"

recipes/sundials/all/test_package/CMakeLists.txt

@@ -1,7 +1,13 @@
-cmake_minimum_required(VERSION 3.1)
+cmake_minimum_required(VERSION 3.15)
 project(test_package LANGUAGES C)
 
-find_package(sundials REQUIRED CONFIG)
+find_package(SUNDIALS REQUIRED CONFIG)
 
-add_executable(${PROJECT_NAME} test_package.c)
+# SUNDIALS v6.0.0 introduced a new SUNContext object on which all other SUNDIALS objects depend
+# and is not backwards compatible.
+if(SUNDIALS_VERSION GREATER_EQUAL 6)
+    add_executable(${PROJECT_NAME} test_package_v6.c)
+else()
+    add_executable(${PROJECT_NAME} test_package_v5.c)
+endif()
 target_link_libraries(${PROJECT_NAME} PRIVATE sundials::sundials)

recipes/sundials/all/test_package/conanfile.py

@@ -6,8 +6,7 @@
 
 class TestPackageConan(ConanFile):
     settings = "os", "arch", "compiler", "build_type"
-    generators = "CMakeDeps", "CMakeToolchain", "VirtualRunEnv"
-    test_type = "explicit"
+    generators = "CMakeDeps", "CMakeToolchain"
 
     def layout(self):
         cmake_layout(self)
@@ -22,5 +21,5 @@ def build(self):
 
     def test(self):
         if can_run(self):
-            bin_path = os.path.join(self.cpp.build.bindirs[0], "test_package")
+            bin_path = os.path.join(self.cpp.build.bindir, "test_package")
             self.run(bin_path, env="conanrun")

recipes/sundials/all/test_package/test_package.c → recipes/sundials/all/test_package/test_package_v5.c

@@ -10,7 +10,7 @@ int main()
   SUNMatrix A = SUNDenseMatrix(1, 1);
   SUNLinearSolver LS = SUNLinSol_Dense(y, A);
 
-  N_Vector v = N_VNew_Serial(1);;
+  N_Vector v = N_VNew_Serial(1);
   N_VScale(2.0, y, v);
   return 0;
 }

recipes/sundials/all/test_package/test_package_v6.c

@@ -0,0 +1,18 @@
+#include <nvector/nvector_serial.h>
+#include <sunmatrix/sunmatrix_dense.h>
+#include <sunlinsol/sunlinsol_dense.h>
+#include <sundials/sundials_types.h>
+
+int main()
+{
+  SUNContext sunctx;
+  SUNContext_Create(0, &sunctx);
+  N_Vector y = N_VNew_Serial(1, sunctx);
+  NV_DATA_S(y)[0] = 2.0;
+  SUNMatrix A = SUNDenseMatrix(1, 1, sunctx);
+  SUNLinearSolver LS = SUNLinSol_Dense(y, A, sunctx);
+
+  N_Vector v = N_VNew_Serial(1, sunctx);
+  N_VScale(2.0, y, v);
+  return 0;
+}

recipes/sundials/config.yml

@@ -1,4 +1,10 @@
 versions:
+  "7.1.1":
+    folder: all
+  "6.7.0":
+    folder: all
+  "5.8.0":
+    folder: all
   "5.4.0":
     folder: all
   "5.3.0":