Fix Sundials API integration for version 6.6

Project.toml

@@ -23,8 +23,8 @@ DiffEqBase = "6.154"
 PrecompileTools = "1"
 Reexport = "1.0"
 SciMLBase = "2.9"
-Sundials_jll = "5.2"
-julia = "1.9"
+Sundials_jll = "6.6"
+julia = "1.10"
 
 [extras]
 AlgebraicMultigrid = "2169fc97-5a83-5252-b627-83903c6c433c"

fix_sunlinsol_libs.jl

@@ -0,0 +1,60 @@
+#!/usr/bin/env julia
+
+# Script to fix libsundials_sunlinsol references in generated API files
+
+# Read the file
+api_file = "src/lib/libsundials_api_rewrite.jl"
+content = read(api_file, String)
+
+# Define linsol library mapping
+linsol_mappings = [
+    # Dense linear solvers
+    (r"(:SUNLinSol_Dense[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsoldense"),
+
+    # Band linear solvers
+    (r"(:SUNLinSol_Band[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolband"),
+
+    # LAPACK band linear solvers
+    (r"(:SUNLinSol_LapackBand[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsollapackband"),
+
+    # LAPACK dense linear solvers
+    (r"(:SUNLinSol_LapackDense[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsollapackdense"),
+
+    # KLU linear solvers
+    (r"(:SUNLinSol_KLU[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolklu"),
+
+    # PCG linear solvers
+    (r"(:SUNLinSol_PCG[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolpcg"),
+    (r"(:SUNLinSolSetInfoFile_PCG[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolpcg"),
+    (r"(:SUNLinSolSetPrintLevel_PCG[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolpcg"),
+
+    # SPBCGS linear solvers
+    (r"(:SUNLinSol_SPBCGS[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolspbcgs"),
+    (r"(:SUNLinSolSetInfoFile_SPBCGS[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolspbcgs"),
+    (r"(:SUNLinSolSetPrintLevel_SPBCGS[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolspbcgs"),
+
+    # SPFGMR linear solvers
+    (r"(:SUNLinSol_SPFGMR[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolspfgmr"),
+    (r"(:SUNLinSolSetInfoFile_SPFGMR[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolspfgmr"),
+    (r"(:SUNLinSolSetPrintLevel_SPFGMR[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolspfgmr"),
+
+    # SPGMR linear solvers
+    (r"(:SUNLinSol_SPGMR[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolspgmr"),
+    (r"(:SUNLinSolSetInfoFile_SPGMR[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolspgmr"),
+    (r"(:SUNLinSolSetPrintLevel_SPGMR[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolspgmr"),
+
+    # SPTFQMR linear solvers
+    (r"(:SUNLinSol_SPTFQMR[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolsptfqmr"),
+    (r"(:SUNLinSolSetInfoFile_SPTFQMR[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolsptfqmr"),
+    (r"(:SUNLinSolSetPrintLevel_SPTFQMR[^,]*,\s*)libsundials_sunlinsol", s"\1libsundials_sunlinsolsptfqmr"),
+]
+
+# Apply all replacements
+for (pattern, replacement) in linsol_mappings
+    global content = replace(content, pattern => replacement)
+end
+
+# Write back
+write(api_file, content)
+
+println("Fixed libsundials_sunlinsol references in $api_file")

fix_sunmatrix_libs.jl

