holoscan-cli 2.9.0__py3-none-any.whl → 3.8.0__py3-none-any.whl

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 \
-        libopenmpi3=4.1.2-* \
-    && 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.204.1-*" \
-    # X11 support \
-    libgl1="1.4.0-*" \
-    # Wayland support \
-    libwayland-client0="1.20.0-*" \
-    libwayland-egl1="1.20.0-*" \
-    libxkbcommon0="1.4.0-*"  \
-    libdecor-0-plugin-1-cairo="0.1.0-*" \
-    libegl1="1.4.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 %}
@@ -213,67 +156,52 @@ RUN apt-get update \
 
 {% if 'torch' in includes %}
 # Install torch dependencies
-ENV PYTHON_VERSION=3.10.6-1~22.04
-ENV PYTHON_PIP_VERSION=22.0.2+dfsg-*
+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} \
-        libjpeg-turbo8="2.1.2-*" \
-        libnuma1="2.0.14-*" \
-        libhwloc15="2.7.0-*" \
-        libopenblas0="0.3.20+ds-*" \
+        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-6 \
-        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 \
-        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 %}
@@ -281,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.3.*+cuda12.5" \
-        libnvinfer-plugin10="10.3.*+cuda12.5" \
-        libnvonnxparsers10="10.3.*+cuda12.5" \
-        libcusparselt0="0.6.3.2-*" \
-        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 }} \
@@ -316,8 +248,8 @@ HEALTHCHECK --interval=10s --timeout=1s \
 {% 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.10.6-1~22.04
-ENV PYTHON_PIP_VERSION=22.0.2+dfsg-*
+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 \
@@ -344,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
@@ -377,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 %}
@@ -387,11 +312,11 @@ RUN apt-get install -y --no-install-recommends --no-install-suggests \
 # Requires libnuma on aarch64
 RUN apt update \
     && apt-get install -y --no-install-recommends --no-install-suggests \
-        libnuma1="2.0.14-*" \
+        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 }} && \
@@ -405,13 +330,16 @@ WORKDIR {{ working_dir }}
 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.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
@@ -429,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 %}
 
@@ -476,4 +404,8 @@ ENV PYTHONPATH=$PYTHONPATH:{{ additional_lib_paths }}:{{ lib_dir }}
 
 {% endif %}
 
+{% if input_data != None %}
+COPY ./input $HOLOSCAN_INPUT_PATH
+{% endif %}
+
 ENTRYPOINT ["/var/holoscan/tools"]

holoscan_cli/packager/templates/tools.sh

