Skip to content

SuiteSparse 7.10.1 wrappers and simpliefied wrapper generator process #608

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 3 commits into from
Mar 13, 2025
Merged

SuiteSparse 7.10.1 wrappers and simpliefied wrapper generator process #608

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ac4ed1f
Decouple the wrapper generation from Julia version
Mar 12, 2025
2f82ecb
Update Makefile
Mar 12, 2025
d349453
Update Makefile
Mar 12, 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
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Pkg = "<0.0.1, 1"
Printf = "<0.0.1, 1"
Random = "<0.0.1, 1"
Serialization = "<0.0.1, 1"
SuiteSparse_jll = "7.8.0"
SuiteSparse_jll = "7.10.1"
Test = "<0.0.1, 1"
julia = "1.11"

Expand Down
1 change: 1 addition & 0 deletions gen/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SuiteSparse*
13 changes: 13 additions & 0 deletions gen/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
VER=7.10.1

all: clean download
mkdir -p SuiteSparse-$(VER)
cd SuiteSparse-$(VER) && tar -zxvf ../SuiteSparse.v$(VER).x86_64-linux-gnu.tar.gz
julia --project -e "using Pkg; Pkg.instantiate()"
julia --project generator.jl ./SuiteSparse-$(VER)

clean:
rm -fr *.tar.gz SuiteSparse*

download:
curl -L -O https://github.com/JuliaBinaryWrappers/SuiteSparse_jll.jl/releases/download/SuiteSparse-v$(VER)%2B0/SuiteSparse.v$(VER).x86_64-linux-gnu.tar.gz
11 changes: 3 additions & 8 deletions gen/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,10 @@
# How to auto-generate the wrappers

1. `cd` to this directory
2. run `julia --project generator.jl`, then you could find the updated wrappers in the `lib` folder
2. Update the SuiteSparse version in `Makefile`
3. run `make`, then you could find the updated wrappers in the `lib` folder

## How to upgrade SuiteSparse_jll

1. update `SuiteSparse_jll` in Yggdrasil to the desired version
2. `cd` to this directory
3. run `julia --project generator.jl <SuiteSparse artifact directory>`

## How to upgrade Clang.jl
# How to upgrade Clang.jl

1. `cd` to this directory
2. if you want to change major version, change the compat bound in `Project.toml`.
Expand Down
16 changes: 8 additions & 8 deletions src/solvers/wrappers.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3364,13 +3364,13 @@ const CHOLMOD_INT = 0

const CHOLMOD_LONG = 2

const CHOLMOD_DATE = "June 20, 2024"
const CHOLMOD_DATE = "Feb 20, 2025"

const CHOLMOD_MAIN_VERSION = 5

const CHOLMOD_SUB_VERSION = 3

const CHOLMOD_SUBSUB_VERSION = 0
const CHOLMOD_SUBSUB_VERSION = 1

SUITESPARSE_VER_CODE(main, sub) = main * 1000 + sub

Expand Down Expand Up @@ -3404,23 +3404,23 @@ const SUITESPARSE_COMPILER_XLC = 0

const SUITESPARSE_TIME = SuiteSparse_time()

const SUITESPARSE_DATE = "Oct 10, 2024"
const SUITESPARSE_DATE = "Mar 6, 2025"

const SUITESPARSE_MAIN_VERSION = 7

const SUITESPARSE_SUB_VERSION = 8
const SUITESPARSE_SUB_VERSION = 10

const SUITESPARSE_SUBSUB_VERSION = 3
const SUITESPARSE_SUBSUB_VERSION = 1

const SUITESPARSE_VERSION = SUITESPARSE_VER_CODE(7, 8)
const SUITESPARSE_VERSION = SUITESPARSE_VER_CODE(7, 10)

function SUITESPARSE__VERCODE(main, sub, patch)
return (main * Culonglong(1000) + sub) * Culonglong(1000) + patch
end

const SUITESPARSE__VERSION = SUITESPARSE__VERCODE(7, 8, 3)
const SUITESPARSE__VERSION = SUITESPARSE__VERCODE(7, 10, 1)

const CHOLMOD__VERSION = SUITESPARSE__VERCODE(5, 3, 0)
const CHOLMOD__VERSION = SUITESPARSE__VERCODE(5, 3, 1)

const CHOLMOD_DEVICE_SUPERNODE_BUFFERS = 6

Expand Down
Loading