Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 20 additions & 2 deletions dali/operators/generic/resize/tensor_resize_cpu.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright (c) 2022-2025, 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.
Expand Down Expand Up @@ -36,7 +36,7 @@ class TensorResizeCPU : public TensorResize<CPUBackend> {
} // namespace tensor_resize


DALI_SCHEMA(experimental__TensorResize)
DALI_SCHEMA(TensorResize)
.DocStr(R"code(Resize tensors.)code")
.NumInput(1)
.NumOutput(1)
Expand All @@ -45,8 +45,26 @@ DALI_SCHEMA(experimental__TensorResize)
.AddParent("ResamplingFilterAttr")
.AddParent("TensorResizeAttr");

// Deprecated alias
DALI_SCHEMA(experimental__TensorResize)
.AddParent("TensorResize")
.DocStr("Legacy alias for :meth:`tensor_resize`.")
.NumInput(1)
.NumOutput(1)
.MakeDocHidden()
.SupportVolumetric()
.AllowSequences()
.Deprecate(
"2.0",
"TensorResize",
"This operator was moved out from the experimental phase, "
"and is now a regular DALI operator. This is just a deprecated "
"alias kept for backward compatibility.");

// Kept for backwards compatibility
DALI_REGISTER_OPERATOR(experimental__TensorResize, tensor_resize::TensorResizeCPU, CPU);

DALI_REGISTER_OPERATOR(TensorResize, tensor_resize::TensorResizeCPU, CPU);


} // namespace dali
5 changes: 4 additions & 1 deletion dali/operators/generic/resize/tensor_resize_gpu.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright (c) 2022-2025, 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.
Expand Down Expand Up @@ -37,6 +37,9 @@ class TensorResizeGPU : public TensorResize<GPUBackend> {

} // namespace tensor_resize

// Kept for backwards compatibility
DALI_REGISTER_OPERATOR(experimental__TensorResize, tensor_resize::TensorResizeGPU, GPU);

DALI_REGISTER_OPERATOR(TensorResize, tensor_resize::TensorResizeGPU, GPU);

} // namespace dali
20 changes: 18 additions & 2 deletions dali/operators/image/color/debayer.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright (c) 2022-2025, 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.
Expand All @@ -16,7 +16,7 @@

namespace dali {

DALI_SCHEMA(experimental__Debayer)
DALI_SCHEMA(Debayer)
.DocStr(R"code(Performs image demosaicing/debayering.

Converts single-channel image to RGB using specified color filter array.
Expand Down Expand Up @@ -114,4 +114,20 @@ Different algorithms are supported on the GPU and CPU.
.InputLayout(0, {"HW", "HWC", "FHW", "FHWC"})
.AllowSequences();

// Deprecated alias
DALI_SCHEMA(experimental__Debayer)
.AddParent("Debayer")
.DocStr("Legacy alias for :meth:`debayer`.")
.NumInput(1)
.NumOutput(1)
.MakeDocHidden()
.InputLayout(0, {"HW", "HWC", "FHW", "FHWC"})
.AllowSequences()
.Deprecate(
"2.0",
"Debayer",
"This operator was moved out from the experimental phase, "
"and is now a regular DALI operator. This is just a deprecated "
"alias kept for backward compatibility.");

} // namespace dali
3 changes: 3 additions & 0 deletions dali/operators/image/color/debayer_cpu.cc
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,9 @@ class DebayerCPU : public Debayer<CPUBackend> {
}
};

// Kept for backwards compatibility
DALI_REGISTER_OPERATOR(experimental__Debayer, DebayerCPU, CPU);

DALI_REGISTER_OPERATOR(Debayer, DebayerCPU, CPU);

} // namespace dali
5 changes: 4 additions & 1 deletion dali/operators/image/color/debayer_gpu.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2022, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright (c) 2022-2025, 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.
Expand Down Expand Up @@ -107,6 +107,9 @@ void DebayerGPU::RunImpl(Workspace &ws) {
impl_->RunImpl(ws);
}

// Kept for backwards compatibility
DALI_REGISTER_OPERATOR(experimental__Debayer, DebayerGPU, GPU);

DALI_REGISTER_OPERATOR(Debayer, DebayerGPU, GPU);

} // namespace dali
23 changes: 21 additions & 2 deletions dali/operators/image/color/equalize.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright (c) 2023-2025, 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.
Expand All @@ -22,7 +22,7 @@

namespace dali {

DALI_SCHEMA(experimental__Equalize)
DALI_SCHEMA(Equalize)
.DocStr(R"code(Performs grayscale/per-channel histogram equalization.

The supported inputs are images and videos of uint8_t type.)code")
Expand All @@ -31,6 +31,22 @@ The supported inputs are images and videos of uint8_t type.)code")
.InputLayout(0, {"HW", "HWC", "CHW", "FHW", "FHWC", "FCHW"})
.AllowSequences();

// Deprecated alias
DALI_SCHEMA(experimental__Equalize)
.AddParent("Equalize")
.DocStr("Legacy alias for :meth:`equalize`.")
.NumInput(1)
.NumOutput(1)
.MakeDocHidden()
.InputLayout(0, {"HW", "HWC", "CHW", "FHW", "FHWC", "FCHW"})
.AllowSequences()
.Deprecate(
"2.0",
"Equalize",
"This operator was moved out from the experimental phase, "
"and is now a regular DALI operator. This is just a deprecated "
"alias kept for backward compatibility.");

