Repository navigation
extern: improves the handling of external dependencies in a conda environment - #38
Merged
Conversation
…ed exception (adds the exception registry + coverage warning; pyre is now a canonical recipe)
…squatting on the canonical C libyaml name (also fixes the macports/dpkg recipe keys and cantera dependency), freeing yaml for a future libyaml external
…s) as sentinels whose absence on incpath proves breakage; civilized packages carry the <pkg>/ prefix, flat ones use the bare filename
….h> include resolves against the include/cspice subdir conda relocates it into (works out of the box on conda; source/macports/ubuntu treated as later bugs)
…rify) that probes the resolved incpath/libpath, so it honors adhoc overrides a package-database check cannot see
…tale pre-rename leftover; extern.load only includes init.mm + rules.mm), and drop the stray summit comment/debug lines
…om yaml-cpp; conda/macports/dpkg recipes + yaml.h marker; self-add uses filter not findstring so it does not collide with the yaml-cpp substring
…xtern-pile membership, eliminating name collisions like metis/parmetis and yaml/yaml-cpp; covers all 36 self-add lines plus extern.is.supported/available (mpi flavor checks left as-is, no overlap)
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.
Completes the conda package-database rework: guarantees every supported external is accounted for, lets mm verify that a configured package can actually be compiled and linked against, and fixes two latent config bugs found along the way.
Built as five focused commits.
a) Recipe coverage + exception registry (
d0c881f)Every package under
make/extern/must now be either a_condaRecipesentry or a registered_condaExceptionsentry (with a reason); a stray directory triggers ajournal.warningat--pkgdb=conda --setup(warn, never block). Exceptions:fmm3d/libtorch(user-managed),summit(source-only),p2(pyre-next sandbox),fortran(toolchain pseudo-package, contributes the compiler's fortran runtime at link time).pyreis now a canonical recipe — it is on conda-forge — but absence from a conda env is a silent omission, never a disable, so source installs are unaffected.b) Per-package header markers (
83c88d6)Each package declares
<pkg>.markers.headers— non-exhaustive header sentinels whose absence onincpathproves breakage. A marker is the#includestring relative to incpath, so the one field handles both layouts: civilized packages carry the prefix (gsl/gsl_version.h), flat ones use the bare name (SpiceUsr.h). Link markers already existed as<pkg>.libraries.b.1) cspice works out of the box on conda (
2adef99)CSPICE includes its headers flat (
<SpiceUsr.h>), but conda relocates them intoinclude/cspice/. New_emitCondaCspicehandler reads the install manifest and emitscspice.incpath ?= $(conda.prefix)/include/cspice(collapses toincludefor a flat source install). Source/macports/ubuntu refinements deferred as later bugs.yaml → yaml-cpp rename (
15a25f8)make/extern/yamlwas actually yaml-cpp squatting on the canonical Clibyamlname (it caused a false-positive conda match againstlibyaml). Renamed the dir + variable prefix, dropped the vestigialflavorhack, fixed the recipe key in all three package managers (conda/macports/dpkg) and cantera's dependency. Freesyamlfor a future real libyaml external (TODO).c) Marker verification (
2a3d4d8)mm extern.<pkg>.verify(full report) andmm extern.verify(verified/broken lists, likeextern.info). It probes${wildcard incpath/marker}for headers and globslib<name>.{so,dylib,a}overlibpathfor libraries. Crucially it reads the resolved make variables, so it honors anything overridden in the adhoc~/.config/mmconfig — which a package-database-time check cannot see. Scoped to the project's loaded externs, consistent with the existing per-packageinfotargets.Verification
pyre(source-installed) verifies clean via its resolved override path; a forced badincpathcorrectly reportsunresolved headers.cspiceemitsinclude/cspiceand its bare marker resolves there.extern.info/extern.verifywork.Follow-ups (not in this PR)
yamlexternal.make/extern/fmm3d/info.mm→rules.mm(stale pre-rename leftover, never loaded).pyre/externalsdiscovery philosophy back into the pyre framework.