Improve support for DALI enum types #5422
Merged
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
Support for DALI enum types (DALIDataType, DALIImageType, DALIInterpType) is added to Constant, Cast, Choice and Copy operators. Thanks to Constant op support, followin syntax will work now: ``` fn.random.choice([types.DALIInterpType.INTERP_LINEAR, types.DALIInterpType.INTERP_NN]) ``` allowing convenient selection of enum parameters. Casting support is allowed only between non-fp types and enums. Explicit error is raised when the enums are used with buffer protcol (conversion to numpy, printing etc) - Python expectes pointer-to-object representation there, while we return them as C-style enums with numeric value under the hood. As an alternative we can allow to just access the underlying data but I have chosen a bit more restricive approach for now. Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
klecki
commented
Apr 11, 2024
| @@ -19,6 +19,7 @@ | |||
| #include "dali/kernels/common/utils.h" | |||
| #include "dali/kernels/kernel.h" | |||
| #include "dali/kernels/dynamic_scratchpad.h" | |||
| #include "dali/pipeline/data/types.h" | |||
There was a problem hiding this comment.
I need to pull the pipeline/data/types.h into kernel implementation here, to be able to instantiate the kernel for the DALIDataType etc.
Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
|
!build |
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
|
CI MESSAGE: [14198822]: BUILD STARTED |
|
!build |
|
CI MESSAGE: [14199589]: BUILD STARTED |
|
CI MESSAGE: [14199589]: BUILD FAILED |
banasraf
approved these changes
Apr 15, 2024
Signed-off-by: Krzysztof Lecki <klecki@nvidia.com>
|
!build |
|
CI MESSAGE: [14246341]: BUILD STARTED |
szkarpinski
approved these changes
Apr 15, 2024
|
CI MESSAGE: [14246341]: BUILD PASSED |
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.
Category: New feature
Description:
Support for DALI enum types (DALIDataType, DALIImageType, DALIInterpType) is added to Constant, Cast, Choice and Copy operators.
Thanks to Constant op support, followin syntax will work now:
allowing convenient selection of enum parameters.
Constant promotions insert constant nodes automatically.
When types.Constant is used, for true scalars the ScalarConstant placeholder is typically created.
For enum values we always use proper constant node as enums are not usable in artihmetic operations
and this is the main target of ScalarConstant.
Casting support is allowed only between non-fp types and enums.
Explicit error is raised when the enums are used with buffer protcol (conversion to numpy, printing etc) - Python expectes pointer-to-object representation there, while we return them as C-style enums with numeric value under the hood.
As an alternative we can allow to just access the underlying data but I have chosen a bit more restricive approach for now.
The values indicating the enum types were exposed in type hints for DALIDataType.
__rerp__of Tensor and TensorList is adjusted to not access the underlying data (it is shown only for__str__).It invokes buffer protocol to show the summary of data contents and in this case it is not possible. As the repr
is used in Python-produced errors, the actual error might have been obscured by trying to access data.
Additional information:
Affected modules and functionalities:
Enum support, type hints, several operators.
Key points relevant for the review:
Are there any additional operators that we might want to cover?
Equal/not equal comparisons between enum values?
Tests:
Checklist
Documentation
DALI team only
Requirements
REQ IDs: N/A
JIRA TASK: N/A