Fix optional modifier dependencies being unloaded for delayed composites #754
Conversation
This file contains 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
stickler-ci
reviewed
May 6, 2019
Codecov Report
@@ Coverage Diff @@
## master #754 +/- ##
=========================================
+ Coverage 80.68% 80.7% +0.01%
=========================================
Files 149 149
Lines 21650 21677 +27
=========================================
+ Hits 17469 17495 +26
- Misses 4181 4182 +1
Continue to review full report at Codecov.
|
mraspaud
requested changes
May 6, 2019
satpy/scene.py
Outdated
| @@ -765,7 +771,9 @@ def _get_prereq_datasets(self, comp_id, prereq_nodes, keepables, skip=False): | |||
| LOG.debug("Delaying generation of %s because of dependency's delayed generation: %s", comp_id, prereq_id) | |||
| if not skip: | |||
| LOG.debug("Missing prerequisite for '{}': '{}'".format(comp_id, prereq_id)) | |||
There was a problem hiding this comment.
In this case, the prerequisite isn't missing, it is delayed. Could we modify the debug message to differentiate from where the prereq is actually missing ?
satpy/scene.py
Outdated
| @@ -788,12 +796,20 @@ def _generate_composite(self, comp_node, keepables): | |||
| compositor, prereqs, optional_prereqs = comp_node.data | |||
|
|
|||
| try: | |||
| missing_prereq = False | |||
There was a problem hiding this comment.
Here again, I would use 'missing', maybe delayed_prereq ?
mraspaud
approved these changes
May 6, 2019
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.
I noticed this while working with MERSI-2 data where some resolutions and modifiers didn't work out as desired and required composites to be delayed until after resampling. The basic idea is:
The issue is that in step 3 we aren't processing optional dependencies so they are never marked as "keepable". This results in optional dependencies being removed and not being available when the composite's generation is re-attempted after resampling.
git diff origin/master -- "*py" | flake8 --diff