holoscan-cli 3.6.0__py3-none-any.whl → 3.7.0__py3-none-any.whl

holoscan_cli/common/artifact_sources.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 import json
 import logging
+import os
 from typing import Any, Optional
 
 import requests
@@ -36,8 +37,9 @@ class ArtifactSources:
     HoloscanVersion = None
     ManifestFileUrl = None
 
-    def __init__(self) -> None:
+    def __init__(self, cuda_version: int) -> None:
         self._logger = logging.getLogger("common")
+        self._cuda_version = cuda_version
         try:
             ArtifactSources.HoloscanVersion = ".".join(
                 str(i) for i in Version(__version__).release[0:3]
@@ -48,7 +50,10 @@ class ArtifactSources:
                 "a Holoscan SDK version to use."
             ) from ex
 
-        ArtifactSources.ManifestFileUrl = f"https://raw.githubusercontent.com/nvidia-holoscan/holoscan-cli/refs/heads/main/releases/{ArtifactSources.HoloscanVersion}/artifacts.json"  # noqa: E501
+        if self._cuda_version == 12:
+            ArtifactSources.ManifestFileUrl = f"https://raw.githubusercontent.com/nvidia-holoscan/holoscan-cli/refs/heads/main/releases/{ArtifactSources.HoloscanVersion}/artifacts-cu12.json"  # noqa: E501
+        else:
+            ArtifactSources.ManifestFileUrl = f"https://raw.githubusercontent.com/nvidia-holoscan/holoscan-cli/refs/heads/main/releases/{ArtifactSources.HoloscanVersion}/artifacts.json"  # noqa: E501
 
     @property
     def holoscan_versions(self) -> list[str]:
@@ -82,6 +87,12 @@ class ArtifactSources:
                 "Downloading manifest files from non-HTTPS servers is not supported."
             )
         else:
+            if os.path.isdir(uri):
+                if self._cuda_version == 12:
+                    uri = os.path.join(uri, "artifacts-cu12.json")
+                else:
+                    uri = os.path.join(uri, "artifacts.json")
+
             self._logger.info(f"Using CLI manifest file from {uri}...")
             with open(uri) as file:
                 temp = json.load(file)
@@ -116,7 +127,7 @@ class ArtifactSources:
         )
 
     def _download_manifest_internal(self, url, headers=None):
-        self._logger.info("Downloading CLI manifest file...")
+        self._logger.info(f"Downloading CLI manifest file from {url}...")
         manifest = requests.get(url, headers=headers)
 
         try:

holoscan_cli/common/constants.py

@@ -69,6 +69,9 @@ class Constants:
 
     RESOURCE_SHARED_MEMORY_KEY = "sharedMemory"
 
+    # Include "holoscan" for backward compatibility; remove post 3.7.0 release
+    PYPI_PACKAGE_NAMES = ["holoscan-cu12", "holoscan-cu13", "holoscan"]
+
 
 class SDK:
     """

holoscan_cli/common/sdk_utils.py

@@ -21,6 +21,7 @@ from typing import Optional
 from packaging.version import Version
 
 from .artifact_sources import ArtifactSources
+from .constants import Constants
 from .enum_types import SdkType
 from .exceptions import FailedToDetectSDKVersionError, InvalidSdkError
 
@@ -125,32 +126,37 @@ def detect_holoscan_version(sdk_version: Optional[Version] = None) -> str:
     if sdk_version is not None:
         return sdk_version.base_version
     else:
-        try:
-            ver_str = importlib.metadata.version("holoscan").title()
-            ver = Version(ver_str)
-            ver_str = ".".join(str(i) for i in ver.release)
-
-            if len(ver.release) == 1 and ver.major == ver.release[0]:
-                ver_str = ver_str + ".0.0"
-            elif (
-                len(ver.release) == 2
-                and ver.major == ver.release[0]
-                and ver.minor == ver.release[1]
-            ):
-                ver_str = ver_str + ".0"
-            elif (
-                len(ver.release) == 4
-                and ver.major == ver.release[0]
-                and ver.minor == ver.release[1]
-                and ver.micro == ver.release[2]
-            ):
-                ver_str = f"{ver.release[0]}.{ver.release[1]}.{ver.release[2]}"
-
-            return ver_str
-        except Exception as ex:
+        # Scan for installed packages with prefix "holoscan"
+        holoscan_pkgs = [
+            dist.metadata["Name"]
+            for dist in importlib.metadata.distributions()
+            if dist.metadata["Name"].lower() in Constants.PYPI_PACKAGE_NAMES
+        ]
+        if not holoscan_pkgs:
             raise FailedToDetectSDKVersionError(
-                "Failed to detect installed Holoscan PyPI version.", ex
-            ) from ex
+                "No installed Holoscan PyPI package found."
+            )
+        ver_str = importlib.metadata.version(holoscan_pkgs[0]).title()
+        ver = Version(ver_str)
+        ver_str = ".".join(str(i) for i in ver.release)
+
+        if len(ver.release) == 1 and ver.major == ver.release[0]:
+            ver_str = ver_str + ".0.0"
+        elif (
+            len(ver.release) == 2
+            and ver.major == ver.release[0]
+            and ver.minor == ver.release[1]
+        ):
+            ver_str = ver_str + ".0"
+        elif (
+            len(ver.release) == 4
+            and ver.major == ver.release[0]
+            and ver.minor == ver.release[1]
+            and ver.micro == ver.release[2]
+        ):
+            ver_str = f"{ver.release[0]}.{ver.release[1]}.{ver.release[2]}"
+
+        return ver_str
 
 
 def detect_monaideploy_version(sdk_version: Optional[Version] = None) -> str:

holoscan_cli/packager/arguments.py

@@ -54,7 +54,7 @@ class PackagingArguments:
 
         self._platforms: list[PlatformParameters]
         self._build_parameters = PackageBuildParameters()
-        self._artifact_sources = ArtifactSources()
+        self._artifact_sources = ArtifactSources(args.cuda)
 
         if args.source is not None:
             self._artifact_sources.load(args.source)

holoscan_cli/packager/container_builder.py

@@ -27,7 +27,10 @@ from ..common.dockerutils import (
     create_and_get_builder,
     docker_export_tarball,
 )
-from ..common.exceptions import WrongApplicationPathError
+from ..common.exceptions import (
+    IncompatiblePlatformConfigurationError,
+    WrongApplicationPathError,
+)
 from .parameters import PackageBuildParameters, PlatformBuildResults, PlatformParameters
 
 
@@ -203,6 +206,7 @@ Building image for:                 {platform_parameters.platform.value}
     Architecture:                   {platform_parameters.platform_arch.value}
     Base Image:                     {platform_parameters.base_image}
     Build Image:                    {platform_parameters.build_image if platform_parameters.build_image is not None else "N/A"}
+    CUDA Version:                   {platform_parameters.cuda_version}
     Cache:                          {'Disabled' if self._build_parameters.no_cache else 'Enabled'}
     Configuration:                  {platform_parameters.platform_config.value}
     Holoscan SDK Package:           {platform_parameters.holoscan_sdk_file if platform_parameters.holoscan_sdk_file is not None else "N/A"}
@@ -354,7 +358,15 @@ Building image for:                 {platform_parameters.platform.value}
 """
         )
 
