Skip to content

Fix ButterflyPACK superbuild and bump to v4.1.0#667

Merged
hughcars merged 4 commits into
mainfrom
hughcars/butterflypack-cmake-buildfix
Jun 26, 2026
Merged

Fix ButterflyPACK superbuild and bump to v4.1.0#667
hughcars merged 4 commits into
mainfrom
hughcars/butterflypack-cmake-buildfix

Conversation

@hughcars

@hughcars hughcars commented Mar 11, 2026

Copy link
Copy Markdown
Collaborator

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:

  • Regenerate patch_build.diff for v4.1.0 context
  • Set cmake_minimum_required to 3.5...4.0 for CMake 4.x compatibility
  • 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 so builds with PALACE_WITH_OPENMP=OFF compile correctly

Also enables ButterflyPACK in the CI coverage build (gcc/openmpi/strumpack) to prevent future bitrot.

Fixes #663

@hughcars hughcars force-pushed the hughcars/butterflypack-cmake-buildfix branch 5 times, most recently from 740536e to d532109 Compare March 18, 2026 20:25
@hughcars hughcars force-pushed the hughcars/butterflypack-cmake-buildfix branch 3 times, most recently from 5c721a5 to a519458 Compare June 9, 2026 03:07
@hughcars hughcars added the no-long-tests This PR does not require the long tests to be merged label Jun 9, 2026
@hughcars hughcars force-pushed the hughcars/butterflypack-cmake-buildfix branch 2 times, most recently from 6e8dd11 to 9b4810b Compare June 17, 2026 18:15
@hughcars hughcars force-pushed the hughcars/butterflypack-cmake-buildfix branch 3 times, most recently from 590a701 to cf975ce Compare June 23, 2026 14:34
@hughcars hughcars marked this pull request as ready for review June 23, 2026 17:06
hughcars added 3 commits June 23, 2026 13:06
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.
@hughcars hughcars force-pushed the hughcars/butterflypack-cmake-buildfix branch from cf975ce to 436de71 Compare June 23, 2026 17:06
@hughcars hughcars enabled auto-merge (rebase) June 23, 2026 17:06
auto-merge was automatically disabled June 25, 2026 22:16

Rebase failed

@hughcars hughcars merged commit 3562c05 into main Jun 26, 2026
69 checks passed
@hughcars hughcars deleted the hughcars/butterflypack-cmake-buildfix branch June 26, 2026 13:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

no-long-tests This PR does not require the long tests to be merged

Projects

None yet

Development

Successfully merging this pull request may close these issues.

Error when buildin with ButterflyPACK

1 participant