@@ -380,6 +380,7 @@ main() {
             info "Launching application ${command} ${args:1}..."
             eval ${command} "$@"
             exit_code=$?
+            info "Application exited with ${exit_code}."
             if [ $exit_code -ne 0 ] && [ -f /.dockerenv ] && [ "$HOLOSCAN_HOSTING_SERVICE" != "HOLOSCAN_RUN" ]; then
                 newline
                 c_echo "================================================================================================"

holoscan_cli/runner/run_command.py

@@ -92,6 +92,14 @@ def create_run_parser(
         "between 10000 and 32767 that is not currently in use.",
     )
 
+    parser.add_argument(
+        "--rm",
+        dest="rm",
+        action="store_true",
+        default=False,
+        help="remove the container after it exits.",
+    )
+
     advanced_group = parser.add_argument_group(title="advanced run options")
 
     advanced_group.add_argument(

holoscan_cli/runner/runner.py

@@ -121,6 +121,7 @@ def _run_app(args: Namespace, app_info: dict, pkg_info: dict):
     worker_address: Optional[str] = args.worker_address if args.worker_address else None
     render: bool = args.render
     user: str = f"{args.uid}:{args.gid}"
+    remove: bool = args.rm
     hostname: Optional[str] = "driver" if driver else None
     terminal: bool = args.terminal
     platform_config: str = pkg_info.get("platformConfig")
@@ -174,6 +175,7 @@ def _run_app(args: Namespace, app_info: dict, pkg_info: dict):
         platform_config,
         shared_memory_size,
         args.uid == 0,
+        remove,
     )
 
 
@@ -266,10 +268,7 @@ def _pkg_specific_dependency_verification(pkg_info: dict) -> bool:
     Returns:
         True if all dependencies are satisfied, otherwise False.
     """
-    if (
-        os.path.exists("/.dockerenv")
-        or os.environ.get("HOLOSCAN_SKIP_NVIDIA_CTK_CHECK") is not None
-    ):
+    if os.path.exists("/.dockerenv"):
         logger.info("--> Skipping nvidia-ctk check inside Docker...\n")
         return True
 
@@ -319,7 +318,6 @@ def execute_run_command(args: Namespace):
     if not _dependency_verification(args.map):
         logger.error("Execution Aborted")
         sys.exit(2)
-
     try:
         # Fetch application manifest from MAP
         app_info, pkg_info = _fetch_map_manifest(args.map)
@@ -330,7 +328,6 @@ def execute_run_command(args: Namespace):
     if not _pkg_specific_dependency_verification(pkg_info):
         logger.error("Execution Aborted")
         sys.exit(2)
-
     try:
         # Run Holoscan Application
         _run_app(args, app_info, pkg_info)

holoscan_cli/version/version.py

@@ -20,6 +20,7 @@ from argparse import Namespace
 from ..common.enum_types import SdkType
 from ..common.sdk_utils import (
     detect_holoscan_version,
+    detect_holoscan_cli_version,
     detect_monaideploy_version,
     detect_sdk,
 )
@@ -40,6 +41,12 @@ def execute_version_command(args: Namespace):
         except Exception:
             print("Holoscan SDK:           N/A")
 
+        try:
+            cli_version = detect_holoscan_cli_version()
+            print(f"Holoscan CLI:           {cli_version}")
+        except Exception:
+            print("Holoscan CLI:           N/A")
+
         if sdk == SdkType.MonaiDeploy:
             try:
                 sdk_version = detect_monaideploy_version()

{holoscan_cli-2.9.0.dist-info → holoscan_cli-3.8.0.dist-info}/METADATA

@@ -1,12 +1,13 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: holoscan-cli
-Version: 2.9.0
+Version: 3.8.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
-Requires-Python: >=3.9,<3.13
+Requires-Python: >=3.10,<3.14
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Environment :: GPU :: NVIDIA CUDA :: 12
@@ -17,27 +18,27 @@ Classifier: Intended Audience :: Science/Research
 Classifier: License :: OSI Approved :: Apache Software License
 Classifier: Operating System :: POSIX :: Linux
 Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Typing :: Typed
-Requires-Dist: Jinja2 (>=3.1.5,<4.0.0)
-Requires-Dist: packaging (>=23.1,<24.0)
-Requires-Dist: pip (>22.0.2)
-Requires-Dist: psutil (>=6.0.0,<7.0.0)
-Requires-Dist: python-on-whales (>=0.60.1,<0.61.0)
+Requires-Dist: Jinja2 (>=3.1.6,<4.0.0)
+Requires-Dist: packaging (>=25.0,<26.0)
+Requires-Dist: pip (>25.1.0)
+Requires-Dist: psutil (>=7.0.0,<8.0)
+Requires-Dist: python-on-whales (>=0.77.0)
 Requires-Dist: pyyaml (>=6.0,<7.0)
-Requires-Dist: requests (>=2.31.0,<3.0.0)
+Requires-Dist: requests (>=2.32,<3.0)
 Project-URL: Documentation, https://docs.nvidia.com/holoscan/sdk-user-guide/index.html
 Project-URL: Homepage, https://github.com/nvidia-holoscan/holoscan-cli
 Project-URL: Repository, https://github.com/nvidia-holoscan/holoscan-cli
 Description-Content-Type: text/markdown
 
 [![Code Check](https://github.com/nvidia-holoscan/holoscan-cli/actions/workflows/check.yaml/badge.svg)](https://github.com/nvidia-holoscan/holoscan-cli/actions/workflows/check.yaml)
-[![Coverage Status](https://coveralls.io/repos/github/nvidia-holoscan/holoscan-cli/badge.svg?branch=vchang/poetry-setup)](https://coveralls.io/github/nvidia-holoscan/holoscan-cli?branch=vchang/poetry-setup)
+[![Coverage Status](https://coveralls.io/repos/github/nvidia-holoscan/holoscan-cli/badge.svg)](https://coveralls.io/github/nvidia-holoscan/holoscan-cli)
 
 # Holoscan CLI
 
@@ -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
 
@@ -69,7 +70,7 @@ Holoscan CLI is delivered as a Python package and can be installed from PyPI.org
 
 To build the Holoscan CLI from source, you will need to clone this repository and install the following dependencies:
 
-- Python 3.9+.
+- Python 3.10+.
 - [poetry 2.0+](https://python-poetry.org/docs/#installation)
 
 ### Development Environment
@@ -78,12 +79,15 @@ Holoscan CLI uses [Poetry](https://python-poetry.org/) for package and dependenc
 
 ```bash
 # Create virtual environment
-poetry shell
+poetry env use python3.12
+
+# Activate virtual environment
+eval $(poetry env activate)
 
 # Install dependencies
 poetry install
 
-# Configure pre-commmit hooks
+# Configure pre-commit hooks
 pre-commit install
 
 # Run pre-commit against all files
@@ -96,6 +100,8 @@ poetry build
 poetry run pytest
 ```
 
+For more information on Poetry and its usages, see the [Poetry documentation](https://python-poetry.org/docs/).
+
 ## Contributing to the Holoscan CLI
 
 See [CONTRIBUTING.md](./CONTRIBUTING.md) for details.