Fix missing layouts in operators #2136

jantonguirao · 2020-07-21T13:03:29Z

Signed-off-by: Joaquin Anton janton@nvidia.com

Why we need this PR?

Pick one, remove the rest

It fixes a missing tensor layouts in operator's outputs (few of them did not set the layout)

What happened in this PR?

Fill relevant points, put NA otherwise. Replace anything inside []

What solution was applied:
SetLayout in a few operators that didn't
Added a resize function to TensorLayout (permute didn't work properly without it)
TensorVector::GetLayout will check the sample layouts if the layout for the whole TensorVector was not set
Affected modules and functionalities:
Several operators, TensorLayout, TensorVector
Key points relevant for the review:
Correctness of output layouts, Implementation of TensorLayout::resize and TensorVector::GetLayout
Validation and testing:
TensorLayout::resize tests added
Documentation (including examples):
N/A

JIRA TASK: [DALI-1517]

dali-automaton · 2020-07-21T13:36:09Z

CI MESSAGE: [1484144]: BUILD STARTED

dali-automaton · 2020-07-21T13:39:08Z

CI MESSAGE: [1484144]: BUILD FAILED

dali-automaton · 2020-07-21T13:47:43Z

CI MESSAGE: [1484169]: BUILD STARTED

dali-automaton · 2020-07-21T14:57:12Z

CI MESSAGE: [1484169]: BUILD FAILED

dali-automaton · 2020-07-21T15:50:40Z

CI MESSAGE: [1484472]: BUILD STARTED

dali-automaton · 2020-07-21T17:09:50Z

CI MESSAGE: [1484472]: BUILD FAILED

jantonguirao · 2020-07-22T11:34:17Z

dali/operators/generic/flip.cc

@@ -66,7 +66,7 @@ void Flip<CPUBackend>::RunImpl(Workspace<CPUBackend> &ws) {
  auto _horizontal = GetHorizontal(ws, ws.data_idx());
  auto _vertical = GetVertical(ws, ws.data_idx());
  auto _depthwise = GetDepthwise(ws, ws.data_idx());
-  if (!_horizontal && !_vertical) {
+  if (!_horizontal && !_vertical && !_depthwise) {


this is a bonus bugfix

jantonguirao · 2020-07-22T11:34:47Z

dali/pipeline/operator/operator.h

+    if (ws.NumInput() > 0 && ws.NumOutput() > 0) {
+      auto &in = ws.template InputRef<GPUBackend>(0);
+      auto &out = ws.template OutputRef<GPUBackend>(0);
+      auto in_layout = in.GetLayout();


dali-automaton · 2020-07-22T15:41:04Z

CI MESSAGE: [1487706]: BUILD STARTED

dali-automaton · 2020-07-22T15:43:34Z

CI MESSAGE: [1487706]: BUILD FAILED

dali-automaton · 2020-07-22T15:51:01Z

CI MESSAGE: [1487727]: BUILD STARTED

dali-automaton · 2020-07-22T17:39:21Z

CI MESSAGE: [1487727]: BUILD FAILED

dali-automaton · 2020-07-23T06:51:51Z

CI MESSAGE: [1489879]: BUILD FAILED

dali-automaton · 2020-07-23T06:55:58Z

CI MESSAGE: [1489879]: BUILD STARTED

dali-automaton · 2020-07-23T15:43:29Z

CI MESSAGE: [1490840]: BUILD STARTED

dali-automaton · 2020-07-23T16:55:12Z

CI MESSAGE: [1490840]: BUILD FAILED

dali-automaton · 2020-07-23T17:15:36Z

CI MESSAGE: [1491086]: BUILD STARTED

dali-automaton · 2020-07-23T18:28:06Z

CI MESSAGE: [1491086]: BUILD FAILED

jantonguirao · 2020-07-24T10:04:27Z

include/dali/core/tensor_layout.h

@@ -193,6 +193,15 @@ class TensorLayout {
  DALI_HOST_DEV
  constexpr bool empty() const noexcept { return size() == 0; }

+  void resize(size_t new_size, char value = '?') noexcept {


permuting tensor layout was broken because of missing resize function

dali-automaton · 2020-07-24T10:06:56Z

CI MESSAGE: [1493265]: BUILD STARTED

mzient · 2020-07-24T11:07:00Z

dali/operators/image/color/color_space_conversion.cu

@@ -96,6 +96,7 @@ void ColorSpaceConversion<GPUBackend>::RunImpl(DeviceWorkspace &ws) {
  DALI_ENFORCE(IsType<uint8_t>(input.type()),
      "Color space conversion accept only uint8 tensors");
  auto &output = ws.Output<GPUBackend>(0);
+  output.SetLayout(input.GetLayout());


Suggested change

output.SetLayout(input.GetLayout());

output.SetLayout(InputLayout(ws, 0));

dali/operators/image/color/color_space_conversion.cc

…t number of inputs Signed-off-by: Joaquin Anton <janton@nvidia.com>

Signed-off-by: Joaquin Anton <janton@nvidia.com>

jantonguirao · 2020-07-28T06:31:20Z

!build

dali-automaton · 2020-07-28T06:36:27Z

CI MESSAGE: [1500962]: BUILD STARTED

Signed-off-by: Joaquin Anton <janton@nvidia.com>

jantonguirao · 2020-07-28T07:24:17Z

!build

dali-automaton · 2020-07-28T07:30:34Z

CI MESSAGE: [1501066]: BUILD STARTED

dali-automaton · 2020-07-28T09:03:55Z

CI MESSAGE: [1501066]: BUILD FAILED

jantonguirao · 2020-07-29T15:12:33Z

!build

dali-automaton · 2020-07-29T15:15:49Z

CI MESSAGE: [1505083]: BUILD STARTED

dali-automaton · 2020-07-29T17:52:05Z

CI MESSAGE: [1505083]: BUILD FAILED

jantonguirao · 2020-07-30T09:20:57Z

!build

dali-automaton · 2020-07-30T09:25:37Z

CI MESSAGE: [1507491]: BUILD STARTED

Signed-off-by: Joaquin Anton <janton@nvidia.com>

jantonguirao · 2020-07-30T11:31:56Z

!build

dali-automaton · 2020-07-30T11:35:48Z

CI MESSAGE: [1507729]: BUILD STARTED

dali-automaton · 2020-07-30T13:12:24Z

CI MESSAGE: [1507729]: BUILD FAILED

Signed-off-by: Joaquin Anton <janton@nvidia.com>

jantonguirao · 2020-07-30T14:33:02Z

!build

dali-automaton · 2020-07-30T14:35:24Z

CI MESSAGE: [1508081]: BUILD STARTED

dali-automaton · 2020-07-30T16:07:06Z

CI MESSAGE: [1508081]: BUILD PASSED

Signed-off-by: Joaquin Anton <janton@nvidia.com>

dali-automaton · 2020-07-30T18:50:55Z

CI MESSAGE: [1508762]: BUILD STARTED

dali-automaton · 2020-07-30T23:00:14Z

CI MESSAGE: [1508762]: BUILD FAILED

dali-automaton · 2020-07-31T06:45:28Z

CI MESSAGE: [1508762]: BUILD PASSED

jantonguirao force-pushed the find_empty_layout branch from 36500a7 to c2ec34e Compare July 21, 2020 13:44

jantonguirao force-pushed the find_empty_layout branch from bbf281e to cce4c93 Compare July 22, 2020 06:31

jantonguirao commented Jul 22, 2020

View reviewed changes

jantonguirao force-pushed the find_empty_layout branch from f3ce661 to 60f6a1c Compare July 22, 2020 15:49

jantonguirao force-pushed the find_empty_layout branch from 60f6a1c to 2bb7cea Compare July 23, 2020 06:49

jantonguirao force-pushed the find_empty_layout branch from 2bb7cea to cf1d70c Compare July 23, 2020 14:48

jantonguirao force-pushed the find_empty_layout branch from 7ecad79 to bf494da Compare July 24, 2020 10:03

jantonguirao commented Jul 24, 2020

View reviewed changes

jantonguirao changed the title ~~[WIP][Test only] Find empty layouts~~ Fix missing layouts in operators Jul 24, 2020

jantonguirao marked this pull request as ready for review July 24, 2020 10:41

mzient reviewed Jul 24, 2020

View reviewed changes

dali/operators/image/color/color_space_conversion.cc Show resolved Hide resolved

jantonguirao added 2 commits July 27, 2020 17:40

Extract repeated code to a templated function. Improve error msg abou…

7258bed

…t number of inputs Signed-off-by: Joaquin Anton <janton@nvidia.com>

compare_pipelines to check layout by default

57417d9

Signed-off-by: Joaquin Anton <janton@nvidia.com>

Allow CPU/GPU inputs in DeviceWorkspace

acb8d28

Signed-off-by: Joaquin Anton <janton@nvidia.com>

jantonguirao force-pushed the find_empty_layout branch from 2c0385f to acb8d28 Compare July 28, 2020 07:23

jantonguirao force-pushed the find_empty_layout branch from 985180c to 3de7be3 Compare July 30, 2020 09:18

Set layout in Python Op pipelines

a9bce35

Signed-off-by: Joaquin Anton <janton@nvidia.com>

jantonguirao force-pushed the find_empty_layout branch from 3de7be3 to a9bce35 Compare July 30, 2020 11:30

SSDRandomCrop set layout

4c6ca4c

Signed-off-by: Joaquin Anton <janton@nvidia.com>

jantonguirao added 2 commits July 30, 2020 20:14

Remove temporary code

e947641

Signed-off-by: Joaquin Anton <janton@nvidia.com>

Fix operator bench

703fc16

Signed-off-by: Joaquin Anton <janton@nvidia.com>

jantonguirao merged commit 0362ac4 into NVIDIA:master Jul 31, 2020

	output.SetLayout(input.GetLayout());
	output.SetLayout(InputLayout(ws, 0));

Fix missing layouts in operators #2136

Fix missing layouts in operators #2136

Conversation

jantonguirao commented Jul 21, 2020 • edited

Why we need this PR?

What happened in this PR?

dali-automaton commented Jul 21, 2020

dali-automaton commented Jul 21, 2020

dali-automaton commented Jul 21, 2020

dali-automaton commented Jul 21, 2020

dali-automaton commented Jul 21, 2020

dali-automaton commented Jul 21, 2020

jantonguirao Jul 22, 2020

Choose a reason for hiding this comment

mzient Jul 24, 2020

Choose a reason for hiding this comment

jantonguirao Jul 22, 2020

Choose a reason for hiding this comment

dali-automaton commented Jul 22, 2020

dali-automaton commented Jul 22, 2020

dali-automaton commented Jul 22, 2020

dali-automaton commented Jul 22, 2020

dali-automaton commented Jul 23, 2020

dali-automaton commented Jul 23, 2020

dali-automaton commented Jul 23, 2020

dali-automaton commented Jul 23, 2020

dali-automaton commented Jul 23, 2020

dali-automaton commented Jul 23, 2020

jantonguirao Jul 24, 2020

Choose a reason for hiding this comment

dali-automaton commented Jul 24, 2020

mzient Jul 24, 2020

Choose a reason for hiding this comment

jantonguirao commented Jul 28, 2020

dali-automaton commented Jul 28, 2020

jantonguirao commented Jul 28, 2020

dali-automaton commented Jul 28, 2020

dali-automaton commented Jul 28, 2020

jantonguirao commented Jul 29, 2020

dali-automaton commented Jul 29, 2020

dali-automaton commented Jul 29, 2020

jantonguirao commented Jul 30, 2020

dali-automaton commented Jul 30, 2020

jantonguirao commented Jul 30, 2020

dali-automaton commented Jul 30, 2020

dali-automaton commented Jul 30, 2020

jantonguirao commented Jul 30, 2020

dali-automaton commented Jul 30, 2020

dali-automaton commented Jul 30, 2020

dali-automaton commented Jul 30, 2020

dali-automaton commented Jul 30, 2020

dali-automaton commented Jul 31, 2020

jantonguirao commented Jul 21, 2020 •

edited