Extract kSpatialLayouts

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

dali/operators/generic/flip.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019-2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// Copyright (c) 2019-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -17,6 +17,7 @@
 #include "dali/kernels/imgproc/flip_cpu.h"
 #include "dali/kernels/kernel_params.h"
 #include "dali/pipeline/data/views.h"
+#include "dali/pipeline/data/layouts.h"
 #include "dali/util/ocv.h"
 #include "dali/operators/generic/flip_util.h"
 
@@ -30,7 +31,7 @@ and depthwise).)code")
     .AddOptionalArg("horizontal", R"code(Flip the horizontal  dimension.)code", 1, true)
     .AddOptionalArg("vertical", R"code(Flip the vertical dimension.)code", 0, true)
     .AddOptionalArg("depthwise", R"code(Flip the depthwise dimension.)code", 0, true)
-    .InputLayout({"FDHWC", "FHWC", "DHWC", "HWC", "FCDHW", "FCHW", "CDHW", "CHW"})
+    .InputLayout(0, kSpatialLayouts)
     .AllowSequences()
     .SupportVolumetric();
 

dali/operators/image/crop/crop.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2019, NVIDIA CORPORATION. All rights reserved.
+// Copyright (c) 2019-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 #include "dali/core/static_switch.h"
 #include "dali/kernels/slice/slice_cpu.h"
 #include "dali/pipeline/data/views.h"
+#include "dali/pipeline/data/layouts.h"
 #include "dali/util/half.hpp"
 
 namespace dali {
@@ -27,6 +28,7 @@ DALI_SCHEMA(Crop)
 (upper left corner).)code")
     .NumInput(1)
     .NumOutput(1)
+    .InputLayout(0, kSpatialLayouts)
     .AllowSequences()
     .SupportVolumetric()
     .AddOptionalArg<DALIImageType>("image_type", "Image type", nullptr)

dali/operators/image/crop/crop_mirror_normalize.cc

@@ -17,6 +17,7 @@
 #include "dali/core/tensor_layout.h"
 #include "dali/kernels/slice/slice_flip_normalize_permute_pad_cpu.h"
 #include "dali/pipeline/data/views.h"
+#include "dali/pipeline/data/layouts.h"
 #include "dali/util/half.hpp"
 
 namespace dali {
@@ -34,6 +35,7 @@ Normalization takes the input images and produces the output by using the follow
 )code")
   .NumInput(1)
   .NumOutput(1)
+  .InputLayout(0, kSpatialLayouts)
   .AllowSequences()
   .SupportVolumetric()
   .AddOptionalArg<DALIImageType>("image_type", "Image type", nullptr)

dali/operators/image/resize/resize.cc

@@ -1,4 +1,4 @@
-// Copyright (c) 2017-2021, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+// Copyright (c) 2017-2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 //
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
@@ -15,6 +15,7 @@
 #include "dali/operators/image/resize/resize.h"
 #include <cassert>
 #include "dali/pipeline/data/views.h"
+#include "dali/pipeline/data/layouts.h"
 
 namespace dali {
 
@@ -25,8 +26,7 @@ DALI_SCHEMA(Resize)
   .AdditionalOutputsFn([](const OpSpec& spec) {
     return static_cast<int>(spec.GetArgument<bool>("save_attrs"));
   })
-  .InputLayout(0, {"HWC",  "FHWC",  "CHW",  "FCHW",  "CFHW" ,
-                   "DHWC", "FDHWC", "CDHW", "FCDHW", "CFDHW"  })
+  .InputLayout(0, kSpatialLayouts)
   .AddOptionalArg("save_attrs",
       R"code(Save reshape attributes for testing.)code", false)
   .AddOptionalArg<DALIImageType>("image_type", "Image type", nullptr)

dali/pipeline/data/layouts.h

@@ -0,0 +1,30 @@
+// Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+#ifndef DALI_PIPELINE_DATA_LAYOUTS_H_
+#define DALI_PIPELINE_DATA_LAYOUTS_H_
+
+#include "dali/core/tensor_layout.h"
+
+namespace dali {
+
+// Layouts containing spatial dimensions such as height, width, depth
+// Contains Image, Volumetric Images, and Sequence layouts
+static std::initializer_list<TensorLayout> kSpatialLayouts {
+    "HWC", "CHW", "DHWC", "FHWC", "FCHW", "CDHW", "CFHW", "FDHWC", "FCDHW", "CFDHW"
+};
+
+}  // namespace dali
+
+#endif  // DALI_PIPELINE_DATA_LAYOUTS_H_