holoscan-cli 3.2.0__py3-none-any.whl → 3.4.0__py3-none-any.whl

holoscan_cli/common/sdk_utils.py

@@ -138,7 +138,7 @@ def detect_holoscan_version(sdk_version: Optional[Version] = None) -> str:
         return sdk_version.base_version
     else:
         try:
-            ver_str = importlib.metadata.version("holoscan-cli").title()
+            ver_str = importlib.metadata.version("holoscan").title()
             ver = Version(ver_str)
             ver_str = ".".join(str(i) for i in ver.release)
 
@@ -193,3 +193,17 @@ def detect_monaideploy_version(sdk_version: Optional[Version] = None) -> str:
             raise FailedToDetectSDKVersionError(
                 "Failed to detect installed MONAI Deploy App SDK PyPI version.", ex
             ) from ex
+
+
+def detect_holoscan_cli_version() -> str:
+    """
+    Detects Holoscan CLI version to use based on installed PyPI package.
+    """
+    try:
+        ver_str = importlib.metadata.version("holoscan-cli").title()
+        ver = Version(ver_str)
+        return ver.base_version
+    except Exception as ex:
+        raise FailedToDetectSDKVersionError(
+            "Failed to detect installed Holoscan CLI PyPI version.", ex
+        ) from ex

holoscan_cli/packager/package_command.py

@@ -44,6 +44,14 @@ def create_package_parser(
         help="Holoscan application path: Python application directory with __main__.py, "
         "Python file, C++ source directory with CMakeLists.txt, or path to an executable.",
     )
