Repository navigation
Fix CI (Swiss FEL build) when catalyst is disabled - #604
Merged
Merged
Conversation
aaadelmann
self-requested a review
September 22, 2026 11:15
Collaborator
Author
|
cscs-ci run cscs-ci-gh200, cscs-ci-mi300, cscs-ci-openmp |
aaadelmann
approved these changes
Sep 22, 2026
biddisco
enabled auto-merge
September 23, 2026 09:02
biddisco
force-pushed
the
cmake-alps
branch
2 times, most recently
from
September 28, 2026 08:44
a58903b to
e2dd5d5
Compare
biddisco
force-pushed
the
cmake-alps
branch
from
September 28, 2026 08:49
e2dd5d5 to
628c097
Compare
drxm1
added a commit
to drxm1/ipplf
that referenced
this pull request
Sep 29, 2026
Conflicts: - cmake/Dependencies.cmake - demos/fel/Config.h Integrate upstream/chdr at 207d181, including the chdr mesh and configuration work, FEL updates and documentation. Preserved the master changes previously merged into the fork's chdr branch, including the typo in demos/fel/Config.h and the poorly formatted files that clang-format and cmake-format did not like. This commit was called with the `--no-verify` argument to prevent the formatting checks. Resolved the Catalyst-related conflicts by: - Loading Catalyst when IPPL_ENABLE_CATALYST or IPPL_ENABLE_CHDR is enabled, since CHDR currently uses Catalyst's bundled Conduit parser. - Preserving the build behavior that FEL doesn't require Catalyst introduced by upstream PR IPPL-framework#604. - Retained the conditional compilation guards in FEL Config.h together with upstream chdr's new documentation. - Left the typo in demos/fel/Config.h introduced in IPPL-framework#604 there.
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
2 participants
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.
Flyby - fix an openblas hint path for better find_package .... for BLAS