-        jinja_template = jinja_env.get_template("Dockerfile.jinja2")
+        if platform_parameters.cuda_version == 12:
+            jinja_template = jinja_env.get_template("Dockerfile-cu12.jinja2")
+        elif platform_parameters.cuda_version == 13:
+            jinja_template = jinja_env.get_template("Dockerfile.jinja2")
+        else:
+            raise IncompatiblePlatformConfigurationError(
+                f"Invalid CUDA version: {platform_parameters.cuda_version}"
+            )
+
         return jinja_template.render(
             {
                 **self._build_parameters.to_jinja,

holoscan_cli/packager/package_command.py

@@ -59,6 +59,14 @@ def create_package_parser(
         type=valid_existing_path,
         help="Holoscan application configuration file (.yaml)",
     )
+    parser.add_argument(
+        "--cuda",
+        type=int,
+        default=13,
+        choices=[12, 13],
+        help="set the version of the CUDA that is used to build the application. "
+        "Valid values: 12, 13. (default: 13)",
+    )
     parser.add_argument(
         "--docs",
         "-d",

holoscan_cli/packager/parameters.py

@@ -36,6 +36,7 @@ class PlatformParameters:
         platform: Platform,
         tag: str,
         version: str,
+        cuda_version: int = 13,
     ) -> None:
         self._logger = logging.getLogger("platform.parameters")
         self._platform = SDK.INTERNAL_PLATFORM_MAPPINGS[platform][0]
@@ -67,6 +68,7 @@ class PlatformParameters:
         self._data["custom_base_image"] = False
         self._data["custom_holoscan_sdk"] = False
         self._data["custom_monai_deploy_sdk"] = False
+        self._data["cuda_version"] = cuda_version
         self._data["target_arch"] = "aarch64" if self._arch == Arch.arm64 else "x86_64"
         self._data["cuda_deb_arch"] = "sbsa" if self._arch == Arch.arm64 else "x86_64"
         self._data["holoscan_deb_arch"] = (
@@ -128,6 +130,10 @@ class PlatformParameters:
     def build_image(self, value: str):
         self._data["build_image"] = value
 
+    @property
+    def cuda_version(self) -> int:
+        return self._data["cuda_version"]
+
     @property
     def holoscan_sdk_file(self) -> Optional[Path]:
         return self._data["holoscan_sdk_file"]

holoscan_cli/packager/platforms.py

@@ -76,7 +76,9 @@ class Platform:
 
         platforms = []
         for platform in args.platform:
-            platform_parameters = PlatformParameters(platform, args.tag, version)
+            platform_parameters = PlatformParameters(
+                platform, args.tag, version, args.cuda
+            )
 
             (
                 platform_parameters.custom_base_image,
@@ -90,6 +92,7 @@ class Platform:
                 holoscan_sdk_version,
                 application_type,
                 args.build_image,
+                platform_parameters.cuda_version,
             )
 
             (
@@ -187,7 +190,10 @@ class Platform:
                 f"""No base image found for the selected configuration:
                         Platform: {platform_parameters.platform}
                         Configuration: {platform_parameters.platform_config}
-                        Version: {sdk_version}"""
+                        Version: {sdk_version}
+                        CUDA Version: {platform_parameters.cuda_version}
+                    Try to use a different CUDA version with '--cuda' option.
+                    """
             ) from ex
 
     def _find_build_image(
@@ -196,6 +202,7 @@ class Platform:
         sdk_version: str,
         application_type: ApplicationType,
         build_image: Optional[str] = None,
+        cuda_version: int = 13,
     ) -> Optional[str]:
         """
         Ensure user provided build image exists or locate the build image to use based on the
@@ -206,6 +213,7 @@ class Platform:
             sdk_version (str): SDK version
             application_type (ApplicationType): application type
             build_image (Optional[str]): user provided build image
+            cuda_version (int): CUDA version
 
         Returns:
             (str): build image for building the image based on the given platform and SDK version.
@@ -229,6 +237,8 @@ class Platform:
                     f"\n   Platform: {platform_parameters.platform.value}"
                     f"\n   Configuration: {platform_parameters.platform_config.value}"
                     f"\n   Version: {sdk_version}"
+                    f"\n   CUDA Version: {cuda_version}"
+                    "\n Try to use a different CUDA version with '--cuda' option."
                 ) from ex
         else:
             return None

holoscan_cli/packager/templates/Dockerfile-cu12.jinja2

@@ -0,0 +1,399 @@
+# SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# 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.
+
+ARG GPU_TYPE=dgpu
+ARG LIBTORCH_VERSION=2.8.0
+ARG LIBTORCH_VISION_VERSION="0.23.0"
+
+{% if application_type == 'CppCMake' %}
+# Build C++ application in the builder stage
+FROM {{ build_image }} AS builder
+ENV DEBIAN_FRONTEND=noninteractive
+
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends jq
+
+WORKDIR /src
+COPY ./app/* /src
+
+RUN mkdir -p /install/.cmake/api/v1/query/ && \
+    touch /install/.cmake/api/v1/query/codemodel-v2
+RUN cd /src && \
+    cmake -S . -DHOLOHUB_DOWNLOAD_DATASETS=OFF {{ cmake_args }} -B /install && \
+    cmake --build /install -j && \
+    export OUTNAME=$(cat $(find /install/.cmake/api/v1/reply -type f | xargs grep -l "nameOnDisk") | jq -r '.nameOnDisk') && \
+    cd /install && \
+    if [ "${OUTNAME}" != "{{ command_filename }}" ]; then mv ./${OUTNAME} ./{{ command_filename }}; fi
+
+RUN rm /install/CMakeCache.txt /install/Makefile /install/cmake_install.cmake && \
+    rm -r /install/CMakeFiles/ /install/.cmake/
+{% endif %}
+
+
+
+FROM {{ base_image }} AS base
+
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        curl \
+        jq \
+    && rm -rf /var/lib/apt/lists/*
+
+{% if 'onnx' in includes %}
+# Collect onnx dependencies
+FROM base AS onnx-dependencies
+ARG GPU_TYPE
+ARG ONNX_RUNTIME_VERSION=1.22.1
+
+WORKDIR /opt/onnxruntime
+
+# Download onnx binaries
+RUN CUDA_MAJOR_MINOR=12.6 \
+    && echo "Downloading from https://edge.urm.nvidia.com/artifactory/sw-holoscan-thirdparty-generic-local/onnxruntime/onnxruntime-${ONNX_RUNTIME_VERSION}-cuda-${CUDA_MAJOR_MINOR}-$(uname -m).tar.gz" \
+    && curl -S -L -# -o ort.tgz \
+    https://edge.urm.nvidia.com/artifactory/sw-holoscan-thirdparty-generic-local/onnxruntime/onnxruntime-${ONNX_RUNTIME_VERSION}-cuda-${CUDA_MAJOR_MINOR}-$(uname -m).tar.gz
+RUN mkdir -p ${ONNX_RUNTIME_VERSION} \
+    && tar -xf ort.tgz -C ${ONNX_RUNTIME_VERSION} --strip-components 2 --no-same-owner --no-same-permissions \
+    && rm -f ort.tgz
+WORKDIR /
+# End collect onnx dependencies
+{% endif %}
+
+FROM base AS release
+ENV DEBIAN_FRONTEND=noninteractive
+ENV TERM=xterm-256color
+
+ARG GPU_TYPE
+ARG UNAME
+ARG UID
+ARG GID
+ARG LIBTORCH_VERSION
+ARG LIBTORCH_VISION_VERSION
+
+RUN mkdir -p /etc/holoscan/ \
+        && mkdir -p /opt/holoscan/ \
+        && mkdir -p {{ working_dir }} \
+        && mkdir -p {{ app_dir }} \
+        && mkdir -p {{ full_input_path }} \
+        && mkdir -p {{ full_output_path }}
+
+LABEL base="{{ base_image }}"
+LABEL tag="{{ tag }}"
+LABEL org.opencontainers.image.title="{{ title }}"
+LABEL org.opencontainers.image.version="{{ version }}"
+LABEL org.nvidia.holoscan="{{ holoscan_sdk_version }}"
+
+{% if sdk_type == 'monai-deploy' %}
+LABEL org.monai.deploy.app-sdk="{{ monai_deploy_app_sdk_version }}"
+{% endif %}
+
+ENV HOLOSCAN_INPUT_PATH={{ full_input_path }}
+ENV HOLOSCAN_OUTPUT_PATH={{ full_output_path }}
+ENV HOLOSCAN_WORKDIR={{ working_dir }}
+ENV HOLOSCAN_APPLICATION={{ app_dir }}
+ENV HOLOSCAN_TIMEOUT={{ timeout }}
+ENV HOLOSCAN_MODEL_PATH={{ models_dir }}
+ENV HOLOSCAN_DOCS_PATH={{ docs_dir }}
+ENV HOLOSCAN_CONFIG_PATH={{ config_file_path }}
+ENV HOLOSCAN_APP_MANIFEST_PATH={{ app_json }}
+ENV HOLOSCAN_PKG_MANIFEST_PATH={{ pkg_json }}
+ENV HOLOSCAN_LOGS_PATH={{ logs_dir }}
+ENV HOLOSCAN_VERSION={{ holoscan_sdk_version }}
+
+# Update NV GPG repo key
+# https://developer.nvidia.com/blog/updating-the-cuda-linux-gpg-repository-key/
+RUN rm -f /etc/apt/sources.list.d/cuda*.list \
+    && curl -OL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/{{ cuda_deb_arch }}/cuda-keyring_1.1-1_all.deb \
+    && dpkg -i cuda-keyring_1.1-1_all.deb \
+    && rm -f cuda-keyring_1.1-1_all.deb \
+    && apt-get update
+
+{% if 'debug' in includes %}
+# Install debugging tools
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests  \
+        build-essential \
+        ccache \
+        gdb \
+        strace \
+        sudo \
+    && rm -rf /var/lib/apt/lists/*
+### End install debugging tools
+{% endif %}
+
+
+{% if 'holoviz' in includes %}
+# Install Holoviz dependencies
+RUN apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests --allow-downgrades --allow-change-held-packages -y \
+        libvulkan1="1.3.275.0-*" \
+        # X11 support \
+        libgl1="1.7.0-*" \
+        # Wayland support \
+        libwayland-client0="1.22.0-*" \
+        libwayland-egl1="1.22.0-*" \
+        libxkbcommon0="1.6.0-*"  \
+        libdecor-0-plugin-1-cairo="0.2.2-*" \
+        libegl1="1.7.0-*" \
+    && rm -rf /var/lib/apt/lists/*
+# End install Holoviz dependencies
+{% endif %}
+
+
+{% if 'torch' in includes %}
+# Install torch dependencies
+ENV PYTHON_VERSION=3.12.3-*
+ENV PYTHON_PIP_VERSION=24.0+dfsg-*
+ENV LIBTORCH=/opt/libtorch
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${LIBTORCH}
+
+RUN apt update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        python3-minimal=${PYTHON_VERSION} \
+        libpython3-stdlib=${PYTHON_VERSION} \
+        python3=${PYTHON_VERSION} \
+        python3-venv=${PYTHON_VERSION} \
+        python3-pip=${PYTHON_PIP_VERSION} \
+        python3-dev \
+        libjpeg-turbo8="2.1.5-*" \
+        libnuma1="2.0.18-*" \
+        libhwloc15="2.10.0-*" \
+        libopenblas0="0.3.26+ds-*" \
+        libevent-core-2.1-7 \
+        libevent-pthreads-2.1-7 \
+        $([ "${GPU_TYPE}" != "igpu" ] && echo "cuda-cupti-$(echo ${CUDA_VERSION} | sed 's/\./-/g' | cut -d- -f1,2)") \
+        $([ "${GPU_TYPE}" != "igpu" ] && echo "libcudnn9-cuda-$(echo ${CUDA_VERSION} | cut -d. -f1)") \
+    && rm -rf /var/lib/apt/lists/*
+
+RUN rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED \
+    && if [ "${GPU_TYPE}" = "igpu" ]; then \
+        PYTORCH_WHEEL_VERSION="${LIBTORCH_VERSION}"; \
+        INDEX_URL="https://pypi.jetson-ai-lab.io/jp6/cu129"; \
+    else \
+        PYTORCH_WHEEL_VERSION="${LIBTORCH_VERSION}+cu129"; \
+        INDEX_URL="https://download.pytorch.org/whl"; \
+    fi; \
+    echo "Installing torch==${PYTORCH_WHEEL_VERSION} from $INDEX_URL"; \
+    python3 -m pip install --break-system-packages --force-reinstall torch==${PYTORCH_WHEEL_VERSION} torchvision==${LIBTORCH_VISION_VERSION} torchaudio --index-url $INDEX_URL; \
+    if ! find /usr/local/lib/python3.12/dist-packages/torch -name libtorch_cuda.so | grep -q .; then \
+        echo "libtorch_cuda.so not found, torch installation failed"; \
+        exit 1; \
+    fi
+# Set up Holoscan SDK container libtorch to be found with ldconfig for app C++ build and runtime
+RUN echo $(python3 -c "import torch; print(torch.__path__[0])")/lib > /etc/ld.so.conf.d/libtorch.conf \
+    && ldconfig \
+    && ldconfig -p | grep -q "libtorch.so"
+WORKDIR /
+### End install torch dependencies
+{% endif %}
+
+
+{% if 'onnx' in includes %}
+# Install onnx dependencies
+ENV ONNX_RUNTIME=/opt/onnxruntime
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${ONNX_RUNTIME}
+
+# Copy ONNX Runtime
+COPY --from=onnx-dependencies ${ONNX_RUNTIME} ${ONNX_RUNTIME}
+
+{% if gpu_type == "dgpu" %}
+RUN apt-get update \
+    && apt-get install --no-install-recommends --no-install-suggests --allow-downgrades -y \
+        libnvinfer10="10.9.0.34-1+cuda12.8" \
+        libnvinfer-plugin10="10.9.0.34-1+cuda12.8" \
+        libnvonnxparsers10="10.9.0.34-1+cuda12.8" \
+        libcusparselt0="0.7.1.0-*" \
+        libcudnn9-cuda-12  \
+    && rm -rf /var/lib/apt/lists/* \
+    && rm -f /usr/lib/*/libcudnn*train.so*
+{% endif %}
+### End install onnx dependencies
+{% endif %}
+
+{% if health_probe is defined %}
+# Install gRPC health probe
+RUN curl -L -o /bin/grpc_health_probe {{ health_probe | pprint }} \
+    && chmod +x /bin/grpc_health_probe && ls -l /bin/grpc_health_probe
+
+HEALTHCHECK --interval=10s --timeout=1s \
+    CMD /bin/grpc_health_probe -addr=:8765 || exit 1
+
+# End install gRPC health probe
+{% endif %}
+
+{% if application_type == 'PythonModule' or application_type == 'PythonFile' %}
+{% if not 'torch' in includes %}
+# If torch is installed, we can skip installing Python
+ENV PYTHON_VERSION=3.12.3-*
+ENV PYTHON_PIP_VERSION=24.0+dfsg-*
+
+RUN apt update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        python3-minimal=${PYTHON_VERSION} \
+        libpython3-stdlib=${PYTHON_VERSION} \
+        python3=${PYTHON_VERSION} \
+        python3-venv=${PYTHON_VERSION} \
+        python3-pip=${PYTHON_PIP_VERSION} \
+    && rm -rf /var/lib/apt/lists/*
+{% endif %}
+
+{% if holoscan_deb_arch == "arm64" %}
+# Requires python3-dev on aarch64
+RUN apt update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        gcc \
+        python3-dev \
+    && rm -rf /var/lib/apt/lists/*
+{% endif %}
+
+{% endif %}
+
+{% if application_type == 'CppCMake' or application_type == 'Binary' %}
+
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/nvidia/holoscan/lib
+
+RUN if [ "{{ holoscan_deb_arch }}" = "arm64" ]; then \
+        GDR_REPO_ARCH=aarch64 ; \
+    else \
+        GDR_REPO_ARCH=x64 ; \
+    fi \
+    && curl -O https://developer.download.nvidia.com/compute/redist/gdrcopy/CUDA%2012.8/ubuntu24_04/${GDR_REPO_ARCH}/libgdrapi_2.5.1-1_{{ holoscan_deb_arch }}.Ubuntu24_04.deb \
+    && dpkg -i libgdrapi_2.5.1-1_{{ holoscan_deb_arch }}.Ubuntu24_04.deb \
+    && rm -f libgdrapi_2.5.1-1_{{ holoscan_deb_arch }}.Ubuntu24_04.deb \
+    && rm -rf /var/lib/apt/lists/*
+
+{% if custom_holoscan_sdk == True %}
+
+# Use user-specified Holoscan SDK Debian Package
+COPY ./{{ holoscan_sdk_filename }} /tmp/{{ holoscan_sdk_filename }}
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        /tmp/{{ holoscan_sdk_filename }} \
+    && rm -rf /var/lib/apt/lists/*
+{% else %}
+
+# Install Holoscan SDK from NVIDIA APT repository
+# Holoscan: available versions (https://pypi.org/project/holoscan/#history)
+RUN apt-get install -y --no-install-recommends --no-install-suggests \
+        holoscan={{ holoscan_sdk_filename }} \
+    # && apt-get remove -y g++ g++-11 gcc gcc-11 gcc-11-base build-essential \
+    && apt-get purge -y cuda-keyring \
+    && rm -rf /var/lib/apt/lists/*
+{% endif %}
+
+{% endif %}
+
+
+{% if holoscan_deb_arch == "arm64" %}
+# Requires libnuma on aarch64
+RUN apt update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
+        libnuma1="2.0.18-*" \
+    && rm -rf /var/lib/apt/lists/*
+{% endif %}
+
+RUN if id "ubuntu" >/dev/null 2>&1; then touch /var/mail/ubuntu && chown ubuntu /var/mail/ubuntu && userdel -r ubuntu; fi
+RUN groupadd -f -g $GID $UNAME
+RUN useradd -rm -d /home/$UNAME -s /bin/bash -g $GID -G sudo -u $UID $UNAME
+RUN chown -R holoscan {{ working_dir }} && \
+    chown -R holoscan {{ full_input_path }} && \
+    chown -R holoscan {{ full_output_path }}
+
+# Set the working directory
+WORKDIR {{ working_dir }}
+
+# Copy HAP/MAP tool script
+COPY ./tools {{ working_dir }}/tools
+RUN chmod +x {{ working_dir }}/tools
+
+# Remove EXTERNALLY-MANAGED directory
+RUN rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED
+
+# Set the working directory
+WORKDIR {{ working_dir }}
+
+USER $UNAME
+
+ENV PATH=/home/${UNAME}/.local/bin:/opt/nvidia/holoscan/bin:$PATH
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/${UNAME}/.local/lib/python3.12/site-packages/holoscan/lib
+
+{% if application_type == 'PythonModule' or application_type == 'PythonFile' %}
+COPY ./pip/requirements.txt /tmp/requirements.txt
+
+RUN pip install --upgrade pip
+RUN pip install --no-cache-dir --user -r /tmp/requirements.txt
+
+{% if sdk_type == 'holoscan' %}
+# Install Holoscan SDK
+
+{% if custom_holoscan_sdk == True %}
+# Copy user-specified Holoscan SDK wheel file
+COPY ./{{ holoscan_sdk_filename }} /tmp/{{ holoscan_sdk_filename }}
+RUN pip install /tmp/{{ holoscan_sdk_filename }}
+
+{% else %}
+# Install Holoscan SDK wheel from PyPI
+RUN pip install holoscan-cu12=={{holoscan_sdk_filename}}
+{% endif %}
+{% else %}
+
+# Install MONAI Deploy App SDK
+{% if custom_monai_deploy_sdk == True %}
+# Copy user-specified MONAI Deploy SDK file
+COPY ./{{ monai_deploy_sdk_filename }} /tmp/{{ monai_deploy_sdk_filename }}
+RUN pip install /tmp/{{ monai_deploy_sdk_filename }}
+{% else %}
+
+# Install MONAI Deploy from PyPI org
+RUN pip install monai-deploy-app-sdk=={{ monai_deploy_app_sdk_version }}
+
+{% endif %}
+{% endif %}
+{% endif %}
+
+{% if models is defined %}
+COPY ./models  {{ models_dir }}
+{% endif %}
+
+{% if docs is defined %}
+COPY ./docs  {{ docs_dir }}
+{% endif %}
+
+COPY ./map/app.json {{ app_json }}
+COPY ./app.config {{ config_file_path }}
+COPY ./map/pkg.json {{ pkg_json }}
+
+{% if application_type == 'CppCMake' %}
+COPY --from=builder /install {{ app_dir }}
+{% else %}
+COPY ./app {{ app_dir }}
+{% endif %}
+
+{% if additional_lib_paths != '' %}
+
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:{{ additional_lib_paths }}:{{ lib_dir }}
+COPY ./lib {{ lib_dir }}
+
+{% if application_type == 'PythonModule' or application_type == 'PythonFile' %}
+ENV PYTHONPATH=$PYTHONPATH:{{ additional_lib_paths }}:{{ lib_dir }}
+{% endif %}
+
+{% endif %}
+
+{% if input_data != None %}
+COPY ./input $HOLOSCAN_INPUT_PATH
+{% endif %}
+
+ENTRYPOINT ["/var/holoscan/tools"]

holoscan_cli/packager/templates/Dockerfile.jinja2

@@ -1,21 +1,22 @@
-{#
-SPDX-FileCopyrightText: Copyright (c) 2023 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
-SPDX-License-Identifier: Apache-2.0
-
-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.
-#}
+# SPDX-FileCopyrightText: Copyright (c) 2023-2025 NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# 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.
 
 ARG GPU_TYPE=dgpu
+ARG LIBTORCH_VERSION_ARM64="2.9.0.dev20250828+cu130"
+ARG LIBTORCH_VERSION_AMD64="2.9.0.dev20250829+cu130"
+ARG LIBTORCH_VISION_VERSION="0.24.0.dev20250829"
 
 {% if application_type == 'CppCMake' %}
 # Build C++ application in the builder stage
@@ -51,95 +52,26 @@ RUN apt-get update \
         jq \
     && rm -rf /var/lib/apt/lists/*
 
-{% if 'torch' in includes %}
-# Collect torch dependencies: libtorch, torchvision
-FROM base AS torch-dependencies
-
-ARG GPU_TYPE
-ARG TORCHVISION_VERSION=0.20.0_24.08
-ARG LIBTORCH_VERSION=2.5.0_24.08
-
-# Install openmpi
-RUN apt update && \
-    apt-get install -y --no-install-recommends --no-install-suggests \
-        bzip2 \
-        libopenmpi3t64=4.1.6-* \
-    && rm -rf /var/lib/apt/lists/*
-
-# Download libtorch
-WORKDIR /opt/libtorch/
-RUN ARCH={{ target_arch }} && if [ "$ARCH" = "aarch64" ]; then ARCH="aarch64-${GPU_TYPE}"; fi && \
-    curl -S  -#  -o libtorch.tgz  -L \
-        https://edge.urm.nvidia.com/artifactory/sw-holoscan-thirdparty-generic-local/libtorch/libtorch-${LIBTORCH_VERSION}-${ARCH}.tar.gz
-RUN mkdir -p ${LIBTORCH_VERSION} && \
-    tar -xf libtorch.tgz -C ${LIBTORCH_VERSION} --strip-components 1 && \
-    rm -f libtorch.tgz && \
-    find . -type f -name "*Config.cmake" -exec sed -i '/kineto/d' {} +
-
-# Download torchvision
-WORKDIR /opt/torchvision/
-RUN ARCH={{ target_arch }} && if [ "$ARCH" = "aarch64" ]; then ARCH="aarch64-${GPU_TYPE}"; fi && \
-    curl -S -# -o torchvision.tgz -L \
-        https://edge.urm.nvidia.com/artifactory/sw-holoscan-thirdparty-generic-local/torchvision/torchvision-${TORCHVISION_VERSION}-${ARCH}.tar.gz
-RUN mkdir -p ${TORCHVISION_VERSION}
-RUN tar -xf torchvision.tgz -C ${TORCHVISION_VERSION} --strip-components 1 && \
-    rm -f torchvision.tgz
-
-# Download HPCX for libucc.so.1
-WORKDIR /opt/hpcx
-RUN curl -S -# -o hpcx.tbz -L \
-    https://www.mellanox.com/downloads/hpc/hpc-x/v2.15/hpcx-v2.15-gcc-inbox-ubuntu22.04-cuda12-gdrcopy2-nccl2.17-{{target_arch}}.tbz && \
-    tar -xvjf hpcx.tbz hpcx-v2.15-gcc-inbox-ubuntu22.04-cuda12-gdrcopy2-nccl2.17-{{target_arch}}/ucc/lib/libucc.so.1.0.0 && \
-    rm -f hpcx.tbz && \
-    find . -name libucc.so.1.0.0 -exec mv -f {} /opt/hpcx/libucc.so.1 \;
-
-# End collect torch dependencies
-{% endif %}
-
-
 {% if 'onnx' in includes %}
 # Collect onnx dependencies
 FROM base AS onnx-dependencies
 ARG GPU_TYPE
-ARG ONNX_RUNTIME_VERSION=1.18.1_38712740_24.08-cuda-12.6
+ARG ONNX_RUNTIME_VERSION=1.22.1
 
 WORKDIR /opt/onnxruntime
 
 # Download onnx binaries
-RUN curl -S -L -# -o ort.tar.gz \
-    https://edge.urm.nvidia.com/artifactory/sw-holoscan-thirdparty-generic-local/onnxruntime/onnxruntime-${ONNX_RUNTIME_VERSION}-$(uname -m).tar.gz
-RUN mkdir -p ${ONNX_RUNTIME_VERSION}
-RUN ls -l && tar -xvzf ort.tar.gz -C ${ONNX_RUNTIME_VERSION} --strip-components 2 && \
-    rm -f ort.tar.gz
+RUN CUDA_MAJOR_MINOR=$(echo ${CUDA_VERSION} | cut -d. -f1-2) \
+    && echo "Downloading from https://edge.urm.nvidia.com/artifactory/sw-holoscan-thirdparty-generic-local/onnxruntime/onnxruntime-${ONNX_RUNTIME_VERSION}-cuda-${CUDA_MAJOR_MINOR}-$(uname -m).tar.gz" \
+    && curl -S -L -# -o ort.tgz \
+    https://edge.urm.nvidia.com/artifactory/sw-holoscan-thirdparty-generic-local/onnxruntime/onnxruntime-${ONNX_RUNTIME_VERSION}-cuda-${CUDA_MAJOR_MINOR}-$(uname -m).tar.gz
+RUN mkdir -p ${ONNX_RUNTIME_VERSION} \
+    && tar -xf ort.tgz -C ${ONNX_RUNTIME_VERSION} --strip-components 2 --no-same-owner --no-same-permissions \
+    && rm -f ort.tgz
 WORKDIR /
 # End collect onnx dependencies
 {% endif %}
 
-# FROM base AS mofed-installer
-# ARG MOFED_VERSION=23.10-2.1.3.1
-
-# # In a container, we only need to install the user space libraries, though the drivers are still
-# # needed on the host.
-# # Note: MOFED's installation is not easily portable, so we can't copy the output of this stage
-# # to our final stage, but must inherit from it. For that reason, we keep track of the build/install
-# # only dependencies in the `MOFED_DEPS` variable (parsing the output of `--check-deps-only`) to
-# # remove them in that same layer, to ensure they are not propagated in the final image.
-# WORKDIR /opt/nvidia/mofed
-# ARG MOFED_INSTALL_FLAGS="--dpdk --with-mft --user-space-only --force --without-fw-update"
-# RUN UBUNTU_VERSION=$(cat /etc/lsb-release | grep DISTRIB_RELEASE | cut -d= -f2) \
-#     && OFED_PACKAGE="MLNX_OFED_LINUX-${MOFED_VERSION}-ubuntu${UBUNTU_VERSION}-$(uname -m)" \
-#     && curl -S -# -o ${OFED_PACKAGE}.tgz -L \
-#         https://www.mellanox.com/downloads/ofed/MLNX_OFED-${MOFED_VERSION}/${OFED_PACKAGE}.tgz \
-#     && tar xf ${OFED_PACKAGE}.tgz \
-#     && MOFED_INSTALLER=$(find . -name mlnxofedinstall -type f -executable -print) \
-#     && MOFED_DEPS=$(${MOFED_INSTALLER} ${MOFED_INSTALL_FLAGS} --check-deps-only 2>/dev/null | tail -n1 |  cut -d' ' -f3-) \
-#     && apt-get update \
-#     && apt-get install --no-install-recommends -y ${MOFED_DEPS} \
-#     && ${MOFED_INSTALLER} ${MOFED_INSTALL_FLAGS} \
-#     && rm -r * \
-#     && apt-get remove -y ${MOFED_DEPS} && apt-get autoremove -y \
-#     && rm -rf /var/lib/apt/lists/*
-
 FROM base AS release
 ENV DEBIAN_FRONTEND=noninteractive
 ENV TERM=xterm-256color
@@ -148,6 +80,9 @@ ARG GPU_TYPE
 ARG UNAME
 ARG UID
 ARG GID
+ARG LIBTORCH_VERSION_ARM64
+ARG LIBTORCH_VERSION_AMD64
+ARG LIBTORCH_VISION_VERSION
 
 RUN mkdir -p /etc/holoscan/ \
         && mkdir -p /opt/holoscan/ \
@@ -179,6 +114,14 @@ ENV HOLOSCAN_PKG_MANIFEST_PATH={{ pkg_json }}
 ENV HOLOSCAN_LOGS_PATH={{ logs_dir }}
 ENV HOLOSCAN_VERSION={{ holoscan_sdk_version }}
 
+# Update NV GPG repo key
+# https://developer.nvidia.com/blog/updating-the-cuda-linux-gpg-repository-key/
+RUN rm -f /etc/apt/sources.list.d/cuda*.list \
+    && curl -OL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2404/{{ cuda_deb_arch }}/cuda-keyring_1.1-1_all.deb \
+    && dpkg -i cuda-keyring_1.1-1_all.deb \
+    && rm -f cuda-keyring_1.1-1_all.deb \
+    && apt-get update
+
 {% if 'debug' in includes %}
 # Install debugging tools
 RUN apt-get update \
@@ -197,15 +140,15 @@ RUN apt-get update \
 # Install Holoviz dependencies
 RUN apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests --allow-downgrades --allow-change-held-packages -y \
-    libvulkan1="1.3.275.0-*" \
-    # X11 support \
-    libgl1="1.7.0-*" \
-    # Wayland support \
-    libwayland-client0="1.22.0-*" \
-    libwayland-egl1="1.22.0-*" \
-    libxkbcommon0="1.6.0-*"  \
-    libdecor-0-plugin-1-cairo="0.2.2-*" \
-    libegl1="1.7.0-*" \
+        libvulkan1="1.3.275.0-*" \
+        # X11 support \
+        libgl1="1.7.0-*" \
+        # Wayland support \
+        libwayland-client0="1.22.0-*" \
+        libwayland-egl1="1.22.0-*" \
+        libxkbcommon0="1.6.0-*"  \
+        libdecor-0-plugin-1-cairo="0.2.2-*" \
+        libegl1="1.7.0-*" \
     && rm -rf /var/lib/apt/lists/*
 # End install Holoviz dependencies
 {% endif %}
@@ -215,66 +158,50 @@ RUN apt-get update \
 # Install torch dependencies
 ENV PYTHON_VERSION=3.12.3-*
 ENV PYTHON_PIP_VERSION=24.0+dfsg-*
+ENV LIBTORCH=/opt/libtorch
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${LIBTORCH}
 
 RUN apt update \
-&& apt-get install -y --no-install-recommends --no-install-suggests \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
         python3-minimal=${PYTHON_VERSION} \
         libpython3-stdlib=${PYTHON_VERSION} \
         python3=${PYTHON_VERSION} \
         python3-venv=${PYTHON_VERSION} \
         python3-pip=${PYTHON_PIP_VERSION} \
+        python3-dev \
         libjpeg-turbo8="2.1.5-*" \
         libnuma1="2.0.18-*" \
         libhwloc15="2.10.0-*" \
         libopenblas0="0.3.26+ds-*" \
         libevent-core-2.1-7 \
         libevent-pthreads-2.1-7 \
-        cuda-cupti-12-8 \
-        libcudnn9-cuda-12 \
-    && rm -rf /var/lib/apt/lists/*
-
-# Install NVIDIA Performance Libraries on arm64 dGPU platform
-# as a runtime requirement for the Holoinfer `libtorch` backend (2.5.0).
-{% if target_arch == "aarch64" and gpu_type == "dgpu" %}
-RUN curl -L https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/sbsa/cuda-keyring_1.1-1_all.deb -O \
-    && dpkg -i cuda-keyring_1.1-1_all.deb \
-    && apt-get update \
-    && apt-get install --no-install-recommends -y \
-        nvpl-blas=0.2.0.1-* \
-        nvpl-lapack=0.2.2.1-* \
+        cuda-cupti-$(echo ${CUDA_VERSION} | sed 's/\./-/g' | cut -d- -f1,2)  \
+        libcudnn9-cuda-$(echo ${CUDA_VERSION} | cut -d. -f1) \
     && rm -rf /var/lib/apt/lists/*
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sbsa-linux-gnu/
-{% endif %}
-
-#  mkl - dependency for libtorch plugin on x86_64 (match pytorch container version)
-RUN if [ "{{ cuda_deb_arch }}" = "x86_64" ]; then \
-        rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED \
-        && python3 -m pip install --no-cache-dir \
-            mkl==2021.1.1 \
-        && \
-        # Clean up duplicate libraries from mkl/tbb python wheel install which makes copies for symlinks.
-        # Only keep the *.so.X libs, remove the *.so and *.so.X.Y libs
-        # This can be removed once upgrading to an MKL pip wheel that fixes the symlinks
-        find /usr/local/lib -maxdepth 1 -type f -regex '.*\/lib\(tbb\|mkl\).*\.so\(\.[0-9]+\.[0-9]+\)?' -exec rm -v {} +; \
+RUN rm -rf /usr/lib/python3.12/EXTERNALLY-MANAGED \
+    && if [ "${GPU_TYPE}" = "igpu" ]; then \
+        echo "Torch installation is not supported for iGPU."; \
+        exit 1; \
+    else \
+        INDEX_URL="https://download.pytorch.org/whl/nightly/cu130"; \
+        if [ "${GPU_TYPE}" = "dgpu" ]; then \
+            if [ $(uname -m) = "aarch64" ]; then \
+            LIBTORCH_VERSION="${LIBTORCH_VERSION_ARM64}"; \
+        else \
+                LIBTORCH_VERSION="${LIBTORCH_VERSION_AMD64}"; \
+            fi; \
+        fi; \
+    fi; \
+    echo "Installing torch==${LIBTORCH_VERSION} from $INDEX_URL"; \
+    python3 -m pip install --break-system-packages --force-reinstall torch==${LIBTORCH_VERSION} torchvision==${LIBTORCH_VISION_VERSION} torchaudio --index-url $INDEX_URL; \
+    if ! find /usr/local/lib/python3.12/dist-packages/torch -name libtorch_cuda.so | grep -q .; then \
+        echo "libtorch_cuda.so not found, torch installation failed"; \
+        exit 1; \
     fi
-
-# Copy Libtorch
-ARG LIBTORCH_VERSION=2.5.0_24.08
-ENV LIBTORCH=/opt/libtorch/${LIBTORCH_VERSION}/lib
-COPY --from=torch-dependencies ${LIBTORCH} ${LIBTORCH}
-
-# Copy TorchVision
-ARG TORCHVISION_VERSION=0.20.0_24.08
-ENV TORCHVISION=/opt/torchvision/${TORCHVISION_VERSION}/lib
-COPY --from=torch-dependencies ${TORCHVISION} ${TORCHVISION}
-
-ENV HPCX=/opt/hpcx/lib
-COPY --from=torch-dependencies /opt/hpcx/libucc.so.1 ${LIBTORCH}/libucc.so.1
-COPY --from=torch-dependencies /usr/lib/{{target_arch}}-linux-gnu/libmpi.so.40 ${LIBTORCH}/libmpi.so.40
-COPY --from=torch-dependencies /usr/lib/{{target_arch}}-linux-gnu/libopen-rte.so.40 ${LIBTORCH}/libopen-rte.so.40
-COPY --from=torch-dependencies /usr/lib/{{target_arch}}-linux-gnu/libopen-pal.so.40 ${LIBTORCH}/libopen-pal.so.40
-
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${LIBTORCH}:${TORCHVISION}:${HPCX}
+# Set up Holoscan SDK container libtorch to be found with ldconfig for app C++ build and runtime
+RUN echo $(python3 -c "import torch; print(torch.__path__[0])")/lib > /etc/ld.so.conf.d/libtorch.conf \
+    && ldconfig \
+    && ldconfig -p | grep -q "libtorch.so"
 WORKDIR /
 ### End install torch dependencies
 {% endif %}
@@ -282,27 +209,31 @@ WORKDIR /
 
 {% if 'onnx' in includes %}
 # Install onnx dependencies
-ARG ONNX_RUNTIME_VERSION=1.18.1_38712740_24.08-cuda-12.6
-ENV ONNX_RUNTIME=/opt/onnxruntime/${ONNX_RUNTIME_VERSION}/lib
+ENV ONNX_RUNTIME=/opt/onnxruntime
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${ONNX_RUNTIME}
 
 # Copy ONNX Runtime
 COPY --from=onnx-dependencies ${ONNX_RUNTIME} ${ONNX_RUNTIME}
 
+
+# CLARAHOLOS-1689 requires libnvinfer_plugin
 {% if gpu_type == "dgpu" %}
+
 RUN apt-get update \
+    && CUDA_MAJOR_VERSION=$(echo ${CUDA_VERSION} | cut -d. -f1) \
+    && TRT_VERSION_VAR_NAME="TENSORRT_CU${CUDA_MAJOR_VERSION}" \
+    && TRT_VERSION=$(apt-cache madison libnvinfer10 | grep "+cuda${CUDA_MAJOR_VERSION}" | head -n 1 | awk '{print $3}') \
     && apt-get install --no-install-recommends --no-install-suggests --allow-downgrades -y \
-        libnvinfer10="10.9.0.34-1+cuda12.8" \
-        libnvinfer-plugin10="10.9.0.34-1+cuda12.8" \
-        libnvonnxparsers10="10.9.0.34-1+cuda12.8" \
-        libcusparselt0="0.7.1.0-*" \
-        libcudnn9-cuda-12  \
-    && rm -rf /var/lib/apt/lists/* \
-    && rm -f /usr/lib/*/libcudnn*train.so*
+        libnvinfer10="${TRT_VERSION}" \
+        libnvinfer-plugin10="${TRT_VERSION}" \
+        libnvonnxparsers10="${TRT_VERSION}" \
+        libcusparselt0 \
+        libcudnn9-cuda-${CUDA_MAJOR_VERSION} \
+    && rm -f /usr/lib/*/libcudnn*train.so* \
+    && rm -rf /var/lib/apt/lists/*
 {% endif %}
 ### End install onnx dependencies
 {% endif %}
-
 {% if health_probe is defined %}
 # Install gRPC health probe
 RUN curl -L -o /bin/grpc_health_probe {{ health_probe | pprint }} \
@@ -345,30 +276,24 @@ RUN apt update \
 
 ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/nvidia/holoscan/lib
 
-# Update NV GPG repo key
-# https://developer.nvidia.com/blog/updating-the-cuda-linux-gpg-repository-key/
-RUN curl -OL https://developer.download.nvidia.com/compute/cuda/repos/ubuntu2204/{{ cuda_deb_arch }}/cuda-keyring_1.1-1_all.deb \
-    && dpkg -i cuda-keyring_1.1-1_all.deb \
-    && rm -f cuda-keyring_1.1-1_all.deb \
-    && apt-get update
-
 RUN if [ "{{ holoscan_deb_arch }}" = "arm64" ]; then \
         GDR_REPO_ARCH=aarch64 ; \
     else \
         GDR_REPO_ARCH=x64 ; \
     fi \
-    && curl -O https://developer.download.nvidia.com/compute/redist/gdrcopy/CUDA%2012.2/ubuntu22_04/${GDR_REPO_ARCH}/libgdrapi_2.4-1_{{ holoscan_deb_arch }}.Ubuntu22_04.deb \
-    && dpkg -i libgdrapi_2.4-1_{{ holoscan_deb_arch }}.Ubuntu22_04.deb \
-    && rm -f libgdrapi_2.4-1_{{ holoscan_deb_arch }}.Ubuntu22_04.deb
+    && curl -O https://developer.download.nvidia.com/compute/redist/gdrcopy/CUDA%2013.0/ubuntu24_04/${GDR_REPO_ARCH}/libgdrapi_2.5.1-1_{{ holoscan_deb_arch }}.Ubuntu24_04.deb \
+    && dpkg -i libgdrapi_2.5.1-1_{{ holoscan_deb_arch }}.Ubuntu24_04.deb \
+    && rm -f libgdrapi_2.5.1-1_{{ holoscan_deb_arch }}.Ubuntu24_04.deb \
+    && rm -rf /var/lib/apt/lists/*
 
 {% if custom_holoscan_sdk == True %}
 
 # Use user-specified Holoscan SDK Debian Package
 COPY ./{{ holoscan_sdk_filename }} /tmp/{{ holoscan_sdk_filename }}
-RUN apt-get install -y --no-install-recommends --no-install-suggests \
+RUN apt-get update \
+    && apt-get install -y --no-install-recommends --no-install-suggests \
         /tmp/{{ holoscan_sdk_filename }} \
     && rm -rf /var/lib/apt/lists/*
-
 {% else %}
 
 # Install Holoscan SDK from NVIDIA APT repository
@@ -378,7 +303,6 @@ RUN apt-get install -y --no-install-recommends --no-install-suggests \
     # && apt-get remove -y g++ g++-11 gcc gcc-11 gcc-11-base build-essential \
     && apt-get purge -y cuda-keyring \
     && rm -rf /var/lib/apt/lists/*
-
 {% endif %}
 
 {% endif %}
@@ -415,7 +339,7 @@ WORKDIR {{ working_dir }}
 USER $UNAME
 
 ENV PATH=/home/${UNAME}/.local/bin:/opt/nvidia/holoscan/bin:$PATH
-ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/${UNAME}/.local/lib/python3.10/site-packages/holoscan/lib
+ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/home/${UNAME}/.local/lib/python3.12/site-packages/holoscan/lib
 
 {% if application_type == 'PythonModule' or application_type == 'PythonFile' %}
 COPY ./pip/requirements.txt /tmp/requirements.txt
@@ -433,7 +357,7 @@ RUN pip install /tmp/{{ holoscan_sdk_filename }}
 
 {% else %}
 # Install Holoscan SDK wheel from PyPI
-RUN pip install holoscan=={{holoscan_sdk_filename}}
+RUN pip install holoscan-cu13=={{holoscan_sdk_filename}}
 {% endif %}
 {% else %}
 

{holoscan_cli-3.6.0.dist-info → holoscan_cli-3.7.0.dist-info}/METADATA

@@ -1,8 +1,9 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: holoscan-cli
-Version: 3.6.0
+Version: 3.7.0
 Summary: Command line interface for packaging and running Holoscan applications.
 License: Apache-2.0
+License-File: LICENSE
 Keywords: AI,holoscan,medical,streaming,HPC,nvidia,docker,container
 Author: NVIDIA
 Maintainer: mocsharp
@@ -58,10 +59,10 @@ You will need a platform supported by [NVIDIA Holoscan SDK](https://docs.nvidia.
 
 Holoscan CLI is delivered as a Python package and can be installed from PyPI.org using one of the following commands:
 
-| Holoscan SDK Version | Installation Command       |
-| -------------------- | -------------------------- |
-| 2.8 or earlier       | `pip install holoscan`     |
-| 2.9 or later         | `pip install holoscan-cli` |
+| Holoscan SDK Version | Installation Command       | CUDA Version |
+| -------------------- | -------------------------- | ------------ |
+| 2.8 or earlier       | `pip install holoscan`     | 12.6         |
+| 2.9 or later         | `pip install holoscan-cli` | 12.6         |
 
 ## Build From Source
 

{holoscan_cli-3.6.0.dist-info → holoscan_cli-3.7.0.dist-info}/RECORD

@@ -1,28 +1,29 @@
 holoscan_cli/__init__.py,sha256=caPPFDAjPzNIAzHAtpWRuWy9GshNEetcN8FQiMmNsQQ,1092
 holoscan_cli/__main__.py,sha256=sOdEmgaajrtrtVeg39MuW15BU8moal9Vz2HDcWZM__U,4891
 holoscan_cli/common/argparse_types.py,sha256=KXbg09yaB73SyorWV0tLYRl-e8gydmzZVnuOlr-_kd0,5948
-holoscan_cli/common/artifact_sources.py,sha256=LIz2OFZmCJNRCn5_qkyncEaEjwwpAbzZzBAlE3tnSjs,5728
-holoscan_cli/common/constants.py,sha256=4yXMmz-PzHth5Qy4zt4E5bvpG6eQN3KQrjhyagRFDGw,4866
+holoscan_cli/common/artifact_sources.py,sha256=_XCDqvUIlL1_P8E_ezELqQ_57OlbKv7Nkcb32qd5XZk,6303
+holoscan_cli/common/constants.py,sha256=vjfcY2gN4Kdeb3Jj1axLcrtvg-93TO0Hx3omOtqrWLk,5018
 holoscan_cli/common/dockerutils.py,sha256=lbDt_TCB8b74FRJljvpV3s_zVD-E4FoH2-3rI8O_BbM,17684
 holoscan_cli/common/enum_types.py,sha256=qdqMum01uM0-qrF2jyk1GYGoh76xBJsBUX9cvxVbVtA,1711
 holoscan_cli/common/exceptions.py,sha256=ubN33Av69Xm_CUVC_5DeKx_zO8qfIc_T-_S18xDQguE,2999
-holoscan_cli/common/sdk_utils.py,sha256=5rJqz8JZFecVmSU10_dSO4_My0X-FleUY_eHmzd-4js,6528
+holoscan_cli/common/sdk_utils.py,sha256=xiMV4LSRvAnlR3pIQdMPt3l21yADDkLQ8AdXeVQD3aA,6723
 holoscan_cli/common/utils.py,sha256=3plIFGMWy8WcRB2lL4fTqINlE1CyBkm9CDrIVA1qPDU,3796
 holoscan_cli/logging.json,sha256=0tfLHoqV5_xH_q4m9gQufHYfYezocFVJxtlEj6UR3qI,809
 holoscan_cli/nics/__init__.py,sha256=IMHmlnYvJxjlJGi1UxwRG0deK4w9M7-_WWDoCqKcjJE,737
 holoscan_cli/nics/nics.py,sha256=xcpo8uwQDJ7-46rPR-BEAWkyKHZOZ19gl9ahuxLNphs,1258
 holoscan_cli/package-source.json,sha256=-Cheb17hJqV7-CJktvj9RATIM_oA00k6_VPpFkIlPAc,1326
 holoscan_cli/packager/__init__.py,sha256=8uVz-FlG2vJV7Cz8ICOajioBbI9An5h-dRtSrkMCXZo,744
-holoscan_cli/packager/arguments.py,sha256=Ko98jIOURjcybM7ty3CSzHWWc67gm4wvVOj2GZtgADI,5855
+holoscan_cli/packager/arguments.py,sha256=VpVfe07AhvtE_IVH36Z93_zEtMdG5AogkaID0Nmkvtw,5864
 holoscan_cli/packager/config_reader.py,sha256=oE0Tnp7v9dh_qAj6nPap-_R-YGLpYKGh09_FSV9oqVA,7352
-holoscan_cli/packager/container_builder.py,sha256=bGGcN2YjRFfvJiLsL_DjznomwkPtrdjcVnTteMz9NX0,18560
+holoscan_cli/packager/container_builder.py,sha256=TfNj9Mm3W56oYdWIX7pgMwysFbbd7bbk_yORkAWHr2Y,19033
 holoscan_cli/packager/manifest_files.py,sha256=jueQMgZzQ9DhP2KGC1YdndDNwJl3ECunEKicBb3Z9Mc,5957
 holoscan_cli/packager/models.py,sha256=t3HXROo-obN5iNjKOkp8JvL6WuGP4QSRVZzET6V1wmI,3758
-holoscan_cli/packager/package_command.py,sha256=U3hu0mA8dWyZwN7zzm7hptam8tJDJeG4jLMGLTg7Lqk,6743
+holoscan_cli/packager/package_command.py,sha256=XhiFRBr7T_7_hrznP2kgXiT6RAL8D87gJyfHBECYUvk,6986
 holoscan_cli/packager/packager.py,sha256=tUM5k-tlvUMq-LzAokub77s_D_6NDJlnRkXSZIuYnmk,4728
-holoscan_cli/packager/parameters.py,sha256=fSox76djvwV0Qf9q66FJIVbJheYQjtVpxMKCTnaAEQI,19166
-holoscan_cli/packager/platforms.py,sha256=H9AMr83YkW_Vx8cpp6qJLDCLqa2lcVnSAfkKc6vl6iU,16721
-holoscan_cli/packager/templates/Dockerfile.jinja2,sha256=UyRNcZhNWVRj1qaEav0HgIzuepoYhUL4CPaJQ0oZJog,17329
+holoscan_cli/packager/parameters.py,sha256=i4ieE3L5HShO2nB8qYqpjzvvyysysvTgevjyJSvt2HA,19340
+holoscan_cli/packager/platforms.py,sha256=ZoWroz8qgH8ave_nYpIRF32FgTsjgD1CVeohqYwWSIo,17201
+holoscan_cli/packager/templates/Dockerfile-cu12.jinja2,sha256=l385Xp9rDuUjF0wP8A47N5nrkCJh3sinPg_zAGv1whU,13573
+holoscan_cli/packager/templates/Dockerfile.jinja2,sha256=44IzrfvPyKUmrBgBI6N7wvrrze9bqI2t2zbr-ElBYbk,14112
 holoscan_cli/packager/templates/dockerignore,sha256=zzBkA9eWgPW4KWyObuYjp13bv_m24AnFUgoENGNhMcY,1755
 holoscan_cli/packager/templates/tools.sh,sha256=DnBs-XGWmxSz4XyspSMYwBajDXqUWQgUYD0HxtDw-88,13566
 holoscan_cli/py.typed,sha256=Z4hkVtwnqwhmVXOMES05WQZWjt4_rFEuditXTouPUJQ,684
@@ -32,8 +33,8 @@ holoscan_cli/runner/run_command.py,sha256=CnSyyq0y9rv6kkRtSOi3kOGHuRDLv2RDQ3JUWZ
 holoscan_cli/runner/runner.py,sha256=9TqvzBL5z1boGQXvlBiPiuuMDMg7dQlo40YXO1Le604,10521
 holoscan_cli/version/__init__.py,sha256=1pf-RBR16STdFXsh82bYly_lUyv1MgxuczbLOTDJRto,743
 holoscan_cli/version/version.py,sha256=1jAgChi39oEl9Rl0BDc30PPJMYeo7m5bMGPBGlRSX2M,1976
-holoscan_cli-3.6.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-holoscan_cli-3.6.0.dist-info/METADATA,sha256=nPfiimMQUetPpXQYMN89IwMCkxcrSOTPk0oOBNxLvZ4,3967
-holoscan_cli-3.6.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-holoscan_cli-3.6.0.dist-info/entry_points.txt,sha256=ZbJklrhFtmmhqcGvGizL_4Pf9FTRgmZ11LblKPbj8yo,95
-holoscan_cli-3.6.0.dist-info/RECORD,,
+holoscan_cli-3.7.0.dist-info/METADATA,sha256=8I4NGalAtN8P40f7agQQ-pynzi97fopzfMbjMdeLtIo,4049
+holoscan_cli-3.7.0.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+holoscan_cli-3.7.0.dist-info/entry_points.txt,sha256=ZbJklrhFtmmhqcGvGizL_4Pf9FTRgmZ11LblKPbj8yo,95
+holoscan_cli-3.7.0.dist-info/licenses/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+holoscan_cli-3.7.0.dist-info/RECORD,,

{holoscan_cli-3.6.0.dist-info → holoscan_cli-3.7.0.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: poetry-core 2.1.3
+Generator: poetry-core 2.2.1
 Root-Is-Purelib: true
 Tag: py3-none-any