Let a pipe declare which config keys receive the calibration file - #1814
Open
mattdawkins wants to merge 1 commit into
Open
Let a pipe declare which config keys receive the calibration file#1814mattdawkins wants to merge 1 commit into
mattdawkins wants to merge 1 commit into
Conversation
Stereo calibration was bound to two hardcoded keys, measurer:calibration_file
and calibration_reader:file. Pipes whose calibration consumer is neither of
those (e.g. depth_map:computer:ocv_stereo_disparity:calibration_file) had no
way to receive it, and routing it through a $CONFIG{global:...} indirection
does not work: macros expand at parse time with backward references only,
while -s blocks are appended last, so the override never reaches the process.
Add a '# Calibration Keys: <k> [k...]' header, parsed on both server and
desktop, naming the consuming process keys directly. Unset keeps the two
conventional keys, so existing pipes are unaffected.
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
1 participant
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.
Stereo calibration was bound to two hardcoded keys,
measurer:calibration_fileandcalibration_reader:file. Pipes whose calibration consumer is neither of those had no way to receive it.Routing it through a
$CONFIG{global:...}indirection does not work: kwiver expands macros at parse time with backward references only (bakery_base.cxx:189-211), while-sblocks are appended last (pipeline_builder.cxx:131-173), so the override never reaches the process.# Calibration Keys: <k> [k...]header naming the consuming process keys directly, parsed on both server (pipeline_discovery.py) and desktop (common.ts)append_stereo_calibration_kwiver_settingsemits one-sper declared key; unset keeps the two conventional keys, so existing pipes are unaffectedPaired with VIAME/VIAME#dev/measurement-calibration-passdown, which declares the header on the measurement and ifremer stereo pipes.
Tests added for declared-keys emission, default fallback, and header parsing.