Link granular libneo sub-targets (decompose-neo-core)#435
Open
krystophny wants to merge 4 commits into
Open
Conversation
Required by itpplasma/libneo#275 which moved VMEC support files into a dedicated sub-target.
Replace LIBNEO::neo with the specific sub-targets simple needs: coordinates (libneo_coordinates, transitively vmec_support/interpolate/ nctools/util), field (neo_biotsavart), odeint (odeint_allroutines_sub), and util (libneo_kinds).
main now uses libneo boozer_sub, field_base, field_vmec and vmec_field_eval modules directly (SIMPLE copies dropped in cb64f23), which the LIBNEO::neo umbrella previously provided. Add the matching granular sub-targets so the build resolves those modules without the umbrella.
Member
Author
|
Merged main; resolved python/CMakeLists.txt conflict by keeping main's canonical_coordinates_mod path fallback, and added LIBNEO::boozer, LIBNEO::magnetic_field_base, LIBNEO::vmec_field to the granular link set since main now consumes those libneo modules directly. |
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.
Summary
Matches libneo
dep-audit/decompose-neo-core, which splits the monolithicLIBNEO::neoumbrella into granular sub-targets. Thesimplelibrary now links only what it uses:LIBNEO::coordinatesforlibneo_coordinates,vmec_coordinates,cylindrical_cartesian(pullsvmec_support,interpolate,nctools,utiltransitively, coveringnew_vmec_stuff_mod,spline_vmec_sub,spl_three_to_five_sub, etc.)LIBNEO::fieldforneo_biotsavartLIBNEO::odeintforodeint_allroutines_subLIBNEO::utilforlibneo_kindsThe umbrella
LIBNEO::neois no longer needed.Verification
Built against libneo
dep-audit/decompose-neo-core(Release, gfortran). Before addingLIBNEO::odeint:After the final sub-target set: build green (
Linking Fortran static library src/libsimple.a, all executables linked, exit 0). Fast/unit ctest suite: 40/40 pass (test_chartmap_pipelinepasses in 43.7 s standalone; only flagged a 60 s ctest timeout under full-jparallel load, not a correctness failure).