Make nvimagecodec the default image decoder

CMakeLists.txt

@@ -128,8 +128,6 @@ cmake_dependent_option(BUILD_NVOF "Build with NVIDIA OPTICAL FLOW SDK support" O
 cmake_dependent_option(BUILD_NVML "Build with NVIDIA Management Library (NVML) support" ON
                        "NOT BUILD_DALI_NODEPS" OFF)
 
-cmake_dependent_option(WITH_DYNAMIC_NVJPEG "Dynamicly load nvJPEG" ON
-                      "WITH_DYNAMIC_CUDA_TOOLKIT;BUILD_NVJPEG" OFF)
 cmake_dependent_option(WITH_DYNAMIC_CUFFT "Dynamicly load cuFFT" ON
                       "WITH_DYNAMIC_CUDA_TOOLKIT" OFF)
 cmake_dependent_option(WITH_DYNAMIC_NPP "Dynamicly load npp" ON
@@ -327,7 +325,6 @@ propagate_option(BUILD_CUFILE)
 propagate_option(BUILD_NVIMAGECODEC)
 propagate_option(BUILD_AWSSDK)
 propagate_option(LINK_DRIVER)
-propagate_option(WITH_DYNAMIC_NVJPEG)
 propagate_option(WITH_DYNAMIC_CUFFT)
 propagate_option(WITH_DYNAMIC_NPP)
 propagate_option(WITH_DYNAMIC_NVIMGCODEC)

cmake/Dependencies.cmake

@@ -19,44 +19,6 @@
 CUDA_find_library(CUDART_LIB cudart_static)
 list(APPEND DALI_EXCLUDES libcudart_static.a)
 
-# For NVJPEG
-if (BUILD_NVJPEG)
-  find_package(NVJPEG 9.0 REQUIRED)
-  if(${CUDA_VERSION} VERSION_LESS ${NVJPEG_VERSION})
-    message(WARNING "Using nvJPEG ${NVJPEG_VERSION} together with CUDA ${CUDA_VERSION} "
-                    "requires NVIDIA drivers compatible with CUDA ${NVJPEG_VERSION} or later")
-  endif()
-  include_directories(SYSTEM ${NVJPEG_INCLUDE_DIR})
-
-  # load using dlopen or link statically here
-  if (NOT WITH_DYNAMIC_NVJPEG)
-    list(APPEND DALI_LIBS ${NVJPEG_LIBRARY})
-    list(APPEND DALI_EXCLUDES libnvjpeg_static.a)
-  endif (NOT WITH_DYNAMIC_NVJPEG)
-
-  add_definitions(-DDALI_USE_NVJPEG)
-
-  if (${NVJPEG_LIBRARY_0_2_0})
-    add_definitions(-DNVJPEG_LIBRARY_0_2_0)
-  endif()
-
-  if (${NVJPEG_PREALLOCATE_API})
-    add_definitions(-DNVJPEG_PREALLOCATE_API)
-  endif()
-endif()
-
-if (BUILD_NVJPEG2K)
-  CUDA_find_library(NVJPEG2K_LIBRARY nvjpeg2k_static)
-  if (${NVJPEG2K_LIBRARY} STREQUAL "NVJPEG2K_LIBRARY-NOTFOUND")
-    message(WARNING "nvJPEG2k not found - disabled")
-    set(BUILD_NVJPEG2K OFF CACHE BOOL INTERNAL)
-    set(BUILD_NVJPEG2K OFF)
-  else()
-    list(APPEND DALI_LIBS ${NVJPEG2K_LIBRARY})
-    list(APPEND DALI_EXCLUDES libnvjpeg2k_static.a)
-  endif()
-endif ()
-
 # NVIDIA NPP library
 if (NOT WITH_DYNAMIC_NPP)
   CUDA_find_library(CUDA_nppicc_LIBRARY nppicc_static)
@@ -77,7 +39,7 @@ if (NOT WITH_DYNAMIC_CUFFT)
 endif ()
 
 # CULIBOS needed when using static CUDA libs
-if (NOT WITH_DYNAMIC_NVJPEG OR NOT WITH_DYNAMIC_CUFFT OR NOT WITH_DYNAMIC_NPP)
+if (NOT WITH_DYNAMIC_CUFFT OR NOT WITH_DYNAMIC_NPP)
   CUDA_find_library(CUDA_culibos_LIBRARY culibos)
   list(APPEND DALI_LIBS ${CUDA_culibos_LIBRARY})
   list(APPEND DALI_EXCLUDES libculibos.a)

cmake/Dependencies.common.cmake

@@ -318,13 +318,12 @@ if(BUILD_NVIMAGECODEC)
     if("$ENV{ARCH}" STREQUAL "aarch64-linux")
       message(STATUS "ARCH is set to aarch64-linux")
       set(NVIMGCODEC_PACKAGE_NAME "nvidia-nvimgcodec-tegra-cu${CUDA_VERSION_MAJOR}[all]")
-      set(DALI_INSTALL_REQUIRES_NVIMGCODEC "")
     else()
       message(STATUS "ARCH is set to $ENV{ARCH}")
       set(NVIMGCODEC_PACKAGE_NAME "nvidia-nvimgcodec-cu${CUDA_VERSION_MAJOR}[all]")
-      set(DALI_INSTALL_REQUIRES_NVIMGCODEC "\'${NVIMGCODEC_PACKAGE_NAME} >= ${NVIMGCODEC_MIN_VERSION}, < ${NVIMGCODEC_MAX_VERSION}',")
-      message(STATUS "Adding nvimagecodec requirement as: ${DALI_INSTALL_REQUIRES_NVIMGCODEC}")
     endif()
+    set(DALI_INSTALL_REQUIRES_NVIMGCODEC "\'${NVIMGCODEC_PACKAGE_NAME} >= ${NVIMGCODEC_MIN_VERSION}, < ${NVIMGCODEC_MAX_VERSION}',")
+    message(STATUS "Adding nvimagecodec requirement as: ${DALI_INSTALL_REQUIRES_NVIMGCODEC}")
   else()
     message(STATUS "nvImageCodec - static link")
 
@@ -355,7 +354,7 @@ if(BUILD_NVIMAGECODEC)
                         "-DBUILD_NVJPEG2K_EXT=${BUILD_NVJPEG2K}"
                         "-DWITH_DYNAMIC_NVJPEG2K=OFF"
                         "-DBUILD_NVJPEG_EXT=${BUILD_NVJPEG}"
-                        "-DWITH_DYNAMIC_NVJPEG=${WITH_DYNAMIC_NVJPEG}"
+                        "-DWITH_DYNAMIC_NVJPEG=ON"
                         "-DBUILD_NVTIFF_EXT=OFF"
                         "-DWITH_DYNAMIC_NVTIFF=OFF"
                         "-DBUILD_NVBMP_EXT=OFF"

conda/build_conda_packages.sh

@@ -31,7 +31,6 @@ export BUILD_NVDEC=${BUILD_NVDEC:-ON}
 export BUILD_NVML=${BUILD_NVML:-ON}
 export BUILD_NVCOMP=${BUILD_NVCOMP:-ON}
 export WITH_DYNAMIC_CUDA_TOOLKIT=${WITH_DYNAMIC_CUDA_TOOLKIT:-OFF}
-export WITH_DYNAMIC_NVJPEG=${WITH_DYNAMIC_NVJPEG:-ON}
 export WITH_DYNAMIC_CUFFT=${WITH_DYNAMIC_CUFFT:-ON}
 export WITH_DYNAMIC_NPP=${WITH_DYNAMIC_NPP:-ON}
 export WITH_DYNAMIC_NVCOMP=${WITH_DYNAMIC_NVCOMP:-ON}

conda/dali_native_libs/recipe/build.sh

@@ -56,7 +56,6 @@ cmake -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda \
       -DCUDA_rt_LIBRARY=$BUILD_PREFIX/${ARCH_LONGNAME}-linux-gnu/sysroot/usr/lib/librt.so \
       -DCUDA_CUDA_LIBRARY=/usr/local/cuda/targets/${ARCH}-linux/lib/stubs/libcuda.so \
       -DCUDA_TARGET_ARCHS=${CUDA_TARGET_ARCHS}            \
-      -DNVJPEG_ROOT_DIR=/usr/local/cuda                   \
       -DFFMPEG_ROOT_DIR=$PREFIX/lib                       \
       -DCMAKE_PREFIX_PATH="$PREFIX/libjpeg-turbo;$PREFIX" \
       -DCMAKE_INSTALL_PREFIX=$PREFIX                      \
@@ -86,9 +85,8 @@ cmake -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda \
       -DBUILD_NVIMAGECODEC=${BUILD_NVIMAGECODEC:-ON}      \
       -DLINK_LIBCUDA=${LINK_LIBCUDA:-OFF}                 \
       -DWITH_DYNAMIC_CUDA_TOOLKIT=${WITH_DYNAMIC_CUDA_TOOLKIT:-${WITH_DYNAMIC_CUDA_TOOLKIT_DEFAULT}}\
-      -DWITH_DYNAMIC_NVJPEG=${WITH_DYNAMIC_NVJPEG:-ON}    \
-      -DWITH_DYNAMIC_CUFFT=${WITH_DYNAMIC_CUFFT:-ON}      \
-      -DWITH_DYNAMIC_NPP=${WITH_DYNAMIC_NPP:-ON}          \
+      -DWITH_DYNAMIC_CUFFT=${WITH_DYNAMIC_CUFFT:-ON}       \
+      -DWITH_DYNAMIC_NPP=${WITH_DYNAMIC_NPP:-ON}           \
       -DWITH_DYNAMIC_NVIMGCODEC=${WITH_DYNAMIC_NVIMGCODEC:-ON} \
       -DWITH_DYNAMIC_NVCOMP=${WITH_DYNAMIC_NVCOMP:-ON  }  \
       -DVERBOSE_LOGS=${VERBOSE_LOGS:-OFF}                 \

conda/dali_native_libs/recipe/meta.yaml

@@ -42,7 +42,6 @@ build:
    - BUILD_NVML
    - BUILD_NVCOMP
    - WITH_DYNAMIC_CUDA_TOOLKIT
-   - WITH_DYNAMIC_NVJPEG
    - WITH_DYNAMIC_CUFFT
    - WITH_DYNAMIC_NPP
    - WITH_DYNAMIC_NVIMGCODEC

conda/dali_python_bindings/recipe/build.sh

@@ -62,7 +62,6 @@ cmake -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda \
       -DCUDA_rt_LIBRARY=$BUILD_PREFIX/${ARCH_LONGNAME}-linux-gnu/sysroot/usr/lib/librt.so \
       -DCUDA_CUDA_LIBRARY=/usr/local/cuda/targets/${ARCH}-linux/lib/stubs/libcuda.so \
       -DCUDA_TARGET_ARCHS=${CUDA_TARGET_ARCHS}            \
-      -DNVJPEG_ROOT_DIR=/usr/local/cuda                   \
       -DFFMPEG_ROOT_DIR=$PREFIX/lib                       \
       -DCMAKE_PREFIX_PATH="$PREFIX/libjpeg-turbo;$PREFIX" \
       -DCMAKE_INSTALL_PREFIX=$PREFIX                      \
@@ -92,11 +91,8 @@ cmake -DCUDA_TOOLKIT_ROOT_DIR=/usr/local/cuda \
       -DBUILD_NVIMAGECODEC=${BUILD_NVIMAGECODEC:-ON}      \
       -DLINK_LIBCUDA=${LINK_LIBCUDA:-OFF}                 \
       -DWITH_DYNAMIC_CUDA_TOOLKIT=${WITH_DYNAMIC_CUDA_TOOLKIT:-${WITH_DYNAMIC_CUDA_TOOLKIT_DEFAULT}}\
-      -DWITH_DYNAMIC_NVJPEG=${WITH_DYNAMIC_NVJPEG:-ON}    \
-      -DWITH_DYNAMIC_CUFFT=${WITH_DYNAMIC_CUFFT:-ON}      \
-      -DWITH_DYNAMIC_NPP=${WITH_DYNAMIC_NPP:-ON}          \
-      -DWITH_DYNAMIC_NVIMGCODEC=${WITH_DYNAMIC_NVIMGCODEC:-ON} \
-      -DWITH_DYNAMIC_NVCOMP=${WITH_DYNAMIC_NVCOMP:-ON  }  \
+      -DWITH_DYNAMIC_CUFFT=${WITH_DYNAMIC_CUFFT:-ON}       \
+      -DWITH_DYNAMIC_NPP=${WITH_DYNAMIC_NPP:-ON}           \
       -DVERBOSE_LOGS=${VERBOSE_LOGS:-OFF}                 \
       -DWERROR=${WERROR:-ON}                              \
       -DBUILD_WITH_ASAN=${BUILD_WITH_ASAN:-OFF}           \

conda/dali_python_bindings/recipe/meta.yaml

@@ -42,7 +42,6 @@ build:
    - BUILD_NVML
    - BUILD_NVCOMP
    - WITH_DYNAMIC_CUDA_TOOLKIT
-   - WITH_DYNAMIC_NVJPEG
    - WITH_DYNAMIC_CUFFT
    - WITH_DYNAMIC_NPP
    - WITH_DYNAMIC_NVIMGCODEC

dali/CMakeLists.txt

@@ -50,10 +50,6 @@ if (BUILD_DALI_PIPELINE)
 endif()
 
 if(BUILD_DALI_OPERATORS)
-  if(BUILD_NVJPEG)
-    add_subdirectory(nvjpeg)
-  endif()
-
   if(BUILD_NVIMAGECODEC)
     add_subdirectory(nvimgcodec)
   endif()

dali/operators/CMakeLists.txt

@@ -66,7 +66,6 @@ if (NOT OPERATOR_SRCS_PATTERN STREQUAL "" OR
   list(APPEND EXTRA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/operators.cc")
   # Those are needed for operators.cc to have all symbols
   list(APPEND EXTRA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/util/npp.cc")
-  list(APPEND EXTRA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/decoder/nvjpeg/nvjpeg_helper.cc")
   list(APPEND EXTRA_FILES "${CMAKE_CURRENT_SOURCE_DIR}/video/dynlink_nvcuvid/dynlink_nvcuvid.cc")
 
   list(APPEND OPERATOR_SRCS_PATTERN_EXCLUDE "*test*")
@@ -103,11 +102,6 @@ if (BUILD_CVCUDA)
   target_link_libraries(dali_operators PRIVATE cvcuda nvcv_types)
 endif(BUILD_CVCUDA)
 
-if (BUILD_NVJPEG AND WITH_DYNAMIC_NVJPEG)
-  target_link_libraries(dali_operators PRIVATE dynlink_nvjpeg)
-  target_link_libraries(dali_operators PRIVATE "-Wl,--exclude-libs,$<TARGET_FILE_NAME:dynlink_nvjpeg>")
-endif(BUILD_NVJPEG AND WITH_DYNAMIC_NVJPEG)
-
 if (BUILD_NVIMAGECODEC)
   if (WITH_DYNAMIC_NVIMGCODEC)
     target_link_libraries(dali_operators PRIVATE dynlink_nvimgcodec)

dali/operators/decoder/CMakeLists.txt

@@ -15,14 +15,7 @@
 if(BUILD_LIBSND)
   add_subdirectory(audio)
 endif()
-add_subdirectory(image)
-add_subdirectory(jpeg)
 add_subdirectory(cache)
-add_subdirectory(host)
-add_subdirectory(peek_shape)
-if (BUILD_NVJPEG)
-  add_subdirectory(nvjpeg)
-endif()
 
 if (BUILD_NVCOMP)
   add_subdirectory(inflate)