Skip to content

Switch suitesparse to v7.8.3 #38

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 10 commits into from
May 6, 2025
Merged

Switch suitesparse to v7.8.3 #38

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
b30646c
Switch version
kratman Apr 29, 2025
764ccfc
Fix include path
kratman Apr 29, 2025
887169b
Update build scripts
kratman Apr 29, 2025
dd253d9
Get rid of excess script
kratman Apr 29, 2025
e0dd25a
Minor patch
kratman Apr 29, 2025
69b1ce1
Revert change
kratman Apr 29, 2025
f061544
Apply suggestions from code review
kratman Apr 29, 2025
4b3f8d8
Update .github/workflows/build_wheels.yml
kratman Apr 29, 2025
b5b13ae
Put script changes back
kratman Apr 29, 2025
34bc3ef
Re-trigger ci
kratman Apr 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/build_wheels.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ jobs:
submodules: 'true'
- uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12

- name: Build wheels on Windows
run: pipx run cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -59,7 +59,7 @@ jobs:

- uses: actions/setup-python@v5
with:
python-version: 3.11
python-version: 3.12

- name: Build wheels on Linux
run: pipx run cibuildwheel --output-dir wheelhouse
Expand Down Expand Up @@ -95,7 +95,7 @@ jobs:
submodules: 'true'
- uses: actions/setup-python@v5
with:
python-version: '3.11'
python-version: 3.12

- name: Install cibuildwheel
run: python -m pip install cibuildwheel
Expand Down
10 changes: 5 additions & 5 deletions install_KLU_Sundials.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,13 @@


def build_solvers():
SUITESPARSE_VERSION = "6.0.3"
SUNDIALS_VERSION = "6.5.0"
SUITESPARSE_VERSION = "7.8.3"
SUITESPARSE_URL = f"https://github.com/DrTimothyAldenDavis/SuiteSparse/archive/v{SUITESPARSE_VERSION}.tar.gz"
SUNDIALS_URL = f"https://github.com/LLNL/sundials/releases/download/v{SUNDIALS_VERSION}/sundials-{SUNDIALS_VERSION}.tar.gz"
SUITESPARSE_CHECKSUM = (
"7111b505c1207f6f4bd0be9740d0b2897e1146b845d73787df07901b4f5c1fb7"
"ce39b28d4038a09c14f21e02c664401be73c0cb96a9198418d6a98a7db73a259"
)
SUNDIALS_VERSION = "6.5.0"
SUNDIALS_URL = f"https://github.com/LLNL/sundials/releases/download/v{SUNDIALS_VERSION}/sundials-{SUNDIALS_VERSION}.tar.gz"
SUNDIALS_CHECKSUM = (
"4e0b998dff292a2617e179609b539b511eb80836f5faacf800e688a886288502"
)
Expand Down Expand Up @@ -81,7 +81,7 @@ def install_sundials(download_dir, install_dir):
# Ex: if install_dir -> "/usr/local/" then
# KLU_INCLUDE_DIR -> "/usr/local/include"
# KLU_LIBRARY_DIR -> "/usr/local/lib"
KLU_INCLUDE_DIR = os.path.join(install_dir, "include")
KLU_INCLUDE_DIR = os.path.join(install_dir, "include", "suitesparse")
KLU_LIBRARY_DIR = os.path.join(install_dir, "lib")
cmake_args = [
"-DENABLE_LAPACK=ON",
Expand Down
4 changes: 2 additions & 2 deletions install_sundials.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ function extract {
tar -xf $1
}

SUITESPARSE_VERSION=6.0.3
SUITESPARSE_VERSION=7.8.3
SUNDIALS_VERSION=6.5.0

SUITESPARSE_ROOT_ADDR=https://github.com/DrTimothyAldenDavis/SuiteSparse/archive
Expand Down Expand Up @@ -69,7 +69,7 @@ yum -y install openblas-devel

mkdir -p build_sundials
cd build_sundials
KLU_INCLUDE_DIR=/usr/local/include
KLU_INCLUDE_DIR=/usr/local/include/suitesparse
KLU_LIBRARY_DIR=/usr/local/lib
SUNDIALS_DIR=sundials-$SUNDIALS_VERSION
cmake -DENABLE_LAPACK=ON\
Expand Down
2 changes: 2 additions & 0 deletions vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,14 @@
"kind": "git",
"repository": "https://github.com/pybamm-team/sundials-vcpkg-registry.git",
"baseline": "13d432fcf5da8591bb6cb2d46be9d6acf39cd02b",
"reference": "13d432fcf5da8591bb6cb2d46be9d6acf39cd02b",
"packages": ["sundials"]
},
{
"kind": "git",
"repository": "https://github.com/pybamm-team/casadi-vcpkg-registry.git",
"baseline": "e4b797736790af90de505e0296b07e87719cb1a6",
"reference": "e4b797736790af90de505e0296b07e87719cb1a6",
"packages": ["casadi"]
}
]
Expand Down
Loading