Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-39122: Remove UnresolvedRefWarning filters #236

Merged
merged 2 commits into from May 17, 2023
Merged

Conversation

andy-slac
Copy link
Collaborator

Additionally PreExecInit is cleaned up to always expect resolved refs in quantum graph and use those refs to store initOutputs. CmdLineFwk now checks that output runs on command line and in graph are consistent.

Checklist

  • ran Jenkins
  • added a release note for user-visible changes to doc/changes

@codecov
Copy link

codecov bot commented May 14, 2023

Codecov Report

Patch coverage: 72.15% and project coverage change: +0.06 🎉

Comparison is base (45d0adf) 84.41% compared to head (7e0685b) 84.48%.

Additional details and impacted files
@@            Coverage Diff             @@
##             main     #236      +/-   ##
==========================================
+ Coverage   84.41%   84.48%   +0.06%     
==========================================
  Files          50       50              
  Lines        4621     4557      -64     
  Branches      826      817       -9     
==========================================
- Hits         3901     3850      -51     
+ Misses        531      517      -14     
- Partials      189      190       +1     
Impacted Files Coverage Δ
python/lsst/ctrl/mpexec/cli/opt/options.py 100.00% <ø> (ø)
python/lsst/ctrl/mpexec/cmdLineFwk.py 58.87% <40.00%> (-3.42%) ⬇️
python/lsst/ctrl/mpexec/preExecInit.py 73.09% <71.42%> (+3.79%) ⬆️
python/lsst/ctrl/mpexec/singleQuantumExecutor.py 69.91% <75.00%> (+0.85%) ⬆️
python/lsst/ctrl/mpexec/mock_task.py 86.04% <100.00%> (-0.77%) ⬇️
python/lsst/ctrl/mpexec/mpGraphExecutor.py 86.97% <100.00%> (-0.17%) ⬇️

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

python/lsst/ctrl/mpexec/preExecInit.py Outdated Show resolved Hide resolved
python/lsst/ctrl/mpexec/singleQuantumExecutor.py Outdated Show resolved Hide resolved
Additionally PreExecInit is cleaned up to always expect resolved refs
in quantum graph and use those refs to store initOutputs. `CmdLineFwk`
now checks that output runs on command line and in graph are consistent.
@andy-slac
Copy link
Collaborator Author

andy-slac commented May 15, 2023

@TallJimbo, could you check my last commit 6e7444c (replaces 18faa70) which removes skip-existing-in from SingleQuantumExecutor (and replaces it with extend_run option). I re-started Jenkins to see if it breaks anything.

Copy link
Member

@TallJimbo TallJimbo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good to me, and I think it's important that we get the behavior here consistent with the pipetask CLI docs (as this does). But the Prompt Processing Framework also uses some of these lower-level Python interfaces (via SeparablePipelineExecutor) now, so I'd also like to hear from @kfindeisen on whether there are any changes here that would be problematic, particularly:

  • There's a new mandatory extend_run argument to SeparablePipelineExecutor construction.
  • --clobber-outputs without --skip-existing is no longer possible.

python/lsst/ctrl/mpexec/cli/opt/options.py Show resolved Hide resolved
python/lsst/ctrl/mpexec/singleQuantumExecutor.py Outdated Show resolved Hide resolved
Copy link
Member

@kfindeisen kfindeisen left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for pointing me to this PR, @TallJimbo! I do have some questions about the implications for Prompt Processing, since (for performance reasons) we use runs in a very different pattern from batch processing.

python/lsst/ctrl/mpexec/separablePipelineExecutor.py Outdated Show resolved Hide resolved
python/lsst/ctrl/mpexec/separablePipelineExecutor.py Outdated Show resolved Hide resolved
python/lsst/ctrl/mpexec/singleQuantumExecutor.py Outdated Show resolved Hide resolved
SingleQuantumExecutor is updated to use resolved references and
`Datastore.mexist()` method when searching for existing quantum outputs.
The search is now done only in output run instead of all collections
defined in `skip_existing_in` (GraphBuilder will skip quanta with existing
outputs from that list).

SingleQuantumExecutor will clobber full existing outputs if `clobber_outputs`
is set and `skip_existing_in` does not include output run. `CmdLineFwk`
always adds output run to `skip_existing_in` if `extend_run` is set, but
`SeparablePipelineExecutor` has more open configuration.
Copy link
Member

@TallJimbo TallJimbo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. Sorry I helped send you off on a wild-goose chase in the middle of this.

@andy-slac andy-slac merged commit c57ef26 into main May 17, 2023
10 of 11 checks passed
@andy-slac andy-slac deleted the tickets/DM-39122 branch May 17, 2023 23:33
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants