release_v0.6.0 code drop

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

Author: jantonguirao

.gitattributes

@@ -7,7 +7,9 @@
 *.jp2 filter=lfs diff=lfs merge=lfs -text
 *.j2k filter=lfs diff=lfs merge=lfs -text
 *.bmp filter=lfs diff=lfs merge=lfs -text
+*.svs filter=lfs diff=lfs merge=lfs -text
+*.pptx filter=lfs diff=lfs merge=lfs -text
+
 *.ppm -text
 *.pbm -text
 *.pgm -text
-*.jxr filter=lfs diff=lfs merge=lfs -text

.github/ISSUE_TEMPLATE/bug_report_form.yml

@@ -28,7 +28,7 @@ body:
     attributes:
       label: Version
       description: What version of nvImageCodec are you running?
-      placeholder: "example: 0.5.0"
+      placeholder: "example: 0.6.0"
     validations:
       required: true
 

.gitignore

@@ -10,4 +10,5 @@ bin/*
 .*.swp
 .dockerignore
 nvimgcodec_version.h
-*__pycache__*
+*__pycache__*
+.venv/

CMakeLists.txt

@@ -18,7 +18,7 @@ cmake_minimum_required(VERSION 3.18 FATAL_ERROR)
 include(CMakeDependentOption)
 
 set(NVIMGCODEC_PROJECT_NAME "nvimgcodec")
-set(NVIMGCODEC_VERSION "0.5.0")
+set(NVIMGCODEC_VERSION "0.6.0")
 
 if (NVIMGCODEC_FLAVOR)
     set(NVIMGCODEC_FLAVOR "${NVIMGCODEC_FLAVOR}")  # could be nightly, weekly, etc if necessary
@@ -276,7 +276,7 @@ CUDA_find_supported_arch_values(CUDA_supported_archs ${USED_CUDA_COMPILER} ${CUD
 message(STATUS "CUDA supported archs: ${CUDA_supported_archs}")
 
 set(CUDA_TARGET_ARCHS_SORTED ${CUDA_TARGET_ARCHS})
-list(SORT CUDA_TARGET_ARCHS_SORTED)
+list(SORT CUDA_TARGET_ARCHS_SORTED COMPARE NATURAL)
 CUDA_find_supported_arch_values(CUDA_targeted_archs ${USED_CUDA_COMPILER} ${CUDA_TARGET_ARCHS_SORTED})
 message(STATUS "CUDA targeted archs: ${CUDA_targeted_archs}")
 if (NOT CUDA_targeted_archs)

README.md

@@ -1,6 +1,6 @@
 # nvImageCodec
 
-![Version](https://img.shields.io/badge/Version-v0.5.0--beta-blue)
+![Version](https://img.shields.io/badge/Version-v0.6.0--beta-blue)
 [![License](https://img.shields.io/badge/License-Apache_2.0-yellogreen.svg)](https://opensource.org/licenses/Apache-2.0)
 
 ![Platform](https://img.shields.io/badge/Platform-linux--x86__64_%7C_linux--aarch64_%7C_windows--64_wsl2_%7C_windows--64-blue)
@@ -259,17 +259,17 @@ This will generate in build directory *.zip or *tar.xz files
 #### Tar file installation
 
 ```
-tar -xvf nvimgcodec-0.5.0.0-cuda12-x86_64-linux-lib.tar.gz -C /opt/nvidia/
+tar -xvf nvimgcodec-0.6.0.0-cuda12-x86_64-linux-lib.tar.gz -C /opt/nvidia/
 ```
 
 #### DEB File Installation
 ```
-sudo apt-get install -y ./nvimgcodec-0.5.0.0-cuda12-x86_64-linux-lib.deb
+sudo apt-get install -y ./nvimgcodec-0.6.0.0-cuda12-x86_64-linux-lib.deb
 ```
 #### Python WHL File Installation
 
 ```
-pip install nvidia_nvimgcodec_cu12-0.5.0-py3-none-manylinux2014_x86_64.whl
+pip install nvidia_nvimgcodec_cu12-0.6.0-py3-none-manylinux2014_x86_64.whl
 ```
 
 ### Installation from sources
@@ -329,7 +329,7 @@ Run Python API tests
 First install python wheel. You would also need to have installed all Python tests dependencies (see Dockerfiles). 
 
 ```
-pip install nvidia_nvimgcodec_cu12-0.5.0.x-py3-none-manylinux2014_x86_64.whl
+pip install nvidia_nvimgcodec_cu12-0.6.0.x-py3-none-manylinux2014_x86_64.whl
 ```
 
 Run tests

cmake/CUDA_utils.cmake

@@ -41,18 +41,26 @@ endfunction()
 # List of currently used arch values
 if (${ARCH} MATCHES "aarch64-")
   # aarch64-linux and aarch64-qnx
-  set(CUDA_known_archs "53" "62" "72" "75" "87")
+  # used for tegra boards
+  set(CUDA_known_archs "53" "62" "72" "87" "90a" "110")
 elseif (${ARCH} MATCHES "aarch64")
   # aarch64 SBSA, only >=Volta
   # from the whole list/; "70" "75" "80" "86"
   # we pick only major arch as minor should be compatible without JITing, it should
   # shrink  the output binary
-  set(CUDA_known_archs "70" "80" "90")
+  set(CUDA_known_archs "70" "80" "90" "100" "110" "120")
 else()
   # from the whole list: "35" "50" "52" "60" "61" "70" "75" "80" "86"
   # we pick only major arch as minor should be compatible without JITing, it should
   # shrink  the output binary
-  set(CUDA_known_archs "35" "50" "60" "70" "80" "90")
+  set(CUDA_known_archs "35" "50" "60" "70" "80" "90" "100" "110" "120")
+endif()
+
+if ("${CUDA_VERSION_MAJOR}" EQUAL "13")
+  # We need sm75 to Turing, which is still supported with cuda 13
+  # but major version (sm70) is Volta, which is not supported with cuda 13."
+  list(APPEND CUDA_known_archs "75")
+  list(SORT CUDA_known_archs COMPARE NATURAL)
 endif()
 
 set(CUDA_TARGET_ARCHS ${CUDA_known_archs} CACHE STRING "List of target CUDA architectures")

cmake/Dependencies.cmake

@@ -1,4 +1,4 @@
-# Copyright (c) 2022-2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# Copyright (c) 2022-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
 #
 # SPDX-FileCopyrightText: NVIDIA CORPORATION & AFFILIATES
 # SPDX-License-Identifier: LicenseRef-NvidiaProprietary
@@ -33,6 +33,11 @@ endfunction()
 
 find_package(CUDAToolkit REQUIRED)
 
+set(CTK_SEARCH_PATHS
+    ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
+    ${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/include
+)
+
 include_directories(SYSTEM ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES})
 find_path(NVJPEG_INCLUDE
     NAMES nvjpeg.h
@@ -45,97 +50,90 @@ include_directories(SYSTEM ${NVJPEG_INCLUDE})
 include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/external/NVTX/c/include)
 include_directories(SYSTEM ${PROJECT_SOURCE_DIR}/external/dlpack/include)
 
-# Linking with static nvjpeg2k until there is a python package for it
 if (BUILD_NVJPEG2K_EXT)
-    if (NOT WITH_DYNAMIC_NVJPEG2K)
-        CUDA_find_library(NVJPEG2K_LIBRARY nvjpeg2k_static)
-        if (${NVJPEG2K_LIBRARY} STREQUAL "NVJPEG2K_LIBRARY-NOTFOUND")
-            message(WARNING "nvjpeg2k not found - disabled")
-            set(BUILD_NVJPEG2K_EXT OFF CACHE BOOL INTERNAL)
-            set(BUILD_NVJPEG2K_EXT OFF)
-        else()
-            message(STATUS "Found nvjpeg2k: " ${NVJPEG2K_LIBRARY})
-        endif()
-    else()
-        # Note: We are getting the x86_64 tarball, but we are only interested in the headers.
+    if (WITH_DYNAMIC_NVJPEG2K)
         include(FetchContent)
         FetchContent_Declare(
             nvjpeg2k_headers
-            URL      https://developer.download.nvidia.com/compute/nvjpeg2000/redist/libnvjpeg_2k/linux-x86_64/libnvjpeg_2k-linux-x86_64-0.8.0.38-archive.tar.xz
-            URL_HASH SHA512=21acc1bfa7b6967fc2240dac9c9041faa6c10c9fe356f754748b6a6154e92031b0e4d8d1a0a1d1cdfb5c68b929126d548e7ea3d321609d339c2a6668281d2180
+            URL      https://developer.download.nvidia.com/compute/nvjpeg2000/redist/libnvjpeg_2k/linux-x86_64/libnvjpeg_2k-linux-x86_64-0.9.0.43-archive.tar.xz
+            URL_HASH SHA512=22d14a20af67ba414956fd7c4223cf3fd519cec9ccbd0ae27603416ab143eae92457ab0434205fe66617bcc5a54805bfc6183f89205ea2d0068d497321a43783
         )
         FetchContent_Populate(nvjpeg2k_headers)
-        set(nvjpeg2k_SEARCH_PATH "${nvjpeg2k_headers_SOURCE_DIR}/include")
+        set(NVJPEG2K_SEARCH_PATHS "${nvjpeg2k_headers_SOURCE_DIR}/include")
+    else()
+        set(NVJPEG2K_SEARCH_PATHS ${CTK_SEARCH_PATHS})
+        find_library(NVJPEG2K_LIBRARY nvjpeg2k_static PATH_SUFFIXES lib lib64)
+        if(NVJPEG2K_LIBRARY)
+            message(STATUS "Found nvJPEG2k: ${NVJPEG2K_LIBRARY}")
+        else()
+            message(WARNING "nvJPEG2k library not found. Disabling nvJPEG2k and tests build.")
+            set(BUILD_NVJPEG2K_EXT OFF CACHE BOOL INTERNAL)
+            set(BUILD_NVJPEG2K_EXT OFF)
+        endif()
     endif()
 
-    if(NOT DEFINED NVJPEG2K_INCLUDE)
-        find_path(NVJPEG2K_INCLUDE
-            NAMES nvjpeg2k.h
-            PATHS ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
-                  ${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/include
-                  ${nvjpeg2k_SEARCH_PATH}
-        )
+    find_path(NVJPEG2K_INCLUDE NAMES nvjpeg2k.h HINTS ${NVJPEG2K_SEARCH_PATHS})
+
+    if((NVJPEG2K_LIBRARY OR WITH_DYNAMIC_NVJPEG2K) AND NOT NVJPEG2K_INCLUDE)
+        message(FATAL_ERROR
+        "nvJPEG2k header file not found, please check your install"
+        " or disable nvJPEG2k extension build with -DBUILD_NVJPEG2K_EXT=OFF")
     endif()
 endif()
 
 if (BUILD_NVJPEG2K_EXT)
-    message(STATUS "NVJPEG2K_INCLUDE=${NVJPEG2K_INCLUDE}")
-    include_directories(SYSTEM ${NVJPEG2K_INCLUDE})
+    message(STATUS "Using NVJPEG2K_INCLUDE=${NVJPEG2K_INCLUDE}")
+    include_directories(BEFORE SYSTEM ${NVJPEG2K_INCLUDE})
 else()
-    message(STATUS "nvjpeg2k extension build disabled")
+    message(STATUS "nvJPEG2k extension build disabled")
 endif()
 
 if (BUILD_NVTIFF_EXT)
     if (WITH_DYNAMIC_NVTIFF)
-        message(STATUS "Dynamic nvTIFF extension build")
-        # Note: We are getting the x86_64 tarball, but we are only interested in the headers.
         include(FetchContent)
         FetchContent_Declare(
             nvtiff_headers
-            URL      https://developer.download.nvidia.com/compute/nvtiff/redist/libnvtiff/linux-x86_64/libnvtiff-linux-x86_64-0.5.0.67_cuda12-archive.tar.xz
-            URL_HASH SHA512=62dea5c9b72aa3f4e18b306e3f1e60a00082e67c6cedc95442413b39aa48e41ae4b9371a5ff210a37a6cb3008ed308aeb78cbf2a7b9df55bc5ee7a6da0899832 
+            URL      https://developer.download.nvidia.com/compute/nvtiff/redist/libnvtiff/linux-x86_64/libnvtiff-linux-x86_64-0.5.1.75_cuda12-archive.tar.xz
+            URL_HASH SHA512=66332d1cb32d428b8f7fce8ebaf9d44caa01d85f77d880c827ccf15459f3164e6dcfabfb88e4a0c2b0916ef83161c2d9f8990bebb8d61aca938cd9199b514752
         )
         FetchContent_Populate(nvtiff_headers)
-        set(nvtiff_SEARCH_PATH "${nvtiff_headers_SOURCE_DIR}/include")
-
-        find_path(NVTIFF_INCLUDE
-            NAMES nvtiff.h
-            PATHS ${CMAKE_CUDA_TOOLKIT_INCLUDE_DIRECTORIES}
-                ${CMAKE_CUDA_COMPILER_TOOLKIT_ROOT}/include
-                ${nvtiff_SEARCH_PATH}
-        )
+        set(NVTIFF_SEARCH_PATHS "${nvtiff_headers_SOURCE_DIR}/include")
     else()
+        set(NVTIFF_SEARCH_PATHS ${CTK_SEARCH_PATHS})
         find_library(NVTIFF_LIB nvtiff_static PATH_SUFFIXES lib lib64)
-        if(NOT NVTIFF_LIB)
-            message(WARNING, "nvTIFF library not found. Disabling its extensions and tests build.")
+        if(NVTIFF_LIB)
+            message(STATUS "Found nvTIFF: ${NVTIFF_LIB}")
+        else()
+            message(WARNING "nvTIFF library not found. Disabling nvTIFF extension and tests build.")
             set(BUILD_NVTIFF_EXT OFF CACHE BOOL INTERNAL)
             set(BUILD_NVTIFF_EXT OFF)
-        else()
-            message(STATUS "Found nvTIFF: ${NVTIFF_LIB}")
-            find_path(NVTIFF_INCLUDE NAMES nvtiff.h)
-            if(NOT NVTIFF_INCLUDE)
-                message(FATAL_ERROR,
-                " Found nvTIFF library file but not header file, please check your install"
-                " or disable nvTIFF extension build with -DBUILD_NVTIFF_EXT=OFF")
-            endif()
         endif()
     endif()
+
+    find_path(NVTIFF_INCLUDE NAMES nvtiff.h HINTS ${NVTIFF_SEARCH_PATHS})
+
+    if((NVTIFF_LIB OR WITH_DYNAMIC_NVTIFF) AND NOT NVTIFF_INCLUDE)
+        message(FATAL_ERROR
+        "nvTIFF header file not found, please check your install"
+        " or disable nvTIFF extension build with -DBUILD_NVTIFF_EXT=OFF")
+    endif()
 endif()
+
 if (BUILD_NVTIFF_EXT)
     message(STATUS "Using NVTIFF_INCLUDE=${NVTIFF_INCLUDE}")
-    include_directories(SYSTEM ${NVTIFF_INCLUDE})
+    include_directories(BEFORE SYSTEM ${NVTIFF_INCLUDE})
 else()
-    message(STATUS "nvtiff extension build disabled")
+    message(STATUS "nvTIFF extension build disabled")
 endif()
 
 set(TIFF_LIBRARY_DEPS)
 
 find_package(ZLIB)
-if(NOT DEFINED ZLIB_LIBRARY)
+if(NOT ZLIB_FOUND)
     message(STATUS "zlib not found - disabled")
 else()
-    message(STATUS "Using zlib at ${ZLIB_LIBRARY}")
-    list(APPEND TIFF_LIBRARY_DEPS ${ZLIB_LIBRARY})
+    message(STATUS "Using zlib at ${ZLIB_LIBRARIES}")
+    list(APPEND TIFF_LIBRARY_DEPS ${ZLIB_LIBRARIES})
 endif()
 
 find_package(ZSTD)
@@ -147,14 +145,14 @@ else()
 endif()
 
 find_package(JPEG 62) # 1.5.3 version
-if(NOT DEFINED JPEG_LIBRARY)
+if(NOT JPEG_FOUND)
     message(STATUS "libjpeg-turbo not found - disabled")
     set(BUILD_LIBJPEG_TURBO_EXT OFF CACHE BOOL INTERNAL)
     set(BUILD_LIBJPEG_TURBO_EXT OFF)
 else()
-    message(STATUS "Using libjpeg-turbo at ${JPEG_LIBRARY}")
-    include_directories(SYSTEM ${JPEG_INCLUDE_DIR})
-    list(APPEND TIFF_LIBRARY_DEPS ${JPEG_LIBRARY})
+    message(STATUS "Using libjpeg-turbo at ${JPEG_LIBRARIES}")
+    include_directories(SYSTEM ${JPEG_INCLUDE_DIRS})
+    list(APPEND TIFF_LIBRARY_DEPS ${JPEG_LIBRARIES})
 endif()
 
 find_package(TIFF)

docker/Dockerfile.aarch64

@@ -44,39 +44,31 @@ RUN apt-get update && apt-get install software-properties-common -y --no-install
     && rm -rf /var/lib/apt/lists/*
 
 RUN CUDA_VERSION_MAJOR=$(echo "$VER_CUDA" | sed -E 's/^([0-9]+)\..*/\1/') && \
-    NVJPEG2K_VERSION=0.8.0.38-1 && \
-    apt-get update && \
-    apt-get install wget software-properties-common -y && \
-    apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/sbsa/3bf863cc.pub && \
-    apt-key adv --fetch-keys https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/sbsa/7fa2af80.pub && \
-    add-apt-repository "deb https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2004/sbsa/ /" && \
-    apt-get update && \
-    apt-get install libnvjpeg2k0-dev-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \
-                    libnvjpeg2k0-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} \
-                    libnvjpeg2k0-static-cuda-${CUDA_VERSION_MAJOR}=${NVJPEG2K_VERSION} -y && \
-    cp /usr/include/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/include/ && \
-    cp -d /usr/lib/sbsa-linux-gnu/libnvjpeg2k/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/lib64/ && \
-    rm -rf /var/lib/apt/lists/*
+    NVJPEG2K_VERSION=0.9.0.43 && \
+    wget https://developer.download.nvidia.com/compute/nvjpeg2000/redist/libnvjpeg_2k/linux-sbsa/libnvjpeg_2k-linux-sbsa-${NVJPEG2K_VERSION}-archive.tar.xz && \
+    tar -xf libnvjpeg_2k-linux-sbsa-${NVJPEG2K_VERSION}-archive.tar.xz && \
+    cp -d libnvjpeg_2k-linux-sbsa-${NVJPEG2K_VERSION}-archive/lib/${CUDA_VERSION_MAJOR}/* /usr/local/cuda/lib64/ && \
+    rm -r libnvjpeg_2k-linux-sbsa-${NVJPEG2K_VERSION}-archive libnvjpeg_2k-linux-sbsa-${NVJPEG2K_VERSION}-archive.tar.xz
 
 RUN CUDA_VERSION_MAJOR=$(echo "$VER_CUDA" | sed -E 's/^([0-9]+)\..*/\1/') && \
-    NVTIFF_VERSION=0.5.0.67 && \
+    test "$CUDA_VERSION_MAJOR" -gt 12 && CUDA_VERSION_MAJOR=12 || true && \
+    NVTIFF_VERSION=0.5.1.75 && \
     wget https://developer.download.nvidia.com/compute/nvtiff/redist/libnvtiff/linux-sbsa/libnvtiff-linux-sbsa-${NVTIFF_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive.tar.xz && \
     tar -xf libnvtiff-linux-sbsa-${NVTIFF_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive.tar.xz && \
     cp -d libnvtiff-linux-sbsa-${NVTIFF_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive/lib/* /usr/local/cuda/lib64/ && \
     rm -r libnvtiff-linux-sbsa-${NVTIFF_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive libnvtiff-linux-sbsa-${NVTIFF_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive.tar.xz
 
 RUN CUDA_VERSION_MAJOR=$(echo "$VER_CUDA" | sed -E 's/^([0-9]+)\..*/\1/') && \
-    NVCOMP_VERSION=4.0.1 && \
+    test "$CUDA_VERSION_MAJOR" -gt 12 && CUDA_VERSION_MAJOR=12 || true && \
+    NVCOMP_VERSION=5.0.0.6 && \
     echo "Installing nvcomp for cuda ${CUDA_VERSION_MAJOR}" && \
-    wget https://developer.download.nvidia.com/compute/nvcomp/${NVCOMP_VERSION}/local_installers/nvcomp-linux-sbsa-${NVCOMP_VERSION}-cuda${CUDA_VERSION_MAJOR}.x.tar.gz && \
-    tar -xf nvcomp-linux-sbsa-${NVCOMP_VERSION}-cuda${CUDA_VERSION_MAJOR}.x.tar.gz && \
-    cp -d nvcomp/lib/libnvcomp.so* /usr/local/cuda/lib64/ && \
-    rm -r nvcomp nvcomp-linux-sbsa-${NVCOMP_VERSION}-cuda${CUDA_VERSION_MAJOR}.x.tar.gz
+    wget https://developer.download.nvidia.com/compute/nvcomp/redist/nvcomp/linux-sbsa/nvcomp-linux-sbsa-${NVCOMP_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive.tar.xz && \
+    tar -xf nvcomp-linux-sbsa-${NVCOMP_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive.tar.xz && \
+    cp -d nvcomp-linux-sbsa-${NVCOMP_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive/lib/libnvcomp.so* /usr/local/cuda/lib64/ && \
+    rm -r nvcomp-linux-sbsa-${NVCOMP_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive nvcomp-linux-sbsa-${NVCOMP_VERSION}_cuda${CUDA_VERSION_MAJOR}-archive.tar.xz
 
-RUN CUDA_VERSION_MAJOR=$(echo "$VER_CUDA" | sed -E 's/^([0-9]+)\..*/\1/') && \
-    python3 -m pip install \
+RUN python3 -m pip install \
     pytest \
-    cupy-cuda${CUDA_VERSION_MAJOR}x \
     opencv-python \
     sphinx \
     sphinx_rtd_theme \
@@ -95,22 +87,30 @@ RUN CUDA_VERSION_MAJOR=$(echo "$VER_CUDA" | sed -E 's/^([0-9]+)\..*/\1/') && \
     nose2 && \
     rm -rf /root/.cache/pip
 
+RUN CUDA_VERSION_MAJOR=$(echo "$VER_CUDA" | sed -E 's/^([0-9]+)\..*/\1/') && \
+    if [ "$CUDA_VERSION_MAJOR" = "13" ]; then \
+        python3 -m pip install --pre cupy-cuda12X -f https://pip.cupy.dev/pre; \
+    else \
+        python3 -m pip install cupy-cuda${CUDA_VERSION_MAJOR}x==12.3; \
+    fi
+
 # DALI
 ENV DALI_PATH="/opt/dali"
 ENV DALI_EXTRA_PATH="/opt/dali_extra"
 RUN CUDA_VERSION_MAJOR=$(echo "$VER_CUDA" | sed -E 's/^([0-9]+)\..*/\1/') && \
+    test "$CUDA_VERSION_MAJOR" -gt 12 && CUDA_VERSION_MAJOR=12 || true && \
     # Install DALI
-    python3 -m pip install nvidia-dali-cuda${CUDA_VERSION_MAJOR}0>=1.46.0 && \
+    python3 -m pip install --upgrade --force-reinstall pip && \
+    python3 -m pip install nvidia-dali-cuda${CUDA_VERSION_MAJOR}0>=1.48.0 && \
     # Uninstall nvimagecodec pulled automatically
-    python3 -m pip uninstall -y nvidia-nvimgcodec-cu${CUDA_VERSION_MAJOR} && \
+    python3 -m pip uninstall -y nvidia-nvimgcodec-cu${CUDA_VERSION_MAJOR} nvidia-nvjpeg2k-cu${CUDA_VERSION_MAJOR} nvidia-nvtiff-cu${CUDA_VERSION_MAJOR} nvidia-nvcomp-cu${CUDA_VERSION_MAJOR} || true && \
     mkdir -p /opt && \
     # Get installed DALI version
     export DALI_VERSION=$(pip show nvidia-dali-cuda${CUDA_VERSION_MAJOR}0 | sed -n 's/^Version: \(.*\)$/\1/p') && \
     # Fetch sources for the currently installed DALI version
     git clone https://github.com/NVIDIA/DALI.git ${DALI_PATH} && \
-    cd ${DALI_PATH}; git checkout tags/v${DALI_VERSION} || true; cd - && \
+    cd ${DALI_PATH} && git checkout tags/v${DALI_VERSION} && cd - && \
     # Fetch DALI_extra for the current DALI sources
     git clone https://github.com/NVIDIA/DALI_extra.git ${DALI_EXTRA_PATH} && \
-    cd ${DALI_EXTRA_PATH}; git checkout $(cat /opt/dali/DALI_EXTRA_VERSION) || true; cd -
-
+    cd ${DALI_EXTRA_PATH} && git checkout $(cat /opt/dali/DALI_EXTRA_VERSION) && cd -
 WORKDIR /workspace