Update SuiteSparse to 7.5.1 with embedded Metis #125
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
After the SuiteSparse 7.5.1 upgrade the following SourceWrappers error because of missing referenced files. Remove them. - amd: remove SourceWrappers/amd_global.c - camd: remove SourceWrappers/camd_global.c - UMFPACK: remove SourceWrappers/umfpack_gn_global.o.c
The upstream SuiteSparse 7.5.1 project now includes the metis project as a subfolder of the `CHOLMOD` module with the name `SuiteSparse_metis`. This copy is modified by the project to the point, that external metis versions probably won't work anymore and the included copy only works for the `CHOLMOD` module. Therefore use Metis as private dependency and remove the `SuiteSparse::metis` target from the installed targets. The following changes have been done to the cmake project files: - SuiteSparse: Metis is CHOLMOD private dependency now, don't install - SuiteSparse: metis include only needed for CHOLMOD - cholmod: glob c files, remove wrappers, use metis directly - SPQR: remove metis linkage - config: remove export of SuiteSparse::metis target, internal only - remove SuiteSparse_LINKER_METIS_LIBS and SuiteSparse_EXPORTED_METIS_LIBS
Disable the SuiteSparse tic-toc timer. This functionality is primarily used by debugging and examples. SuiteSparse still works without them. As the timer support produces issues on `MSVC` disable them globally.
Since the upgrade to SuiteSparse 7.5.1 the `cs.h` file in upstream is created by CMake from the `cs.h.in` template. To limit the CMake code just use the checked in `cs.h`. But the checked in `cs.h` has complex support enabled by default, which is a problem for `MSVC` builds. So for now disable the complex support in the checked in `cs.h` and also remove the possibility to change it from CMake by options. The following changes have been done to the CMake project: - CXSparse: disable complex usage in cs.h - cmake: CXSparse: use c files directly, not SourceWrappers - cmake: CXSparse: no complex support, hard coded - cmake: SuiteSparse: no complex support, remove option
- fixes Metis based segmentation fault [#123](#123) - remove `SuiteSparse::metis` target as Metis is now a private dependency of `CHOLMOD` module - remove option `METIS_DIR` - always compile `SuiteSparse_config` with `-DNTIMER` disabling tic-toc support - compile `CXSparse` without complex support - remove SourceWrappers for `CHOLMOD` and `CXSparse` modules
NeroBurner
force-pushed
the
suitesparse_7.5.1
branch
from
48dc50e
to
4060280
Compare
|
squashed the log commits to have one clean commit that changes the changelog entry |
jlblancoc
reviewed
Jan 22, 2024
There was a problem hiding this comment.
Great work!
I just can't check all upstream changes, but if CI is happy and you checked it, I'm more than happy!
On deleting the new modules... Once the commit is there, it won't save disk/repo space unless force pushes are used, so I tend to think it's better to just live with them for now.
jlblancoc
approved these changes
Jan 22, 2024
There was a problem hiding this comment.
Great work!
I just can't check all upstream changes, but if CI is happy and you checked it, I'm more than happy!
On deleting the new modules... Once the commit is there, it won't save disk/repo space unless force pushes are used, so I tend to think it's better to just live with them for now.
This was referenced Jan 22, 2024
Closed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The following big changes have been done:
SuiteSparse::metistarget as Metis is now a private dependency ofCHOLMODmoduleMETIS_DIRSuiteSparse_configwith-DNTIMERdisabling tic-toc supportCXSparsewithout complex supportCHOLMODandCXSparsemodulesThe changes are split up into fitting commits with more information on the specific change.
Should we just remove the new not (by us) supported SuiteSparse modules to save space?