Resampling ND - ground work #1366
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
|
!build |
|
CI MESSAGE: [940918]: BUILD STARTED |
| * @remarks The function clamps input coordinates to fit in range defined by `in` dimensions. | ||
| * Scales can be negative to achieve flipping. | ||
| */ | ||
| template <typename Out, typename In, int n> |
There was a problem hiding this comment.
nitpick: rename n to spatial_ndim for consistency
| const OutTensorCPU<SampleBlockInfo, 1> &sample_lookup) { | ||
| assert(sample_lookup.shape[0] >= total_blocks.pass[0] + total_blocks.pass[1]); | ||
| int blocks_in_all_passes = 0; |
There was a problem hiding this comment.
idea: surround this by #if DALI_DEBUG
|
CI MESSAGE: [940918]: BUILD PASSED |
JanuszL
reviewed
Oct 14, 2019
| @@ -92,7 +87,7 @@ __global__ void BatchedSeparableResampleKernel( | |||
| } | |||
| break; | |||
| case ResamplingFilterType::Linear: | |||
| if (axis == 1) { | |||
| if (axis == spatial_ndim - 1) { | |||
| LinearHorz(x0, x1, y0, y1, origin, scale, sample_out, out_stride, sample_in, in_stride, | |||
There was a problem hiding this comment.
Now this Horz/Vert naming is a bit misleading.
There was a problem hiding this comment.
idea: you could have some constants to make this more readable:
(e.g kHorizontalAxis = 0 and kHorizontalDim = spatial_ndim - 1)
JanuszL
reviewed
Oct 14, 2019
mzient
force-pushed
the
VolumeResample
branch
from
d9a40d6
to
7d3e448
Compare
|
!build |
|
CI MESSAGE: [943957]: BUILD STARTED |
|
CI MESSAGE: [943957]: BUILD PASSED |
jantonguirao
approved these changes
Oct 15, 2019
JanuszL
approved these changes
Oct 17, 2019
klecki
reviewed
Oct 25, 2019
| @@ -81,6 +81,8 @@ struct ResamplingParams { | |||
| }; | |||
|
|
|||
| using ResamplingParams2D = std::array<ResamplingParams, 2>; | |||
There was a problem hiding this comment.
Suggested change
| using ResamplingParams2D = std::array<ResamplingParams, 2>; | |
| using ResamplingParams2D = ResamplingParamsND<2>; |
?
Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
Switch coordinate order in resampling from DHW (matrix rank) to XYZ (geometric). Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
Change some separate scalar x,y to vectors in resampling kernel. Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
mzient
force-pushed
the
VolumeResample
branch
from
7d3e448
to
e3220df
Compare
mzient
changed the title
|
!build |
|
CI MESSAGE: [982102]: BUILD STARTED |
Unlock int16, uint16 and int32 resize. Signed-off-by: Michal Zientkiewicz <michalz@nvidia.com>
|
!build |
|
CI MESSAGE: [982113]: BUILD STARTED |
JanuszL
reviewed
Nov 8, 2019
JanuszL
reviewed
Nov 8, 2019
| DeviceArray<uintptr_t, num_buffers> pointers; | ||
| DeviceArray<ptrdiff_t, num_buffers> offsets; | ||
| DeviceArray<Strides, num_buffers> strides; | ||
| DeviceArray<Shape, num_buffers> shapes; |
There was a problem hiding this comment.
You can align the the shape with the rest of variables.
JanuszL
approved these changes
Nov 8, 2019
|
CI MESSAGE: [982113]: 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: Michal Zientkiewicz michalz@nvidia.com
Why we need this PR?
Pick one
What happened in this PR?
dimis a tensor-like dimensions (0 is outermost),axisis vector-like (0 is X).JIRA TASK: [DALI-1075]