Fix Uniform discrete distribution #2635
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
Signed-off-by: Joaquin Anton <janton@nvidia.com>
JanuszL
approved these changes
Jan 25, 2021
mzient
reviewed
Jan 25, 2021
dali/pipeline/operator/arg_helper.h
Outdated
| @@ -116,7 +116,7 @@ class ArgValue { | |||
| DALI_ENFORCE(is_uniform(view_.shape) && expected_shape == view_.shape[0], | |||
| make_string("Expected uniform shape for argument \"", arg_name_, | |||
| "\" but got shape ", view_.shape)); | |||
| } else { | |||
| } else if (view_.empty()) { | |||
There was a problem hiding this comment.
- It assumes that non-tensor data is constant (and we may change that at some point)
- It validates the hidden (and dangerous) assumption that Acquire is no-op - I think that hoisting this logic outside of Acquire violates encapsulation of ArgValue.
- It makes clear that the way we obtain non-tensor arguments is inefficient, as it results in reallocation of the internal vector - use TryGetArgument / TryGetRepeatedArgument which will resize and populate an existing vector.
Signed-off-by: Joaquin Anton <janton@nvidia.com>
jantonguirao
force-pushed
the
fix_uniform_discrete
branch
from
fcdbf0e
to
fbc56d6
Compare
mzient
reviewed
Jan 25, 2021
Comment on lines
121
to
122
| per_sample_values_.resize(nsamples); | ||
| per_sample_nvalues_.resize(nsamples); |
There was a problem hiding this comment.
Suggested change
| per_sample_values_.resize(nsamples); | |
| per_sample_nvalues_.resize(nsamples); | |
| per_sample_values_.resize(values_.size()); | |
| per_sample_nvalues_.resize(values_.size()); |
There was a problem hiding this comment.
and similarly in the loops below
Signed-off-by: Joaquin Anton <janton@nvidia.com>
jantonguirao
force-pushed
the
fix_uniform_discrete
branch
from
55b7876
to
aa1bb5a
Compare
|
!build |
|
CI MESSAGE: [2015068]: BUILD STARTED |
|
CI MESSAGE: [2015068]: BUILD FAILED |
Signed-off-by: Joaquin Anton <janton@nvidia.com>
jantonguirao
commented
Jan 26, 2021
| @@ -83,17 +83,17 @@ TEST(ArgValue, TensorInput_3D) { | |||
|
|
|||
| TEST(ArgValueTests, Constant_0D) { | |||
| int nsamples = 5; | |||
| auto spec = OpSpec("opname").AddArg("argname", 0.123f); | |||
| ArgValue<float, 0> arg("argname", spec); | |||
| auto spec = OpSpec("Erase").AddArg("shape", 0.123f); | |||
There was a problem hiding this comment.
Note: Using TryGetArgument* required that the spec points to an existing operator.
mzient
approved these changes
Jan 26, 2021
|
!build |
|
CI MESSAGE: [2015569]: BUILD STARTED |
|
CI MESSAGE: [2015569]: 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.
Signed-off-by: Joaquin Anton janton@nvidia.com
Why we need this PR?
Pick one, remove the rest
What happened in this PR?
Fill relevant points, put NA otherwise. Replace anything inside []
An extra ArgValue Acquire call every iteration was overriding the values pointer inside ArgValue implementation while the per_sample_values data was kept unmodified due to the assumption that the pointer won't change.
As a solution, we Acquire the values only once when a non-tensor argument is given
Using TryGetArgument/TryGetRepeatedArgument to avoid reallocation
Uniform distribution and other operators using ArgValue
All
Added niter to uniform tests
N/A
JIRA TASK: [DALI-1824