Casadi issues

Author: kratman

.github/workflows/build_wheels.yml

@@ -39,7 +39,7 @@ jobs:
             CMAKE_GENERATOR_PLATFORM=x64
           CIBW_ARCHS: AMD64
           CIBW_BEFORE_ALL_WINDOWS: >
-            vcpkg install blas &&
+            vcpkg install blas casadi &&
             python install_KLU_Sundials.py
           CIBW_BEFORE_BUILD: python -m pip install setuptools delvewheel
           CIBW_REPAIR_WHEEL_COMMAND: delvewheel repair --add-path C:/Windows/System32 -w {dest_dir} {wheel}

CMakeLists.txt

@@ -147,8 +147,11 @@ set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${PROJECT_SOURCE_DIR})
 find_package(SUNDIALS REQUIRED)
 message("SUNDIALS found in ${SUNDIALS_INCLUDE_DIR}: ${SUNDIALS_LIBRARIES}")
 target_include_directories(idaklu PRIVATE ${SUNDIALS_INCLUDE_DIR})
-target_link_libraries(idaklu PRIVATE ${SUNDIALS_LIBRARIES} casadi::casadi)
-
+if (MSVC)
+    target_link_libraries(idaklu PRIVATE ${SUNDIALS_LIBRARIES} casadi::casadi)
+else ()
+    target_link_libraries(idaklu PRIVATE ${SUNDIALS_LIBRARIES} casadi)
+endif ()
 find_package(SuiteSparse REQUIRED)
 message("SuiteSparse found in ${SuiteSparse_INCLUDE_DIRS}: ${SuiteSparse_LIBRARIES}")
 include_directories(${SuiteSparse_INCLUDE_DIRS})

install_KLU_Sundials.py

@@ -218,9 +218,9 @@ def install_sundials():
         ["cmake", sundials_src, *cmake_args], cwd=build_dir.as_posix(), check=True
     )
     if platform.system() == "Windows":
-        make_cmd = ["msbuild.exe", "ALL_BUILD.vcxproj"]
+        make_cmd = ["msbuild", "ALL_BUILD.vcxproj"]
         subprocess.run(make_cmd, cwd=build_dir.as_posix(), check=True)
-        make_cmd = ["msbuild.exe", "INSTALL.vcxproj"]
+        make_cmd = ["msbuild", "INSTALL.vcxproj"]
         subprocess.run(make_cmd, cwd=build_dir.as_posix(), check=True)
     else:
         make_cmd = ["make", f"-j{cpu_count()}", "install"]

noxfile.py

@@ -53,6 +53,6 @@ def run_pybamm_requires(session):
 def run_unit(session):
     set_environment_variables(PYBAMM_ENV, session=session)
     session.install("setuptools", silent=False)
-    session.install("casadi==3.7.0", silent=False)
+    session.install("casadi==3.6.7", silent=False)
     session.install(".[dev]", silent=False)
     session.run("pytest", "tests")

pyproject.toml

@@ -2,7 +2,7 @@
 requires = [
     "setuptools",
     # On Windows, use the CasADi vcpkg registry and CMake bundled from MSVC
-    "casadi==3.7.0; platform_system!='Windows'",
+    "casadi==3.6.7; platform_system!='Windows'",
     # Note: the version of CasADi as a build-time dependency should be matched
     # cross platforms, so updates to its minimum version here should be accompanied
     # by a version bump in https://github.com/pybamm-team/casadi-vcpkg-registry.
@@ -17,7 +17,7 @@ requires-python = ">=3.10,<3.13"
 license-files = ["LICENSE"]
 dynamic = ["version", "readme"]
 dependencies = [
-    "casadi==3.7.0",
+    "casadi==3.6.7",
     "numpy<2.0"
 ]