Add sequence and 3D support in flip operator #1439
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: [974591]: BUILD STARTED |
|
CI MESSAGE: [974591]: BUILD FAILED |
Signed-off-by: Rafal <Banas.Rafal97@gmail.com>
banasraf
force-pushed
the
extend-flip-operator
branch
from
ec0bc1d
to
2e69ec6
Compare
|
!build |
|
CI MESSAGE: [974619]: BUILD STARTED |
added 2 commits
November 4, 2019 17:03
Signed-off-by: Rafal <Banas.Rafal97@gmail.com>
|
CI MESSAGE: [974691]: BUILD STARTED |
banasraf
changed the title
banasraf
requested review from
mzient,
jantonguirao and
klecki
and removed request for
mzient and
jantonguirao
|
CI MESSAGE: [974619]: BUILD FAILED |
|
CI MESSAGE: [974691]: BUILD PASSED |
JanuszL
reviewed
Nov 4, 2019
JanuszL
reviewed
Nov 4, 2019
dali/kernels/imgproc/flip_cpu.h
Outdated
| @@ -90,18 +99,19 @@ class DLL_PUBLIC FlipCPU { | |||
| public: | |||
| DLL_PUBLIC FlipCPU() = default; | |||
|
|
|||
| DLL_PUBLIC KernelRequirements Setup(KernelContext &context, const InTensorCPU<Type, 4> &in) { | |||
| DLL_PUBLIC KernelRequirements Setup(KernelContext &context, const InTensorCPU<Type, 5> &in) { | |||
There was a problem hiding this comment.
Can you put some meaningful name to this magic 5?
JanuszL
reviewed
Nov 4, 2019
added 2 commits
November 6, 2019 13:02
Signed-off-by: Rafal <Banas.Rafal97@gmail.com>
jantonguirao
reviewed
Nov 6, 2019
| @@ -23,6 +23,9 @@ | |||
|
|
|||
| namespace dali { | |||
| namespace kernels { | |||
|
|
|||
| constexpr int sample_ndim = 5; | |||
There was a problem hiding this comment.
can you use this in all the places where there is a 5 hardcoded?
dali/kernels/imgproc/flip_cpu.h
Outdated
| detail::cpu::FlipImpl(out_data, in_data, in.shape[0], in.shape[1], in.shape[2], in.shape[3], | ||
| flip_z, flip_y, flip_x); | ||
| detail::cpu::FlipImpl(out_data, in_data, | ||
| in.shape[0], in.shape[1], in.shape[2], in.shape[3], in.shape[4], |
There was a problem hiding this comment.
why not just pass in.shape ?
| @@ -24,7 +24,7 @@ namespace dali { | |||
| namespace kernels { | |||
|
|
|||
| class FlipCpuTest | |||
| : public::testing::TestWithParam<std::tuple<int, int, int, std::array<Index, 4>>> { | |||
| : public::testing::TestWithParam<std::tuple<int, int, int, std::array<Index, 5>>> { | |||
| }; | ||
|
|
||
| TEST_P(FlipCpuTest, ImplTest) { | ||
| std::vector<float> out_data(volume(shape_)); | ||
| detail::cpu::FlipImpl( | ||
| out_data.data(), in_view_.data, | ||
| shape_[0], shape_[1], shape_[2], shape_[3], | ||
| shape_[0], shape_[1], shape_[2], shape_[3], shape_[4], |
There was a problem hiding this comment.
I am wondering, is it possible to work with a shape or arbitrary size and a layout, so that we can get the relevant dimensions and set to 1 the rest of them (that is, inside the implementation)
| @@ -23,7 +23,7 @@ | |||
| namespace dali { | |||
| namespace kernels { | |||
|
|
|||
| class FlipGpuTest: public testing::TestWithParam<std::array<Index, 4>> { | |||
| class FlipGpuTest: public testing::TestWithParam<std::array<Index, 5>> { | |||
JanuszL
approved these changes
Nov 6, 2019
mzient
reviewed
Nov 7, 2019
| @@ -36,7 +39,7 @@ inline int GetOcvType(size_t channels) { | |||
|
|
|||
| template <typename Type> | |||
| void OcvFlip(Type *output, const Type *input, | |||
| size_t layers, size_t height, size_t width, size_t channels, | |||
| size_t depth, size_t height, size_t width, size_t channels, | |||
There was a problem hiding this comment.
Why?
depth seems a better name along with height and width.
What about frames?
Do we want to flip the order of frames?
Signed-off-by: Rafal <Banas.Rafal97@gmail.com>
jantonguirao
approved these changes
Nov 13, 2019
|
!build |
|
CI MESSAGE: [988584]: BUILD STARTED |
|
CI MESSAGE: [988584]: 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: Rafal Banas.Rafal97@gmail.com
Why we need this PR?
It extends the flip operator to support volumetric inputs and sequences.
What happened in this PR?
The kernel tests were extended and python tests for sequences and volumetric inputs were added
N. A.
JIRA TASK: [DALI-865]