fix: apply only supported attributes from resources decorator in batch #1586
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
…e supported ones.
saikonen
changed the title
|
also relates to #1609 |
| @@ -109,6 +109,11 @@ def compute_resource_attributes(decos, compute_deco, resource_defaults): | |||
| # We use the non None value if there is only one or the larger value | |||
| # if they are both non None. Note this considers "" to be equivalent to | |||
| # the value zero. | |||
| # | |||
| # Skip attributes that are not supported by the decorator. | |||
| if k not in [*resource_defaults.keys(), *deco.attributes.keys()]: | |||
There was a problem hiding this comment.
nit: this will be recomputed everytime. May be better to make it a set initially and then compare for inclusion. Here for every k, we will recompute the full list.
This also doesn't seem to do what the comment says. My understanding was that it would only let through attributes that are known to, for example, the batch decorator (that's the resource_defaults part) whereas here it lets through anything that is known to the batch_decorator OR the resources decorator which seems to not be exactly what we want (ie: no real different from what it currently is.
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.
Changes the way
BatchDecoratorpulls values fromResourcesDecoratorif any are set. This limits the values to only ones supported throughresource_defaultsin batchdeco.Should unblock #1500 which currently breaks for batch as it introduces a
disk=attribute which is not supported for the batch deco, yet gets pulled in by the current implementation.