+
+    parser.add_argument(
+        "--add",
+        action="append",
+        dest="additional_libs",
+        type=valid_existing_dir_path,
+        help="include additional library files, python files into the application directory.",
+    )
     parser.add_argument(
         "--config",
         "-c",
@@ -70,13 +78,6 @@ def create_package_parser(
         help="target platform(s) for the build output separated by comma. "
         f"Valid values: {str.join(', ', SDK.PLATFORMS)}.",
     )
-    parser.add_argument(
-        "--add",
-        action="append",
-        dest="additional_libs",
-        type=valid_existing_dir_path,
-        help="include additional library files, python files into the application directory.",
-    )
     parser.add_argument(
         "--timeout", type=int, help="override default application timeout"
     )
@@ -113,11 +114,6 @@ def create_package_parser(
         type=str,
         help='additional CMAKE build arguments. E.g. "-DCMAKE_BUILD_TYPE=DEBUG -DCMAKE_ARG=VALUE"',
     )
-    advanced_group.add_argument(
-        "--input-data",
-        type=valid_dir_path,
-        help="sample input data to be embedded in the container.",
-    )
     advanced_group.add_argument(
         "--holoscan-sdk-file",
         type=valid_existing_path,
@@ -132,6 +128,11 @@ def create_package_parser(
         choices=["debug", "holoviz", "torch", "onnx"],
         help="additional packages to include in the container.",
     )
+    advanced_group.add_argument(
+        "--input-data",
+        type=valid_dir_path,
+        help="sample input data to be embedded in the container.",
+    )
     advanced_group.add_argument(
         "--monai-deploy-sdk-file",
         type=valid_existing_path,

holoscan_cli/packager/templates/Dockerfile.jinja2

@@ -63,7 +63,7 @@ ARG LIBTORCH_VERSION=2.5.0_24.08
 RUN apt update && \
     apt-get install -y --no-install-recommends --no-install-suggests \
         bzip2 \
-        libopenmpi3=4.1.2-* \
+        libopenmpi3t64=4.1.6-* \
     && rm -rf /var/lib/apt/lists/*
 
 # Download libtorch
@@ -197,15 +197,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-*" \
+    libvulkan1="1.3.275.0-*" \
     # X11 support \
-    libgl1="1.4.0-*" \
+    libgl1="1.7.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-*" \
+    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,8 +213,8 @@ 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-*
 
 RUN apt update \
 && apt-get install -y --no-install-recommends --no-install-suggests \
@@ -223,13 +223,13 @@ RUN apt update \
         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-*" \
+        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 \
+        cuda-cupti-12-8 \
         libcudnn9-cuda-12 \
     && rm -rf /var/lib/apt/lists/*
 
@@ -248,7 +248,8 @@ ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/sbsa-linux-gnu/
 
 #  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 \
+        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.
@@ -291,10 +292,10 @@ 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.3.*+cuda12.5" \
-        libnvinfer-plugin10="10.3.*+cuda12.5" \
-        libnvonnxparsers10="10.3.*+cuda12.5" \
-        libcusparselt0="0.6.3.2-*" \
+        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*
@@ -316,8 +317,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 \
@@ -387,11 +388,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,6 +406,9 @@ 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 }}
 

holoscan_cli/packager/templates/tools.sh

@@ -378,8 +378,6 @@ main() {
         if [ -n "${command}" ]; then
             args=$(printf " %s" "${@}")
             info "Launching application ${command} ${args:1}..."
-            echo "Files in /var/holoscan/input"
-            ls -laR /var/holoscan/input
             eval ${command} "$@"
             exit_code=$?
             info "Application exited with ${exit_code}."

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-3.4.0.dist-info/METADATA

@@ -0,0 +1,17 @@
+Metadata-Version: 2.3
+Name: holoscan-cli
+Version: 3.4.0
+Summary: 
+Requires-Python: >=3.9,<3.13
+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
+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.32,<3.0)

{holoscan_cli-3.2.0.dist-info → holoscan_cli-3.4.0.dist-info}/RECORD

@@ -6,7 +6,7 @@ holoscan_cli/common/constants.py,sha256=4yXMmz-PzHth5Qy4zt4E5bvpG6eQN3KQrjhyagRF
 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=uDMOM_Jq3SnzDROrFERc8krDS6-BkhOebKV2h9I_-0Y,6659
+holoscan_cli/common/sdk_utils.py,sha256=ehxuUONILiQ7KzYcBuveAowKIKhgF-EY_r2DFli6R2E,7092
 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
@@ -18,22 +18,22 @@ holoscan_cli/packager/config_reader.py,sha256=oE0Tnp7v9dh_qAj6nPap-_R-YGLpYKGh09
 holoscan_cli/packager/container_builder.py,sha256=bGGcN2YjRFfvJiLsL_DjznomwkPtrdjcVnTteMz9NX0,18560
 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=kXeGgSD9pklV1h8gotbGhHTHwcoTMmtiUeNEWRJN-6I,6742
+holoscan_cli/packager/package_command.py,sha256=U3hu0mA8dWyZwN7zzm7hptam8tJDJeG4jLMGLTg7Lqk,6743
 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=RUV5GKv94qo8O4yIVFys4Abny3uQrqdB8g4awATvU2M,17057
+holoscan_cli/packager/templates/Dockerfile.jinja2,sha256=UyRNcZhNWVRj1qaEav0HgIzuepoYhUL4CPaJQ0oZJog,17329
 holoscan_cli/packager/templates/dockerignore,sha256=zzBkA9eWgPW4KWyObuYjp13bv_m24AnFUgoENGNhMcY,1755
-holoscan_cli/packager/templates/tools.sh,sha256=H--3_TA_C2w20HyEFPW5Tooam_O1dk0k-_UGe1dHfiA,13654
+holoscan_cli/packager/templates/tools.sh,sha256=DnBs-XGWmxSz4XyspSMYwBajDXqUWQgUYD0HxtDw-88,13566
 holoscan_cli/py.typed,sha256=Z4hkVtwnqwhmVXOMES05WQZWjt4_rFEuditXTouPUJQ,684
 holoscan_cli/runner/__init__.py,sha256=N3dOMkOWT3adYk_pRKqn2zYgZjVCkpn5u7xatA9_aWQ,738
 holoscan_cli/runner/resources.py,sha256=R7wLnfwsG67jJD6U8d_gvteycsLPPDfWDYimAmnC-N4,5996
 holoscan_cli/runner/run_command.py,sha256=CnSyyq0y9rv6kkRtSOi3kOGHuRDLv2RDQ3JUWZ6U-YE,7320
 holoscan_cli/runner/runner.py,sha256=9TqvzBL5z1boGQXvlBiPiuuMDMg7dQlo40YXO1Le604,10521
 holoscan_cli/version/__init__.py,sha256=1pf-RBR16STdFXsh82bYly_lUyv1MgxuczbLOTDJRto,743
-holoscan_cli/version/version.py,sha256=FL4DUcQ2FA4eyvL8YjR2rcdPCduMnbTBhLNeXlESLsI,1738
-holoscan_cli-3.2.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
-holoscan_cli-3.2.0.dist-info/METADATA,sha256=3HuKfWkmTPdY46xQOuCwcX9NP8DUqHGBJjej7-1fCv0,3978
-holoscan_cli-3.2.0.dist-info/WHEEL,sha256=fGIA9gx4Qxk2KDKeNJCbOEwSrmLtjWCwzBz351GyrPQ,88
-holoscan_cli-3.2.0.dist-info/entry_points.txt,sha256=ZbJklrhFtmmhqcGvGizL_4Pf9FTRgmZ11LblKPbj8yo,95
-holoscan_cli-3.2.0.dist-info/RECORD,,
+holoscan_cli/version/version.py,sha256=1jAgChi39oEl9Rl0BDc30PPJMYeo7m5bMGPBGlRSX2M,1976
+holoscan_cli-3.4.0.dist-info/LICENSE,sha256=xx0jnfkXJvxRnG63LTGOxlggYnIysveWIZ6H3PNdCrQ,11357
+holoscan_cli-3.4.0.dist-info/METADATA,sha256=N3ZsuQtItzwYOEzRocLJfBDdlF6GA1oZHw5XyYb4GGs,607
+holoscan_cli-3.4.0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+holoscan_cli-3.4.0.dist-info/entry_points.txt,sha256=ZbJklrhFtmmhqcGvGizL_4Pf9FTRgmZ11LblKPbj8yo,95
+holoscan_cli-3.4.0.dist-info/RECORD,,

{holoscan_cli-3.2.0.dist-info → holoscan_cli-3.4.0.dist-info}/WHEEL

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

holoscan_cli-3.2.0.dist-info/METADATA

@@ -1,107 +0,0 @@
-Metadata-Version: 2.3
-Name: holoscan-cli
-Version: 3.2.0
-Summary: Command line interface for packaging and running Holoscan applications.
-License: Apache-2.0
-Keywords: AI,holoscan,medical,streaming,HPC,nvidia,docker,container
-Author: NVIDIA
-Maintainer: mocsharp
-Requires-Python: >=3.9,<3.13
-Classifier: Development Status :: 5 - Production/Stable
-Classifier: Environment :: Console
-Classifier: Environment :: GPU :: NVIDIA CUDA :: 12
-Classifier: Intended Audience :: Developers
-Classifier: Intended Audience :: Education
-Classifier: Intended Audience :: Healthcare Industry
-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: Topic :: Scientific/Engineering :: Artificial Intelligence
-Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Classifier: Typing :: Typed
-Requires-Dist: Jinja2 (>=3.1.6,<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: pyyaml (>=6.0,<7.0)
-Requires-Dist: requests (>=2.31.0,<3.0.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)](https://coveralls.io/github/nvidia-holoscan/holoscan-cli)
-
-# Holoscan CLI
-
-Command line interface for packaging and running Holoscan applications.
-
-## Overview
-
-This repository is the home for Holoscan CLI. It includes tools for packaging and running Holoscan applications.
-
-## Prerequisites
-
-You will need a platform supported by [NVIDIA Holoscan SDK](https://docs.nvidia.com/holoscan/sdk-user-guide/sdk_installation.html#prerequisites). Refer to the Holoscan SDK User Guide for the latest requirements. In general, Holoscan-supported platforms include:
-
-- An x64 PC with an Ubuntu operating system and an NVIDIA GPU or
-- A supported NVIDIA ARM development kit.
-
-## Installation
-
-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` |
-
-## Build From Source
-
-### Prerequisites
-
-To build the Holoscan CLI from source, you will need to clone this repository and install the following dependencies:
-
-- Python 3.9+.
-- [poetry 2.0+](https://python-poetry.org/docs/#installation)
-
-### Development Environment
-
-Holoscan CLI uses [Poetry](https://python-poetry.org/) for package and dependency management. After installing Poetry, run the following commands to get started:
-
-```bash
-# Create virtual environment
-poetry env use python3.12
-
-# Activate virtual environment
-eval $(poetry env activate)
-
-# Install dependencies
-poetry install
-
-# Configure pre-commit hooks
-pre-commit install
-
-# Run pre-commit against all files
-pre-commit run --all-files
-
-# Build sdist package
-poetry build
-
-# Run tests
-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.
-