@@ -0,0 +1,50 @@
+#!/usr/bin/env julia
+
+# Script to fix libsundials_sunmatrix references in generated API files
+
+# Read the file
+api_file = "src/lib/libsundials_api_rewrite.jl"
+content = read(api_file, String)
+
+# Replace dense matrix functions
+content = replace(content, r"(:SUNDenseMatrix[^,]*,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+content = replace(content, r"(:SUNMatGetID_Dense,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+content = replace(content, r"(:SUNMatClone_Dense,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+content = replace(content, r"(:SUNMatDestroy_Dense,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+content = replace(content, r"(:SUNMatZero_Dense,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+content = replace(content, r"(:SUNMatCopy_Dense,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+content = replace(content, r"(:SUNMatScaleAdd_Dense,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+content = replace(content, r"(:SUNMatScaleAddI_Dense,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+content = replace(content, r"(:SUNMatMatvec_Dense,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+content = replace(content, r"(:SUNMatSpace_Dense,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixdense")
+
+# Replace band matrix functions
+content = replace(content, r"(:SUNBandMatrix[^,]*,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+content = replace(content, r"(:SUNMatGetID_Band,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+content = replace(content, r"(:SUNMatClone_Band,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+content = replace(content, r"(:SUNMatDestroy_Band,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+content = replace(content, r"(:SUNMatZero_Band,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+content = replace(content, r"(:SUNMatCopy_Band,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+content = replace(content, r"(:SUNMatScaleAdd_Band,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+content = replace(content, r"(:SUNMatScaleAddI_Band,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+content = replace(content, r"(:SUNMatMatvec_Band,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+content = replace(content, r"(:SUNMatSpace_Band,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixband")
+
+# Replace sparse matrix functions  
+content = replace(content, r"(:SUNSparseMatrix[^,]*,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNSparseFromDenseMatrix,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNSparseFromBandMatrix,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNMatGetID_Sparse,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNMatClone_Sparse,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNMatDestroy_Sparse,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNMatZero_Sparse,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNMatCopy_Sparse,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNMatScaleAdd_Sparse,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNMatScaleAddI_Sparse,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNMatMatvec_Sparse,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+content = replace(content, r"(:SUNMatSpace_Sparse,\s*)libsundials_sunmatrix" => s"\1libsundials_sunmatrixsparse")
+
+# Write back
+write(api_file, content)
+
+println("Fixed libsundials_sunmatrix references in $api_file")

fix_sunnonlinsol_libs.jl

@@ -0,0 +1,29 @@
+#!/usr/bin/env julia
+
+# Script to fix libsundials_sunnonlinsol references in generated API files
+
+# Read the file
+api_file = "src/lib/libsundials_api_rewrite.jl"
+content = read(api_file, String)
+
+# Define nonlinsol library mapping
+nonlinsol_mappings = [
+    # Fixed point nonlinear solver
+    (r"(:SUNNonlinSol_FixedPoint[^,]*,\s*)libsundials_sunnonlinsol", s"\1libsundials_sunnonlinsolfixedpoint"),
+
+    # Newton nonlinear solver
+    (r"(:SUNNonlinSol_Newton[^,]*,\s*)libsundials_sunnonlinsol", s"\1libsundials_sunnonlinsolnewton"),
+
+    # Generic SUNNonlinSol functions (keep with base library)
+    # These are kept as-is since they're part of the base sunnonlinsol library
+]
+
+# Apply all replacements
+for (pattern, replacement) in nonlinsol_mappings
+    global content = replace(content, pattern => replacement)
+end
+
+# Write back
+write(api_file, content)
+
+println("Fixed libsundials_sunnonlinsol references in $api_file")

gen/Project.toml

@@ -4,4 +4,6 @@ MLStyle = "d8e11817-5142-5d16-987a-aa16d5891078"
 Sundials_jll = "fb77eaff-e24c-56d4-86b1-d163f2edb164"
 
 [compat]
-Clang = "0.14.0"
+Clang = "0.18"
+Sundials_jll = "6.6"
+julia = "1.10"

gen/generate.jl

@@ -236,15 +236,15 @@ include_dir = joinpath(Sundials_jll.artifact_dir, "include") |> normpath
 
 artifact_toml = joinpath(dirname(pathof(Sundials_jll.SuiteSparse_jll)), "..",
     "StdlibArtifacts.toml")
-suitespase_dir = Pkg.Artifacts.ensure_artifact_installed("SuiteSparse", artifact_toml)
-suitespase_include_sir = joinpath(suitespase_dir, "include")
+suitesparse_dir = Pkg.Artifacts.ensure_artifact_installed("SuiteSparse", artifact_toml)
+suitesparse_include_sir = joinpath(suitesparse_dir, "include")
 
 # wrapper generator options
 options = load_options(joinpath(@__DIR__, "generate.toml"))
 
 # add compiler flags, e.g. "-DXXXXXXXXX"
 args = get_default_args()
-push!(args, "-I$include_dir", "-isystem$suitespase_include_sir")
+push!(args, "-I$include_dir", "-isystem$suitesparse_include_sir")
 
 library_names = Dict(raw"sundials[\\/].+" => "libsundials_sundials",
     raw"sunnonlinsol[\\/].+" => "libsundials_sunnonlinsol",

gen/generate.toml

@@ -2,8 +2,8 @@
 library_name = "" # depends on header file
 # library_names = {}\
 # output_file_path = "../lib/file.jl"
-output_api_file_path = "../lib/libsundials_api.jl"
-output_common_file_path = "../lib/libsundials_common.jl"
+output_api_file_path = "../src/lib/libsundials_api.jl"
+output_common_file_path = "../src/lib/libsundials_common.jl"
 prologue_file_path = "prologue.jl"
 # epilogue_file_path = "epilogue.jl"
 use_julia_native_enum_type = false

gen/rewrite.sh

@@ -0,0 +1,10 @@
+cat libsundials_api.jl | \
+    perl -pe 's/ARKRhsFn_wrapper//g' | \
+    perl -pe 's/CVRhsFn_wrapper//g' | \
+    perl -pe 's/CVRootFn_wrapper//g' | \
+    perl -pe 's/IDAResFn_wrapper//g' | \
+    perl -pe 's/IDARootFn_wrapper//g' | \
+    perl -pe 's/KINSysFn_wrapper//g' | \
+    perl -pe 's/ARKRhsFn_wrapper//g' | \
+    perl -pe 's/convert\(N_Vector, (.+)\)/$1/g' \
+    > libsundials_api_rewrite.jl