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
[AA] Add auto augmentation wrapper #4694
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
11e5ba6
Add auto augmentation wrapper and utils
stiepan ecce2a7
Enable the auto_aug tests in qa
stiepan ad07193
Fix linting issues in tests, enforce el-wise equality in tests
stiepan 30f1c1d
Replace explicit random_sign with signed_bin call to enable hoisting …
stiepan File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
from nvidia.dali.auto_aug.core._augmentation import signed_bin, Augmentation as _Augmentation | ||
from nvidia.dali.auto_aug.core.decorator import augmentation | ||
|
||
__all__ = ("signed_bin", "augmentation", "_Augmentation") |
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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,87 @@ | ||
# Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
# | ||
# Licensed under the Apache License, Version 2.0 (the "License"); | ||
# you may not use this file except in compliance with the License. | ||
# You may obtain a copy of the License at | ||
# | ||
# http://www.apache.org/licenses/LICENSE-2.0 | ||
# | ||
# Unless required by applicable law or agreed to in writing, software | ||
# distributed under the License is distributed on an "AS IS" BASIS, | ||
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
# See the License for the specific language governing permissions and | ||
# limitations under the License. | ||
|
||
import inspect | ||
|
||
|
||
class MissingArgException(Exception): | ||
|
||
def __init__(self, message, augmentation, missing_args): | ||
super().__init__(message) | ||
self.augmentation = augmentation | ||
self.missing_args = missing_args | ||
|
||
|
||
class UnusedArgException(Exception): | ||
|
||
def __init__(self, message, unused_args): | ||
super().__init__(message) | ||
self.unused_args = unused_args | ||
|
||
|
||
def filter_extra_accepted_kwargs(fun, kwargs, skip_positional=0): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I am asking for docs as the name can be understood as removing the extra kwargs that are accepted rather than obtaining them. |
||
sig = inspect.signature(fun) | ||
# the params from signature with up to skip_positional filtered out | ||
# (less only if there is not enough of positional args) | ||
params = [(name, param) for i, (name, param) in enumerate(sig.parameters.items()) | ||
if i >= skip_positional or param.kind not in | ||
[inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.POSITIONAL_ONLY]] | ||
extra = [ | ||
name for (name, param) in params | ||
if param.kind in [inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.KEYWORD_ONLY] | ||
] | ||
return {name: value for name, value in kwargs.items() if name in extra} | ||
|
||
|
||
def get_required_kwargs(fun, skip_positional=0): | ||
sig = inspect.signature(fun) | ||
# the params from signature with up to skip_positional filtered out | ||
# (less only if there is not enough of positional args) | ||
params = [(name, param) for i, (name, param) in enumerate(sig.parameters.items()) | ||
if i >= skip_positional or param.kind not in | ||
[inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.POSITIONAL_ONLY]] | ||
return [ | ||
name for name, param in params if param.default is inspect.Parameter.empty | ||
and param.kind in [inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.KEYWORD_ONLY] | ||
] | ||
|
||
|
||
def get_num_positional_args(fun): | ||
sig = inspect.signature(fun) | ||
return len([ | ||
name for name, param in sig.parameters.items() if param.kind in | ||
[inspect.Parameter.POSITIONAL_OR_KEYWORD, inspect.Parameter.POSITIONAL_ONLY] | ||
]) | ||
|
||
|
||
def get_missing_kwargs(fun, kwargs, skip_positional=0): | ||
required = get_required_kwargs(fun, skip_positional=skip_positional) | ||
return [name for name in required if name not in kwargs] | ||
|
||
|
||
def filter_unused_args(augmentations, kwargs): | ||
used_kwargs = set(kwarg_name for augment in augmentations | ||
for kwarg_name in filter_extra_accepted_kwargs(augment.op, kwargs, 2)) | ||
return [kwarg_name for kwarg_name in kwargs if kwarg_name not in used_kwargs] | ||
|
||
|
||
def forbid_unused_kwargs(augmentations, kwargs, call_name): | ||
unused_args = filter_unused_args(augmentations, kwargs) | ||
if unused_args: | ||
subject, verb = ("kwarg", "is") if len(unused_args) == 1 else ("kwargs", "are") | ||
unused_kwargs_str = ", ".join(unused_args) | ||
raise UnusedArgException( | ||
f"The {call_name} got unexpected {subject}. " | ||
f"The {subject} `{unused_kwargs_str}` {verb} not used by any of the augmentations.", | ||
unused_args=unused_args) |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please add docs to this module