Skip to content

Commit 210f2c7

Browse files
authored
SuiteSparse: update to v7.5.1-1 (#737)
Update the SuiteSparse version to `v7.5.1-1`. This fixes a segementation fault when using ceres-solver solver type `NESDIS`. See: jlblancoc/suitesparse-metis-for-windows#123 Use METIS_IDXTYPEWIDTH=64, as with v7.5.1 SuiteSparse upstream has incorporated Metis sources into the Cholmod module and made it a private dependency with the 64bit width requirement.
1 parent 77f696e commit 210f2c7

File tree

2 files changed

+20
-2
lines changed

2 files changed

+20
-2
lines changed

cmake/configs/default.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ hunter_default_version(SimpleSignal VERSION 0.0.0-79c3f68-p1)
155155
hunter_default_version(Snappy VERSION 1.1.7)
156156
hunter_default_version(Sober VERSION 0.1.3)
157157
hunter_default_version(Sqlpp11 VERSION 0.57-p0)
158-
hunter_default_version(SuiteSparse VERSION 5.4.0-2)
158+
hunter_default_version(SuiteSparse VERSION 7.5.1-1)
159159
hunter_default_version(TCLAP VERSION 1.2.2-p1)
160160
hunter_default_version(TIFF VERSION 4.0.2-p5)
161161
hunter_default_version(Tesseract VERSION 3.05.01-hunter-3)

cmake/projects/SuiteSparse/hunter.cmake

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,17 @@ hunter_add_version(
8585
c85cc6149dc44e7d351b5549c6e23a53ff94bc23
8686
)
8787

88+
hunter_add_version(
89+
PACKAGE_NAME
90+
SuiteSparse
91+
VERSION
92+
"7.5.1-1"
93+
URL
94+
"https://github.com/jlblancoc/suitesparse-metis-for-windows/archive/refs/tags/v7.5.1-1.tar.gz"
95+
SHA1
96+
82d7c5f577694472a6ba1d7967625c043d4ab816
97+
)
98+
8899
if(HUNTER_SuiteSparse_VERSION VERSION_LESS 5.4.0)
89100
set(_SuiteSparse_BUILD_METIS NO)
90101
set(_SuiteSparse_WITH_OPENBLAS NO)
@@ -95,13 +106,20 @@ else()
95106
# f2c-converted LAPACK v3.9.0 implementation, making the build C++ only
96107
set(_SuiteSparse_WITH_OPENBLAS YES)
97108
endif()
109+
if(HUNTER_SuiteSparse_VERSION VERSION_LESS 7.5.1)
110+
# since 5.4.0-2, needed for compatibility with ceres-solver 2.2.0
111+
set(_SuiteSparse_METIS_IDXTYPEWIDTH 32)
112+
else()
113+
# since SuiteSparse 7.5.1-1 metis is internal only and requires 64 bit
114+
set(_SuiteSparse_METIS_IDXTYPEWIDTH 64)
115+
endif()
98116

99117
hunter_cmake_args(
100118
SuiteSparse
101119
CMAKE_ARGS
102120
BUILD_METIS=${_SuiteSparse_BUILD_METIS}
103121
WITH_OPENBLAS=${_SuiteSparse_WITH_OPENBLAS}
104-
METIS_IDXTYPEWIDTH=32 # since 5.4.0-2, needed for compatibility with ceres-solver 2.2.0
122+
METIS_IDXTYPEWIDTH=${_SuiteSparse_METIS_IDXTYPEWIDTH}
105123
HUNTER_INSTALL_LICENSE_FILES=LICENSE.md
106124
)
107125

0 commit comments

Comments
 (0)