Remove legacy API based nvJPEG decoder implementation (NVIDIA#2591)

Signed-off-by: Joaquin Anton <[email protected]>
jantonguirao · Jan 11, 2021 · 25ef92a · 25ef92a
1 parent 27029bf
commit 25ef92a
Show file tree

Hide file tree

Showing 44 changed files with 71 additions and 677 deletions.
diff --git a/cmake/Dependencies.cmake b/cmake/Dependencies.cmake
@@ -37,10 +37,6 @@ if (BUILD_NVJPEG)
     add_definitions(-DNVJPEG_LIBRARY_0_2_0)
   endif()
 
-  if (${NVJPEG_DECOUPLED_API})
-    add_definitions(-DNVJPEG_DECOUPLED_API)
-  endif()
-
   if (${NVJPEG_PREALLOCATE_API})
     add_definitions(-DNVJPEG_PREALLOCATE_API)
   endif()

diff --git a/cmake/modules/FindNVJPEG.cmake b/cmake/modules/FindNVJPEG.cmake
@@ -59,7 +59,7 @@ if(NVJPEG_FOUND)
   if (NVJPEG_DECOUPLED_API)
     message("nvJPEG is using new API")
   else()
-    message(WARNING " nvJPEG is using the deprecated API")
+    message(FATAL_ERROR "nvjpegBufferPinnedCreate is required but not present in the available version of nvJPEG")
   endif()
 else()
   message("nvJPEG NOT found")

diff --git a/dali/operators/decoder/image_decoder.cc b/dali/operators/decoder/image_decoder.cc
@@ -26,11 +26,6 @@ DALI_SCHEMA(ImageDecoderAttr)
   .AddOptionalArg("output_type",
       R"code(The color space of the output image.)code",
       DALI_RGB)
-// TODO(janton): Remove this when we remove the old nvJPEGDecoder implementation (DALI-971)
-#if !defined(NVJPEG_DECOUPLED_API)
-  .AddOptionalArg("use_batched_decode",
-      R"code(**`mixed` backend only** Use nvJPEG's batched decoding API.)code", false)
-#endif
   .AddOptionalArg("hybrid_huffman_threshold",
       R"code(Applies **only** to the ``mixed`` backend type.
 

diff --git a/dali/operators/decoder/nvjpeg/CMakeLists.txt b/dali/operators/decoder/nvjpeg/CMakeLists.txt
@@ -12,11 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if (NVJPEG_DECOUPLED_API)
-    add_subdirectory(decoupled_api)
-else()
-    add_subdirectory(legacy_api)
-endif()
+add_subdirectory(fused)
 
 collect_headers(DALI_INST_HDRS PARENT_SCOPE)
 collect_sources(DALI_OPERATOR_SRCS PARENT_SCOPE)

diff --git a/dali/operators/decoder/nvjpeg/decoupled_api/CMakeLists.txt b/dali/operators/decoder/nvjpeg/decoupled_api/CMakeLists.txt
diff --git a/...nvjpeg/decoupled_api/fused/CMakeLists.txt → ...ators/decoder/nvjpeg/fused/CMakeLists.txt b/...nvjpeg/decoupled_api/fused/CMakeLists.txt → ...ators/decoder/nvjpeg/fused/CMakeLists.txt
diff --git a/...pled_api/fused/nvjpeg_decoder_cpu_crop.cc → ...r/nvjpeg/fused/nvjpeg_decoder_cpu_crop.cc b/...pled_api/fused/nvjpeg_decoder_cpu_crop.cc → ...r/nvjpeg/fused/nvjpeg_decoder_cpu_crop.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_crop.h"
+#include "dali/operators/decoder/nvjpeg/fused/nvjpeg_decoder_cpu_crop.h"
 #include <vector>
 
 namespace dali {

diff --git a/...upled_api/fused/nvjpeg_decoder_cpu_crop.h → ...er/nvjpeg/fused/nvjpeg_decoder_cpu_crop.h b/...upled_api/fused/nvjpeg_decoder_cpu_crop.h → ...er/nvjpeg/fused/nvjpeg_decoder_cpu_crop.h
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_CROP_H_
-#define DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_CROP_H_
+#ifndef DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CPU_CROP_H_
+#define DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CPU_CROP_H_
 
 #include <vector>
-#include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_cpu.h"
+#include "dali/operators/decoder/nvjpeg/nvjpeg_decoder_cpu.h"
 #include "dali/operators/image/crop/crop_attr.h"
 
 namespace dali {
@@ -42,4 +42,4 @@ class nvJPEGDecoderCPUStageCrop : public nvJPEGDecoderCPUStage, protected CropAt
 
 }  // namespace dali
 
-#endif  // DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_CROP_H_
+#endif  // DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CPU_CROP_H_
diff --git a/...i/fused/nvjpeg_decoder_cpu_random_crop.cc → ...g/fused/nvjpeg_decoder_cpu_random_crop.cc b/...i/fused/nvjpeg_decoder_cpu_random_crop.cc → ...g/fused/nvjpeg_decoder_cpu_random_crop.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_random_crop.h"
+#include "dali/operators/decoder/nvjpeg/fused/nvjpeg_decoder_cpu_random_crop.h"
 #include <memory>
 #include <vector>
 #include "dali/util/random_crop_generator.h"

diff --git a/...pi/fused/nvjpeg_decoder_cpu_random_crop.h → ...eg/fused/nvjpeg_decoder_cpu_random_crop.h b/...pi/fused/nvjpeg_decoder_cpu_random_crop.h → ...eg/fused/nvjpeg_decoder_cpu_random_crop.h
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_RANDOM_CROP_H_
-#define DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_RANDOM_CROP_H_
+#ifndef DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CPU_RANDOM_CROP_H_
+#define DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CPU_RANDOM_CROP_H_
 
-#include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_cpu.h"
+#include "dali/operators/decoder/nvjpeg/nvjpeg_decoder_cpu.h"
 #include "dali/operators/image/crop/random_crop_attr.h"
 
 namespace dali {
@@ -37,4 +37,4 @@ class nvJPEGDecoderCPUStageRandomCrop : public nvJPEGDecoderCPUStage, public Ran
 
 }  // namespace dali
 
-#endif  // DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_RANDOM_CROP_H_
+#endif  // DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CPU_RANDOM_CROP_H_
diff --git a/...led_api/fused/nvjpeg_decoder_cpu_slice.cc → .../nvjpeg/fused/nvjpeg_decoder_cpu_slice.cc b/...led_api/fused/nvjpeg_decoder_cpu_slice.cc → .../nvjpeg/fused/nvjpeg_decoder_cpu_slice.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_cpu_slice.h"
+#include "dali/operators/decoder/nvjpeg/fused/nvjpeg_decoder_cpu_slice.h"
 #include <vector>
 
 namespace dali {

diff --git a/...pled_api/fused/nvjpeg_decoder_cpu_slice.h → ...r/nvjpeg/fused/nvjpeg_decoder_cpu_slice.h b/...pled_api/fused/nvjpeg_decoder_cpu_slice.h → ...r/nvjpeg/fused/nvjpeg_decoder_cpu_slice.h
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_SLICE_H_
-#define DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_SLICE_H_
+#ifndef DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CPU_SLICE_H_
+#define DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CPU_SLICE_H_
 
 #include <vector>
-#include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_cpu.h"
+#include "dali/operators/decoder/nvjpeg/nvjpeg_decoder_cpu.h"
 #include "dali/operators/generic/slice/slice_attr.h"
 
 namespace dali {
@@ -47,4 +47,4 @@ class nvJPEGDecoderCPUStageSlice : public nvJPEGDecoderCPUStage {
 
 }  // namespace dali
 
-#endif  // DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CPU_SLICE_H_
+#endif  // DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CPU_SLICE_H_
diff --git a/...ecoupled_api/fused/nvjpeg_decoder_crop.cc → ...coder/nvjpeg/fused/nvjpeg_decoder_crop.cc b/...ecoupled_api/fused/nvjpeg_decoder_crop.cc → ...coder/nvjpeg/fused/nvjpeg_decoder_crop.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include <vector>
-#include "dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_crop.h"
+#include "dali/operators/decoder/nvjpeg/fused/nvjpeg_decoder_crop.h"
 
 namespace dali {
 

diff --git a/...decoupled_api/fused/nvjpeg_decoder_crop.h → ...ecoder/nvjpeg/fused/nvjpeg_decoder_crop.h b/...decoupled_api/fused/nvjpeg_decoder_crop.h → ...ecoder/nvjpeg/fused/nvjpeg_decoder_crop.h
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CROP_H_
-#define DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CROP_H_
+#ifndef DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CROP_H_
+#define DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CROP_H_
 
 #include <vector>
-#include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_decoupled_api.h"
+#include "dali/operators/decoder/nvjpeg/nvjpeg_decoder_decoupled_api.h"
 #include "dali/operators/image/crop/crop_attr.h"
 
 namespace dali {
@@ -42,4 +42,4 @@ class nvJPEGDecoderCrop : public nvJPEGDecoder, protected CropAttr {
 
 }  // namespace dali
 
-#endif  // DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_CROP_H_
+#endif  // DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_CROP_H_
diff --git a/...led_api/fused/nvjpeg_decoder_crop_test.cc → .../nvjpeg/fused/nvjpeg_decoder_crop_test.cc b/...led_api/fused/nvjpeg_decoder_crop_test.cc → .../nvjpeg/fused/nvjpeg_decoder_crop_test.cc
diff --git a/...d_api/fused/nvjpeg_decoder_random_crop.cc → ...vjpeg/fused/nvjpeg_decoder_random_crop.cc b/...d_api/fused/nvjpeg_decoder_random_crop.cc → ...vjpeg/fused/nvjpeg_decoder_random_crop.cc
@@ -14,7 +14,7 @@
 
 #include <vector>
 #include <memory>
-#include "dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_random_crop.h"
+#include "dali/operators/decoder/nvjpeg/fused/nvjpeg_decoder_random_crop.h"
 #include "dali/util/random_crop_generator.h"
 
 namespace dali {

diff --git a/...ed_api/fused/nvjpeg_decoder_random_crop.h → ...nvjpeg/fused/nvjpeg_decoder_random_crop.h b/...ed_api/fused/nvjpeg_decoder_random_crop.h → ...nvjpeg/fused/nvjpeg_decoder_random_crop.h
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_RANDOM_CROP_H_
-#define DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_RANDOM_CROP_H_
+#ifndef DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_RANDOM_CROP_H_
+#define DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_RANDOM_CROP_H_
 
-#include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_decoupled_api.h"
+#include "dali/operators/decoder/nvjpeg/nvjpeg_decoder_decoupled_api.h"
 #include "dali/operators/image/crop/random_crop_attr.h"
 
 namespace dali {
@@ -37,4 +37,4 @@ class nvJPEGDecoderRandomCrop : public nvJPEGDecoder, public RandomCropAttr {
 
 }  // namespace dali
 
-#endif  // DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_RANDOM_CROP_H_
+#endif  // DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_RANDOM_CROP_H_
diff --git a/.../fused/nvjpeg_decoder_random_crop_test.cc → .../fused/nvjpeg_decoder_random_crop_test.cc b/.../fused/nvjpeg_decoder_random_crop_test.cc → .../fused/nvjpeg_decoder_random_crop_test.cc
diff --git a/...coupled_api/fused/nvjpeg_decoder_slice.cc → ...oder/nvjpeg/fused/nvjpeg_decoder_slice.cc b/...coupled_api/fused/nvjpeg_decoder_slice.cc → ...oder/nvjpeg/fused/nvjpeg_decoder_slice.cc
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include <vector>
-#include "dali/operators/decoder/nvjpeg/decoupled_api/fused/nvjpeg_decoder_slice.h"
+#include "dali/operators/decoder/nvjpeg/fused/nvjpeg_decoder_slice.h"
 
 namespace dali {
 

diff --git a/...ecoupled_api/fused/nvjpeg_decoder_slice.h → ...coder/nvjpeg/fused/nvjpeg_decoder_slice.h b/...ecoupled_api/fused/nvjpeg_decoder_slice.h → ...coder/nvjpeg/fused/nvjpeg_decoder_slice.h
@@ -12,11 +12,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#ifndef DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_SLICE_H_
-#define DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_SLICE_H_
+#ifndef DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_SLICE_H_
+#define DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_SLICE_H_
 
 #include <vector>
-#include "dali/operators/decoder/nvjpeg/decoupled_api/nvjpeg_decoder_decoupled_api.h"
+#include "dali/operators/decoder/nvjpeg/nvjpeg_decoder_decoupled_api.h"
 #include "dali/operators/generic/slice/slice_attr.h"
 
 namespace dali {
@@ -47,4 +47,4 @@ class nvJPEGDecoderSlice : public nvJPEGDecoder {
 
 }  // namespace dali
 
-#endif  // DALI_OPERATORS_DECODER_NVJPEG_DECOUPLED_API_FUSED_NVJPEG_DECODER_SLICE_H_
+#endif  // DALI_OPERATORS_DECODER_NVJPEG_FUSED_NVJPEG_DECODER_SLICE_H_
diff --git a/...ed_api/fused/nvjpeg_decoder_slice_test.cc → ...nvjpeg/fused/nvjpeg_decoder_slice_test.cc b/...ed_api/fused/nvjpeg_decoder_slice_test.cc → ...nvjpeg/fused/nvjpeg_decoder_slice_test.cc
diff --git a/...i/fused/nvjpeg_decoder_split_crop_test.cc → ...g/fused/nvjpeg_decoder_split_crop_test.cc b/...i/fused/nvjpeg_decoder_split_crop_test.cc → ...g/fused/nvjpeg_decoder_split_crop_test.cc
diff --git a/.../nvjpeg_decoder_split_random_crop_test.cc → .../nvjpeg_decoder_split_random_crop_test.cc b/.../nvjpeg_decoder_split_random_crop_test.cc → .../nvjpeg_decoder_split_random_crop_test.cc
diff --git a/.../fused/nvjpeg_decoder_split_slice_test.cc → .../fused/nvjpeg_decoder_split_slice_test.cc b/.../fused/nvjpeg_decoder_split_slice_test.cc → .../fused/nvjpeg_decoder_split_slice_test.cc
diff --git a/dali/operators/decoder/nvjpeg/legacy_api/CMakeLists.txt b/dali/operators/decoder/nvjpeg/legacy_api/CMakeLists.txt
diff --git a/dali/operators/decoder/nvjpeg/legacy_api/nvjpeg_decoder.cc b/dali/operators/decoder/nvjpeg/legacy_api/nvjpeg_decoder.cc