Fix ButterflyPACK superbuild and bump to v4.1.0#667
Merged
Conversation
740536e to
d532109
Compare
5c721a5 to
a519458
Compare
6e8dd11 to
9b4810b
Compare
590a701 to
cf975ce
Compare
The ButterflyPACK patch failed to apply because the diff context targeted a stale line number from an older commit. This updates ButterflyPACK to v4.1.0 and fixes three build issues exposed by the upgrade: - Regenerate patch_build.diff for v4.1.0 line numbers - Set cmake_minimum_required to 3.5...4.0 for CMake 4.x compat - Add HOST_NAME_MAX portability define for macOS in CPPWrapper.cpp - Guard unguarded omp_get_wtime()/omp_get_thread_num() calls in BPACK_factor.f90 with #ifdef HAVE_OPENMP Closes #663
Add ButterflyPACK to the STRUMPACK coverage build so the superbuild patch is tested in CI.
cf975ce to
436de71
Compare
auto-merge was automatically disabled
June 25, 2026 22:16
Rebase failed
This file contains hidden or 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
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 ButterflyPACK patch fails to apply because the diff context targeted a stale line number from an older commit.
This bumps ButterflyPACK to the v4.1.0 tagged release and regenerates the patch to fix build issues exposed by the upgrade:
patch_build.difffor v4.1.0 contextcmake_minimum_requiredto3.5...4.0for CMake 4.x compatibilityHOST_NAME_MAXportability define for macOS inCPPWrapper.cppomp_get_wtime()/omp_get_thread_num()calls inBPACK_factor.f90with#ifdef HAVE_OPENMPso builds withPALACE_WITH_OPENMP=OFFcompile correctlyAlso enables ButterflyPACK in the CI coverage build (gcc/openmpi/strumpack) to prevent future bitrot.
Fixes #663