Update suitesparse and sundials for windows

CMakeLists.txt

@@ -168,22 +168,28 @@ endif ()
 
 set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 # Sundials
-find_package(SUNDIALS REQUIRED)
-message("SUNDIALS found in ${SUNDIALS_INCLUDE_DIR}: ${SUNDIALS_LIBRARIES}")
+if (DEFINED VCPKG_ROOT_DIR)
+    find_package(SUNDIALS CONFIG REQUIRED)
+else ()
+    find_package(SUNDIALS REQUIRED)
+    message("SUNDIALS found in ${SUNDIALS_INCLUDE_DIR}: ${SUNDIALS_LIBRARIES}")
+endif ()
 target_include_directories(idaklu PRIVATE ${SUNDIALS_INCLUDE_DIR})
 target_link_libraries(idaklu PRIVATE ${SUNDIALS_LIBRARIES} casadi)
 
 # link suitesparse
 # if using vcpkg, use config mode to
 # find suitesparse. Otherwise, use FindSuiteSparse module
 if (DEFINED VCPKG_ROOT_DIR)
-    find_package(SuiteSparse CONFIG REQUIRED)
+    find_package(KLU REQUIRED)
+    include_directories(${KLU_INCLUDE_DIRS})
+    target_link_libraries(idaklu PRIVATE ${KLU_LIBRARIES})
 else ()
     find_package(SuiteSparse REQUIRED)
     message("SuiteSparse found in ${SuiteSparse_INCLUDE_DIRS}: ${SuiteSparse_LIBRARIES}")
+    include_directories(${SuiteSparse_INCLUDE_DIRS})
+    target_link_libraries(idaklu PRIVATE ${SuiteSparse_LIBRARIES})
 endif ()
-include_directories(${SuiteSparse_INCLUDE_DIRS})
-target_link_libraries(idaklu PRIVATE ${SuiteSparse_LIBRARIES})
 
 # IREE (MLIR compiler and runtime library) build settings
 if (${PYBAMM_IDAKLU_EXPR_IREE} STREQUAL "ON")

FindSuiteSparse.cmake

@@ -39,7 +39,7 @@
 
 find_package(BLAS QUIET)
 
-# look for desired componenents
+# look for desired components
 set(SUITESPARSE_COMPONENTS ${SuiteSparse_FIND_COMPONENTS})
 
 # resolve inter-component dependencies
@@ -217,7 +217,7 @@ if(SuiteSparse_FOUND)
   set(SuiteSparse_INCLUDE_DIRS ${SUITESPARSE_INCLUDE_DIR})
   # log result
   file(APPEND ${CMAKE_BINARY_DIR}${CMAKE_FILES_DIRECTORY}/CMakeOutput.log
-    "Determining location of SuiteSparse succeded:\n"
+    "Determining location of SuiteSparse succeeded:\n"
     "Include directory: ${SuiteSparse_INCLUDE_DIRS}\n"
     "Library directory: ${SuiteSparse_LIBRARIES}\n\n")
   set(SuiteSparse_COMPILER_FLAGS)

install_KLU_Sundials.py

@@ -80,9 +80,9 @@ def install_sundials():
             "-DCMAKE_INSTALL_NAME_DIR=" + KLU_LIBRARY_DIR,
         ]
 
-        # try to find OpenMP on mac
+        # try to find OpenMP on Mac
         if platform.system() == "Darwin":
-            # flags to find OpenMP on mac
+            # flags to find OpenMP on Mac
             if platform.processor() == "arm":
                 OpenMP_C_FLAGS = (
                     "-Xpreprocessor -fopenmp -I/opt/homebrew/opt/libomp/include"
@@ -118,14 +118,9 @@ def install_sundials():
 
         build_dir = pathlib.Path("build_sundials")
         if not os.path.exists(build_dir):
-            print("\n-" * 10, "Creating build dir", "-" * 40)
             os.makedirs(build_dir)
-
         sundials_src = "../sundials"
-        print("-" * 10, "Running CMake prepare", "-" * 40)
         subprocess.run(["cmake", sundials_src, *cmake_args], cwd=build_dir, check=True)
-
-        print("-" * 10, "Building SUNDIALS", "-" * 40)
         make_cmd = ["make", f"-j{cpu_count()}", "install"]
         subprocess.run(make_cmd, cwd=build_dir, check=True)
 
@@ -147,6 +142,10 @@ def check_libraries_installed():
             sundials_files = [file + ".so" for file in sundials_files]
         elif platform.system() == "Darwin":
             sundials_files = [file + ".dylib" for file in sundials_files]
+        else:
+            raise NotImplementedError(
+                f"Unsupported operating system: {platform.system()}. This script currently supports only Linux and macOS."
+            )
         sundials_lib_found = True
         # Check for SUNDIALS libraries in each directory
         for lib_file in sundials_files:

vcpkg-configuration.json

@@ -7,16 +7,9 @@
     {
       "kind": "git",
       "repository": "https://github.com/pybamm-team/sundials-vcpkg-registry.git",
-      "baseline": "13d432fcf5da8591bb6cb2d46be9d6acf39cd02b",
-      "reference": "13d432fcf5da8591bb6cb2d46be9d6acf39cd02b",
+      "baseline": "d8a1a872520d414f588c78ac34373e3b4fc91fbd",
+      "reference": "d8a1a872520d414f588c78ac34373e3b4fc91fbd",
       "packages": ["sundials"]
-    },
-    {
-      "kind": "git",
-      "repository": "https://github.com/pybamm-team/casadi-vcpkg-registry.git",
-      "baseline": "e4b797736790af90de505e0296b07e87719cb1a6",
-      "reference": "e4b797736790af90de505e0296b07e87719cb1a6",
-      "packages": ["casadi"]
     }
   ]
 }

vcpkg.json

@@ -2,11 +2,19 @@
   "name": "pybammsolvers",
   "version-string": "0.1.0",
   "dependencies": [
-    "casadi",
+    {
+      "name": "casadi"
+    },
     {
       "name": "sundials",
       "default-features": false,
       "features": ["klu"]
     }
+  ],
+  "overrides": [
+    {
+      "name": "casadi",
+      "version": "3.6.7"
+    }
   ]
 }