namespace equalize {

class EqualizeCPU : public Equalize<CPUBackend> {
Expand Down Expand Up @@ -100,6 +116,9 @@ class EqualizeCPU : public Equalize<CPUBackend> {

} // namespace equalize

// Kept for backwards compatibility
DALI_REGISTER_OPERATOR(experimental__Equalize, equalize::EqualizeCPU, CPU);

DALI_REGISTER_OPERATOR(Equalize, equalize::EqualizeCPU, CPU);

} // namespace dali
5 changes: 4 additions & 1 deletion dali/operators/image/color/equalize.cu
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright (c) 2023-2025, 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.
Expand Down Expand Up @@ -73,6 +73,9 @@ class EqualizeGPU : public Equalize<GPUBackend> {

} // namespace equalize

// Kept for backwards compatibility
DALI_REGISTER_OPERATOR(experimental__Equalize, equalize::EqualizeGPU, GPU);

DALI_REGISTER_OPERATOR(Equalize, equalize::EqualizeGPU, GPU);

} // namespace dali
23 changes: 21 additions & 2 deletions dali/operators/image/convolution/filter.cc
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright (c) 2023-2025, 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.
Expand All @@ -25,7 +25,7 @@

namespace dali {

DALI_SCHEMA(experimental__Filter)
DALI_SCHEMA(Filter)
.DocStr(R"code(Convolves the image with the provided filter.

.. note::
Expand Down Expand Up @@ -118,6 +118,22 @@ If not set, the input type is used.
the values will be clamped to the output type range.
)code");

// Deprecated alias
DALI_SCHEMA(experimental__Filter)
.AddParent("Filter")
.DocStr("Legacy alias for :meth:`filter`.")
.NumInput(2, 3)
.NumOutput(1)
.InputDevice(1, 3, InputDevice::MatchBackendOrCPU)
.AllowSequences()
.MakeDocHidden()
.Deprecate(
"2.0",
"Filter",
"This operator was moved out from the experimental phase, "
"and is now a regular DALI operator. This is just a deprecated "
"alias kept for backward compatibility.");

namespace filter {

namespace ocv {
Expand Down Expand Up @@ -352,6 +368,9 @@ std::unique_ptr<OpImplBase<CPUBackend>> Filter<CPUBackend>::GetFilterImpl(
return filter::get_filter_cpu_op_impl<Out, In>(spec, input_desc);
}

// Kept for backwards compatibility
DALI_REGISTER_OPERATOR(experimental__Filter, Filter<CPUBackend>, CPU);

DALI_REGISTER_OPERATOR(Filter, Filter<CPUBackend>, CPU);

} // namespace dali
5 changes: 4 additions & 1 deletion dali/operators/image/convolution/filter.cu
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// Copyright (c) 2023, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
// Copyright (c) 2023-2025, 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.
Expand Down Expand Up @@ -46,6 +46,9 @@ std::unique_ptr<OpImplBase<GPUBackend>> Filter<GPUBackend>::GetFilterImpl(
return filter::get_filter_gpu_op_impl<Out, In, W>(spec, input_desc);
}

// Kept for backwards compatibility
DALI_REGISTER_OPERATOR(experimental__Filter, Filter<GPUBackend>, GPU);

DALI_REGISTER_OPERATOR(Filter, Filter<GPUBackend>, GPU);

} // namespace dali
16 changes: 15 additions & 1 deletion dali/operators/video/decoder/video_decoder_cpu.cc
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

namespace dali {

DALI_SCHEMA(experimental__decoders__Video)
DALI_SCHEMA(decoders__Video)
.DocStr(
R"code(Decodes videos from in-memory streams.

Expand Down Expand Up @@ -195,12 +195,26 @@ Building an index is particularly useful when decoding a small number of frames
apart or starting playback from a frame deep into the video.)code",
true);

DALI_SCHEMA(experimental__decoders__Video)
.AddParent("decoders__Video")
.DocStr("Legacy alias for :meth:`decoders.video`.")
.NumInput(1)
.NumOutput(1)
.MakeDocHidden()
.Deprecate(
"2.0",
"decoders__Video",
"This operator was moved out from the experimental phase, "
"and is now a regular DALI operator. This is just a deprecated "
"alias kept for backward compatibility.");

class VideoDecoderCpu : public VideoDecoderBase<CPUBackend, FramesDecoderCpu> {
public:
explicit VideoDecoderCpu(const OpSpec &spec) :
VideoDecoderBase<CPUBackend, FramesDecoderCpu>(spec) {}
};

DALI_REGISTER_OPERATOR(experimental__decoders__Video, VideoDecoderCpu, CPU);
DALI_REGISTER_OPERATOR(decoders__Video, VideoDecoderCpu, CPU);

} // namespace dali
1 change: 1 addition & 0 deletions dali/operators/video/decoder/video_decoder_mixed.cc
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,6 @@ class VideoDecoderMixed : public VideoDecoderBase<MixedBackend, FramesDecoderGpu
};

DALI_REGISTER_OPERATOR(experimental__decoders__Video, VideoDecoderMixed, Mixed);
DALI_REGISTER_OPERATOR(decoders__Video, VideoDecoderMixed, Mixed);

} // namespace dali
Loading