From e80ba4d0e3fa3c918b6fc7d6d9324abaeed03708 Mon Sep 17 00:00:00 2001 From: David Gardner <96306125+dagardner-nv@users.noreply.github.com> Date: Wed, 19 Feb 2025 11:07:13 -0800 Subject: [PATCH] Adopt Rapids 25.02 and CUDA 12.8 (#2183) * When building with DOCA in CI restrict the `MORPHEUS_CUDA_ARCHITECTURES` to just those supported by DOCA. * Install DOCA from an apt repository rather than downloading a deb file * Avoid a version conflict for the `mft` package by manually specifying the version of `mft` to ensure the package is installed from the DOCA repo and not the CUDA repo. * Incorporates changes from #2097 to `cudf_helpers.pyx` to match changes made to cudf. Closes #2182 ## By Submitting this PR I confirm: - I am familiar with the [Contributing Guidelines](https://github.com/nv-morpheus/Morpheus/blob/main/docs/source/developer_guide/contributing.md). - When the PR is ready for review, new or existing tests cover these changes. - When the PR is ready for review, the documentation is up to date with these changes. Authors: - David Gardner (https://github.com/dagardner-nv) - Matthew Roeschke (https://github.com/mroeschke) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) - Will Killian (https://github.com/willkill07) URL: https://github.com/nv-morpheus/Morpheus/pull/2183 --- .../devcontainer.json | 6 +- .devcontainer/docker/optional_deps/doca.sh | 45 +++++++------ .github/workflows/ci_pipe.yml | 2 +- .github/workflows/pr.yaml | 6 +- CMakeLists.txt | 2 +- .../morpheus-libs/conda_build_config.yaml | 4 +- .../recipes/morpheus/conda_build_config.yaml | 4 +- ci/runner/Dockerfile | 36 ++++++---- ci/scripts/github/cmake_all.sh | 13 ++-- ci/scripts/github/test.sh | 2 +- ci/scripts/run_ci_local.sh | 6 +- ...64.yaml => all_cuda-128_arch-aarch64.yaml} | 32 ++++----- ..._64.yaml => all_cuda-128_arch-x86_64.yaml} | 32 ++++----- ...64.yaml => dev_cuda-128_arch-aarch64.yaml} | 24 +++---- ..._64.yaml => dev_cuda-128_arch-x86_64.yaml} | 24 +++---- ...ml => examples_cuda-128_arch-aarch64.yaml} | 8 +-- ...aml => examples_cuda-128_arch-x86_64.yaml} | 8 +-- ...=> model-utils_cuda-128_arch-aarch64.yaml} | 4 +- ... => model-utils_cuda-128_arch-x86_64.yaml} | 4 +- ...aml => runtime_cuda-128_arch-aarch64.yaml} | 14 ++-- ...yaml => runtime_cuda-128_arch-x86_64.yaml} | 14 ++-- dependencies.yaml | 66 +++++++++---------- docker/Dockerfile | 4 +- docker/build_container.sh | 4 +- docs/source/basics/overview.rst | 2 +- docs/source/developer_guide/contributing.md | 16 ++--- .../guides/3_simple_cpp_stage.md | 2 +- .../guides/4_source_cpp_stage.md | 2 +- docs/source/getting_started.md | 2 +- examples/abp_nvsmi_detection/README.md | 2 +- .../3_simple_cpp_stage/README.md | 2 +- .../4_rabbitmq_cpp_stage/README.md | 2 +- .../production/Dockerfile | 2 +- ...=> dfp_example_cuda-128_arch-aarch64.yaml} | 2 +- ... => dfp_example_cuda-128_arch-x86_64.yaml} | 2 +- .../production/morpheus/benchmarks/README.md | 2 +- examples/doca/vdb_realtime/README.md | 2 +- .../gnn_fraud_detection_pipeline/README.md | 4 +- examples/llm/agents/README.md | 4 +- examples/llm/completion/README.md | 4 +- examples/llm/rag/README.md | 2 +- examples/llm/vdb_upload/README.md | 2 +- external/utilities | 2 +- models/README.md | 2 +- .../fraud-detection-models/README.md | 2 +- models/triton-model-repo/README.md | 2 +- .../morpheus/_lib/common/__init__.pyi | 2 +- .../morpheus/morpheus/_lib/cudf_helpers.pyx | 11 +--- .../morpheus/_lib/cudf_helpers/__init__.pyi | 3 - .../morpheus/_lib/messages/__init__.pyi | 2 +- .../morpheus/_lib/modules/__init__.pyi | 2 +- .../_lib/src/stages/preprocess_nlp.cpp | 3 +- .../morpheus/_lib/stages/__init__.pyi | 2 +- .../morpheus_llm/_lib/llm/__init__.pyi | 2 +- tests/benchmarks/README.md | 2 +- 55 files changed, 236 insertions(+), 221 deletions(-) rename .devcontainer/{cuda12.5-conda => cuda12.8-conda}/devcontainer.json (96%) rename conda/environments/{all_cuda-125_arch-aarch64.yaml => all_cuda-128_arch-aarch64.yaml} (88%) rename conda/environments/{all_cuda-125_arch-x86_64.yaml => all_cuda-128_arch-x86_64.yaml} (88%) rename conda/environments/{dev_cuda-125_arch-aarch64.yaml => dev_cuda-128_arch-aarch64.yaml} (87%) rename conda/environments/{dev_cuda-125_arch-x86_64.yaml => dev_cuda-128_arch-x86_64.yaml} (88%) rename conda/environments/{examples_cuda-125_arch-aarch64.yaml => examples_cuda-128_arch-aarch64.yaml} (94%) rename conda/environments/{examples_cuda-125_arch-x86_64.yaml => examples_cuda-128_arch-x86_64.yaml} (94%) rename conda/environments/{model-utils_cuda-125_arch-aarch64.yaml => model-utils_cuda-128_arch-aarch64.yaml} (88%) rename conda/environments/{model-utils_cuda-125_arch-x86_64.yaml => model-utils_cuda-128_arch-x86_64.yaml} (89%) rename conda/environments/{runtime_cuda-125_arch-aarch64.yaml => runtime_cuda-128_arch-aarch64.yaml} (85%) rename conda/environments/{runtime_cuda-125_arch-x86_64.yaml => runtime_cuda-128_arch-x86_64.yaml} (86%) rename examples/digital_fingerprinting/production/conda/environments/{dfp_example_cuda-125_arch-aarch64.yaml => dfp_example_cuda-128_arch-aarch64.yaml} (92%) rename examples/digital_fingerprinting/production/conda/environments/{dfp_example_cuda-125_arch-x86_64.yaml => dfp_example_cuda-128_arch-x86_64.yaml} (92%) diff --git a/.devcontainer/cuda12.5-conda/devcontainer.json b/.devcontainer/cuda12.8-conda/devcontainer.json similarity index 96% rename from .devcontainer/cuda12.5-conda/devcontainer.json rename to .devcontainer/cuda12.8-conda/devcontainer.json index df5c1451ae..d8c89497a9 100644 --- a/.devcontainer/cuda12.5-conda/devcontainer.json +++ b/.devcontainer/cuda12.8-conda/devcontainer.json @@ -3,7 +3,7 @@ "context": "${localWorkspaceFolder}/.devcontainer", "dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile", "args": { - "CUDA": "12.5", + "CUDA": "12.8", "PYTHON_PACKAGE_MANAGER": "conda", "BASE": "rapidsai/devcontainers:24.12-cpp-mambaforge-ubuntu22.04" } @@ -47,7 +47,7 @@ "initializeCommand": [ "/bin/bash", "-c", - "${localWorkspaceFolder}/.devcontainer/initialize-command.sh && mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.5-envs}" + "${localWorkspaceFolder}/.devcontainer/initialize-command.sh && mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.8-envs}" ], "postAttachCommand": [ "/bin/bash", @@ -66,7 +66,7 @@ "source=${localWorkspaceFolder}/../.cache,target=/home/coder/.cache,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.config,target=/home/coder/.config,type=bind,consistency=consistent", "source=${localWorkspaceFolder}/../.conda/pkgs,target=/home/coder/.conda/pkgs,type=bind,consistency=consistent", - "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.5-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent" + "source=${localWorkspaceFolder}/../.conda/${localWorkspaceFolderBasename}-cuda12.8-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent" ], "customizations": { "vscode": { diff --git a/.devcontainer/docker/optional_deps/doca.sh b/.devcontainer/docker/optional_deps/doca.sh index 5896051585..d12985173c 100755 --- a/.devcontainer/docker/optional_deps/doca.sh +++ b/.devcontainer/docker/optional_deps/doca.sh @@ -17,10 +17,24 @@ set -e MORPHEUS_SUPPORT_DOCA=${MORPHEUS_SUPPORT_DOCA:-OFF} + LINUX_DISTRO=${LINUX_DISTRO:-ubuntu} -LINUX_VER=${LINUX_VER:-22.04} + +DOCA_OS_VERSION=${DOCA_OS_VERSION:-"22.04"} DOCA_VERSION=${DOCA_VERSION:-2.7.0} -PKG_ARCH=${PKG_ARCH:-$(dpkg --print-architecture)} + +REAL_ARCH=${REAL_ARCH:-$(arch)} +if [[ ${REAL_ARCH} == "x86_64" ]]; then + DOCA_ARCH="x86_64" +elif [[ ${REAL_ARCH} == "aarch64" ]]; then + DOCA_ARCH="arm64-sbsa" +else + echo "Unsupported architecture: ${REAL_ARCH}" + exit 1 +fi + +DOCA_URL="https://linux.mellanox.com/public/repo/doca/${DOCA_VERSION}/${LINUX_DISTRO}${DOCA_OS_VERSION}/${DOCA_ARCH}/" +DOCA_GPG_URL="https://linux.mellanox.com/public/repo/doca/GPG-KEY-Mellanox.pub" # Exit early if nothing to do if [[ ${MORPHEUS_SUPPORT_DOCA} != @(TRUE|ON) ]]; then @@ -28,28 +42,21 @@ if [[ ${MORPHEUS_SUPPORT_DOCA} != @(TRUE|ON) ]]; then fi WORKING_DIR=$1 - +mkdir -p ${WORKING_DIR} echo "Installing DOCA using directory: ${WORKING_DIR}" -DEB_DIR=${WORKING_DIR}/deb - -mkdir -p ${DEB_DIR} - -DOCA_OS_VERSION="ubuntu2204" -DOCA_PKG_LINK="https://www.mellanox.com/downloads/DOCA/DOCA_v${DOCA_VERSION}/host/doca-host_${DOCA_VERSION}-204000-24.04-${DOCA_OS_VERSION}_${PKG_ARCH}.deb" -# Upgrade the base packages (diff between image and Canonical upstream repo) -apt update -y -apt upgrade -y +echo "Adding DOCA repo: ${DOCA_URL}" +curl ${DOCA_GPG_URL} | gpg --dearmor > /etc/apt/trusted.gpg.d/GPG-KEY-Mellanox.pub +echo "deb [signed-by=/etc/apt/trusted.gpg.d/GPG-KEY-Mellanox.pub] $DOCA_URL ./" > /etc/apt/sources.list.d/doca.list -# Install wget -apt install -y --no-install-recommends wget - -wget -qO - ${DOCA_PKG_LINK} -O doca-host.deb -apt install ./doca-host.deb apt update -apt install -y doca-all -apt install -y doca-gpu doca-gpu-dev + +# Need to explicitly install the version of mft provided by the DOCA repo overriding the verdion from the cuda repo +# to avoid version conflicts. +# If/when we update either the OS, DOCA or CUDA version, we need to update the mft version here as well by checking +# the output of `apt policy mft` +apt install -y doca-all doca-gpu doca-gpu-dev mft=4.28.0-92 # Now install the gdrcopy library according to: https://github.com/NVIDIA/gdrcopy GDRCOPY_DIR=${WORKING_DIR}/gdrcopy diff --git a/.github/workflows/ci_pipe.yml b/.github/workflows/ci_pipe.yml index 575df19fee..df161f2b89 100644 --- a/.github/workflows/ci_pipe.yml +++ b/.github/workflows/ci_pipe.yml @@ -47,7 +47,7 @@ on: env: CHANGE_TARGET: "${{ github.base_ref }}" CUDA_PATH: "/usr/local/cuda/" - CUDA_VER: "12.5" + CUDA_VER: "12.8" GH_TOKEN: "${{ github.token }}" GIT_COMMIT: "${{ github.sha }}" MORPHEUS_ROOT: "${{ github.workspace }}/morpheus" diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index 5981d3d119..d60c33b296 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -95,9 +95,9 @@ jobs: conda_run_build: ${{ !fromJSON(needs.prepare.outputs.is_pr) || fromJSON(needs.prepare.outputs.has_conda_build_label) }} # Upload morpheus conda packages only for non PR branches. Use 'main' for main branch and 'dev' for all other branches conda_upload_label: ${{ !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || '' }} - base_container: rapidsai/ci-conda:cuda12.5.1-ubuntu22.04-py3.10 - container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-250102 - test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-250102 + base_container: rapidsai/ci-conda:cuda12.8.0-ubuntu22.04-py3.10 + container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-250213 + test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-250213 secrets: CONDA_TOKEN: ${{ secrets.CONDA_TOKEN }} NGC_API_KEY: ${{ secrets.NGC_API_KEY }} diff --git a/CMakeLists.txt b/CMakeLists.txt index 3ff240e332..f42ea03597 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -38,7 +38,7 @@ option(MORPHEUS_USE_IWYU "Enable running include-what-you-use as part of the bui set(MORPHEUS_PY_INSTALL_DIR "${CMAKE_CURRENT_BINARY_DIR}/wheel" CACHE STRING "Location to install the python directory") -set(MORPHEUS_RAPIDS_VERSION "24.10" CACHE STRING "Sets default versions for RAPIDS libraries.") +set(MORPHEUS_RAPIDS_VERSION "25.02" CACHE STRING "Sets default versions for RAPIDS libraries.") set(MORPHEUS_CACHE_DIR "${CMAKE_SOURCE_DIR}/.cache" CACHE PATH "Directory to contain all CPM and CCache data") mark_as_advanced(MORPHEUS_CACHE_DIR) diff --git a/ci/conda/recipes/morpheus-libs/conda_build_config.yaml b/ci/conda/recipes/morpheus-libs/conda_build_config.yaml index a7578c7f6b..4b1059a224 100644 --- a/ci/conda/recipes/morpheus-libs/conda_build_config.yaml +++ b/ci/conda/recipes/morpheus-libs/conda_build_config.yaml @@ -23,10 +23,10 @@ cuda_compiler: - cuda-nvcc cuda_compiler_version: - - 12.5 + - 12.8 python: - 3.10 rapids_version: - - 24.10 + - 25.02 diff --git a/ci/conda/recipes/morpheus/conda_build_config.yaml b/ci/conda/recipes/morpheus/conda_build_config.yaml index a7578c7f6b..4b1059a224 100644 --- a/ci/conda/recipes/morpheus/conda_build_config.yaml +++ b/ci/conda/recipes/morpheus/conda_build_config.yaml @@ -23,10 +23,10 @@ cuda_compiler: - cuda-nvcc cuda_compiler_version: - - 12.5 + - 12.8 python: - 3.10 rapids_version: - - 24.10 + - 25.02 diff --git a/ci/runner/Dockerfile b/ci/runner/Dockerfile index 97489e334b..94e18dc0ff 100644 --- a/ci/runner/Dockerfile +++ b/ci/runner/Dockerfile @@ -15,9 +15,8 @@ # Args used in FROM commands must come first ARG FROM_IMAGE="rapidsai/ci-conda" -ARG CUDA_PKG_VER=12-0 -ARG CUDA_SHORT_VER=12.5 -ARG CUDA_VER=12.5.1 +ARG CUDA_SHORT_VER=12.8 +ARG CUDA_VER=12.8.0 ARG LINUX_DISTRO=ubuntu ARG LINUX_VER=22.04 ARG PROJ_NAME=morpheus @@ -35,6 +34,9 @@ SHELL ["/bin/bash", "-c"] ENV REAL_ARCH=${REAL_ARCH} +# https://github.com/rapidsai/ci-imgs/issues/241 +RUN rm -rf /tmp/sccache* /root/.cache + # Create conda environment COPY ./dependencies.yaml /tmp/conda/ @@ -47,7 +49,9 @@ ARG PROJ_NAME ARG PYTHON_VER ARG REAL_ARCH -RUN rapids-dependency-file-generator \ +RUN --mount=type=cache,id=conda_pkgs,target=/opt/conda/pkgs,sharing=locked \ + --mount=type=cache,id=pip_cache,target=/root/.cache/pip,sharing=locked \ + rapids-dependency-file-generator \ --config /tmp/conda/dependencies.yaml \ --output conda \ --file-key build \ @@ -61,15 +65,20 @@ ENV MORPHEUS_SUPPORT_DOCA=ON COPY ./.devcontainer/docker/optional_deps/doca.sh /tmp/doca/ -RUN apt update && \ +RUN --mount=type=cache,id=apt,target=/var/cache/apt \ + apt update && \ DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \ + apt upgrade -y && \ apt install --no-install-recommends -y \ + automake \ build-essential \ - libtool \ - automake && \ - apt clean && \ - PKG_ARCH=${TARGETARCH} /tmp/doca/doca.sh /tmp/doca && \ - rm -rf /tmp/doca + libtool + +RUN --mount=type=cache,id=apt,target=/var/cache/apt \ + DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \ + /tmp/doca/doca.sh /tmp/doca && \ + rm -rf /tmp/doca && \ + apt clean # ============ test ================== FROM base as test @@ -81,14 +90,17 @@ ARG CUDA_SHORT_VER ARG PROJ_NAME ARG PYTHON_VER -RUN apt update && \ +RUN --mount=type=cache,id=apt,target=/var/cache/apt \ + apt update && \ DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC \ apt install --no-install-recommends -y \ openjdk-11-jre-headless && \ apt clean && \ rm -rf /var/lib/apt/lists/* -RUN rapids-dependency-file-generator \ +RUN --mount=type=cache,id=conda_pkgs,target=/opt/conda/pkgs,sharing=locked \ + --mount=type=cache,id=pip_cache,target=/root/.cache/pip,sharing=locked \ + rapids-dependency-file-generator \ --config /tmp/conda/dependencies.yaml \ --output conda \ --file-key test \ diff --git a/ci/scripts/github/cmake_all.sh b/ci/scripts/github/cmake_all.sh index 20c375e5a0..c11061dc41 100644 --- a/ci/scripts/github/cmake_all.sh +++ b/ci/scripts/github/cmake_all.sh @@ -18,7 +18,6 @@ _FLAGS=() _FLAGS+=("-B" "${BUILD_DIR}") _FLAGS+=("-G" "Ninja") _FLAGS+=("-DCMAKE_MESSAGE_CONTEXT_SHOW=ON") -_FLAGS+=("-DMORPHEUS_CUDA_ARCHITECTURES=RAPIDS") _FLAGS+=("-DMORPHEUS_USE_CCACHE=ON") _FLAGS+=("-DMORPHEUS_PYTHON_INPLACE_BUILD=OFF") _FLAGS+=("-DMORPHEUS_PYTHON_BUILD_STUBS=ON") @@ -27,12 +26,16 @@ _FLAGS+=("-DMORPHEUS_BUILD_EXAMPLES=ON") _FLAGS+=("-DMORPHEUS_BUILD_TESTS=ON") _FLAGS+=("-DMORPHEUS_BUILD_MORPHEUS_LLM=ON") _FLAGS+=("-DMORPHEUS_BUILD_MORPHEUS_DFP=ON") +if [[ ${MORPHEUS_SUPPORT_DOCA} == @(TRUE|ON) ]]; then + _FLAGS+=("-DMORPHEUS_SUPPORT_DOCA=ON") + # Set the CMAKE_CUDA_ARCHITECTURES to just 80;86 since that is what DOCA supports for now + _FLAGS+=("-DMORPHEUS_CUDA_ARCHITECTURES=80;86") +else + _FLAGS+=("-DMORPHEUS_CUDA_ARCHITECTURES=RAPIDS") +fi + if [[ "${LOCAL_CI}" == "" ]]; then _FLAGS+=("-DCCACHE_PROGRAM_PATH=$(which sccache)") fi export CMAKE_BUILD_ALL_FEATURES="${_FLAGS[@]}" unset _FLAGS - -if [[ ${MORPHEUS_SUPPORT_DOCA} == @(TRUE|ON) ]]; then - export CMAKE_BUILD_ALL_FEATURES="${CMAKE_BUILD_ALL_FEATURES} -DMORPHEUS_SUPPORT_DOCA=ON" -fi diff --git a/ci/scripts/github/test.sh b/ci/scripts/github/test.sh index 3b54948919..b8114fe815 100755 --- a/ci/scripts/github/test.sh +++ b/ci/scripts/github/test.sh @@ -21,7 +21,7 @@ source ${WORKSPACE}/ci/scripts/github/morpheus_env.sh source ${WORKSPACE}/ci/scripts/github/cmake_all.sh /usr/bin/nvidia-smi -update_conda_env "${WORKSPACE}/conda/environments/all_cuda-125_arch-${REAL_ARCH}.yaml" +update_conda_env "${WORKSPACE}/conda/environments/all_cuda-128_arch-${REAL_ARCH}.yaml" log_toolchain diff --git a/ci/scripts/run_ci_local.sh b/ci/scripts/run_ci_local.sh index 16a7489c4a..909fa2304f 100755 --- a/ci/scripts/run_ci_local.sh +++ b/ci/scripts/run_ci_local.sh @@ -59,9 +59,9 @@ GIT_BRANCH=$(git branch --show-current) GIT_COMMIT=$(git log -n 1 --pretty=format:%H) LOCAL_CI_TMP=${LOCAL_CI_TMP:-${MORPHEUS_ROOT}/.tmp/local_ci_tmp} -CONTAINER_VER=${CONTAINER_VER:-250102} -CUDA_VER=${CUDA_VER:-12.5} -CUDA_FULL_VER=${CUDA_FULL_VER:-12.5.1} +CONTAINER_VER=${CONTAINER_VER:-250213} +CUDA_VER=${CUDA_VER:-12.8} +CUDA_FULL_VER=${CUDA_FULL_VER:-12.8.0} DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""} # Configure the base docker img diff --git a/conda/environments/all_cuda-125_arch-aarch64.yaml b/conda/environments/all_cuda-128_arch-aarch64.yaml similarity index 88% rename from conda/environments/all_cuda-125_arch-aarch64.yaml rename to conda/environments/all_cuda-128_arch-aarch64.yaml index bcec502178..c73a3bd68e 100644 --- a/conda/environments/all_cuda-125_arch-aarch64.yaml +++ b/conda/environments/all_cuda-128_arch-aarch64.yaml @@ -22,18 +22,18 @@ dependencies: - clangdev=16 - click>=8 - cmake=3.27 -- cuda-cudart-dev=12.5 -- cuda-cudart=12.5 -- cuda-nvcc=12.5 -- cuda-nvml-dev=12.5 -- cuda-nvrtc-dev=12.5 -- cuda-nvrtc=12.5 -- cuda-nvtx-dev=12.5 -- cuda-nvtx=12.5 +- cuda-cudart-dev=12.8 +- cuda-cudart=12.8 +- cuda-nvcc=12.8 +- cuda-nvml-dev=12.8 +- cuda-nvrtc-dev=12.8 +- cuda-nvrtc=12.8 +- cuda-nvtx-dev=12.8 +- cuda-nvtx=12.8 - cuda-sanitizer-api -- cuda-version=12.5 -- cudf=24.10 -- cuml=24.10.* +- cuda-version=12.8 +- cudf=25.02 +- cuml=25.02.* - cupy - cxx-compiler - cython=3.0 @@ -59,7 +59,7 @@ dependencies: - jsonpatch>=1.33 - kfp - libcublas-dev -- libcudf=24.10 +- libcudf=25.02 - libcufft-dev - libcurand-dev - libcusolver-dev @@ -87,9 +87,9 @@ dependencies: - pre-commit - pybind11-stubgen=0.10.5 - pydantic -- pylibcudf=24.10 +- pylibcudf=25.02 - pylint=3.0.3 -- pynvml=11.4 +- pynvml=12 - pypdf=3.17.4 - pytest-asyncio - pytest-benchmark=4.0 @@ -100,7 +100,7 @@ dependencies: - python-graphviz - python=3.10 - rapidjson=1.1.0 -- rapids-dask-dependency=24.10 +- rapids-dask-dependency=25.02 - rdma-core>=48 - requests-cache=1.1 - requests-toolbelt=1.0 @@ -142,4 +142,4 @@ dependencies: - python-logging-loki - sentence-transformers==2.7 - torch==2.4.0 -name: all_cuda-125_arch-aarch64 +name: all_cuda-128_arch-aarch64 diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-128_arch-x86_64.yaml similarity index 88% rename from conda/environments/all_cuda-125_arch-x86_64.yaml rename to conda/environments/all_cuda-128_arch-x86_64.yaml index 3d4152463a..7d7ed2a884 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-128_arch-x86_64.yaml @@ -22,18 +22,18 @@ dependencies: - clangdev=16 - click>=8 - cmake=3.27 -- cuda-cudart-dev=12.5 -- cuda-cudart=12.5 -- cuda-nvcc=12.5 -- cuda-nvml-dev=12.5 -- cuda-nvrtc-dev=12.5 -- cuda-nvrtc=12.5 -- cuda-nvtx-dev=12.5 -- cuda-nvtx=12.5 +- cuda-cudart-dev=12.8 +- cuda-cudart=12.8 +- cuda-nvcc=12.8 +- cuda-nvml-dev=12.8 +- cuda-nvrtc-dev=12.8 +- cuda-nvrtc=12.8 +- cuda-nvtx-dev=12.8 +- cuda-nvtx=12.8 - cuda-sanitizer-api -- cuda-version=12.5 -- cudf=24.10 -- cuml=24.10.* +- cuda-version=12.8 +- cudf=25.02 +- cuml=25.02.* - cupy - cxx-compiler - cython=3.0 @@ -60,7 +60,7 @@ dependencies: - jsonpatch>=1.33 - kfp - libcublas-dev -- libcudf=24.10 +- libcudf=25.02 - libcufft-dev - libcurand-dev - libcusolver-dev @@ -89,9 +89,9 @@ dependencies: - pre-commit - pybind11-stubgen=0.10.5 - pydantic -- pylibcudf=24.10 +- pylibcudf=25.02 - pylint=3.0.3 -- pynvml=11.4 +- pynvml=12 - pypdf=3.17.4 - pypdfium2==4.30 - pytest-asyncio @@ -103,7 +103,7 @@ dependencies: - python-graphviz - python=3.10 - rapidjson=1.1.0 -- rapids-dask-dependency=24.10 +- rapids-dask-dependency=25.02 - rdma-core>=48 - requests-cache=1.1 - requests-toolbelt=1.0 @@ -148,4 +148,4 @@ dependencies: - python-logging-loki - sentence-transformers==2.7 - torch==2.4.0+cu124 -name: all_cuda-125_arch-x86_64 +name: all_cuda-128_arch-x86_64 diff --git a/conda/environments/dev_cuda-125_arch-aarch64.yaml b/conda/environments/dev_cuda-128_arch-aarch64.yaml similarity index 87% rename from conda/environments/dev_cuda-125_arch-aarch64.yaml rename to conda/environments/dev_cuda-128_arch-aarch64.yaml index cfbd2326cd..12dffdd28d 100644 --- a/conda/environments/dev_cuda-125_arch-aarch64.yaml +++ b/conda/environments/dev_cuda-128_arch-aarch64.yaml @@ -19,14 +19,14 @@ dependencies: - clangdev=16 - click>=8 - cmake=3.27 -- cuda-cudart-dev=12.5 -- cuda-nvcc=12.5 -- cuda-nvml-dev=12.5 -- cuda-nvrtc-dev=12.5 -- cuda-nvtx-dev=12.5 +- cuda-cudart-dev=12.8 +- cuda-nvcc=12.8 +- cuda-nvml-dev=12.8 +- cuda-nvrtc-dev=12.8 +- cuda-nvtx-dev=12.8 - cuda-sanitizer-api -- cuda-version=12.5 -- cudf=24.10 +- cuda-version=12.8 +- cudf=25.02 - cupy - cxx-compiler - cython=3.0 @@ -48,7 +48,7 @@ dependencies: - ipython - isort - libcublas-dev -- libcudf=24.10 +- libcudf=25.02 - libcufft-dev - libcurand-dev - libcusolver-dev @@ -72,9 +72,9 @@ dependencies: - pre-commit - pybind11-stubgen=0.10.5 - pydantic -- pylibcudf=24.10 +- pylibcudf=25.02 - pylint=3.0.3 -- pynvml=11.4 +- pynvml=12 - pytest-asyncio - pytest-benchmark=4.0 - pytest-cov @@ -84,7 +84,7 @@ dependencies: - python-graphviz - python=3.10 - rapidjson=1.1.0 -- rapids-dask-dependency=24.10 +- rapids-dask-dependency=25.02 - rdma-core>=48 - requests-cache=1.1 - requests<2.29.0 @@ -110,4 +110,4 @@ dependencies: - pypdfium2==4.30 - pytest-kafka==0.6.0 - torch==2.4.0 -name: dev_cuda-125_arch-aarch64 +name: dev_cuda-128_arch-aarch64 diff --git a/conda/environments/dev_cuda-125_arch-x86_64.yaml b/conda/environments/dev_cuda-128_arch-x86_64.yaml similarity index 88% rename from conda/environments/dev_cuda-125_arch-x86_64.yaml rename to conda/environments/dev_cuda-128_arch-x86_64.yaml index 6f1373027e..0e1b07f83f 100644 --- a/conda/environments/dev_cuda-125_arch-x86_64.yaml +++ b/conda/environments/dev_cuda-128_arch-x86_64.yaml @@ -19,14 +19,14 @@ dependencies: - clangdev=16 - click>=8 - cmake=3.27 -- cuda-cudart-dev=12.5 -- cuda-nvcc=12.5 -- cuda-nvml-dev=12.5 -- cuda-nvrtc-dev=12.5 -- cuda-nvtx-dev=12.5 +- cuda-cudart-dev=12.8 +- cuda-nvcc=12.8 +- cuda-nvml-dev=12.8 +- cuda-nvrtc-dev=12.8 +- cuda-nvtx-dev=12.8 - cuda-sanitizer-api -- cuda-version=12.5 -- cudf=24.10 +- cuda-version=12.8 +- cudf=25.02 - cupy - cxx-compiler - cython=3.0 @@ -49,7 +49,7 @@ dependencies: - ipython - isort - libcublas-dev -- libcudf=24.10 +- libcudf=25.02 - libcufft-dev - libcurand-dev - libcusolver-dev @@ -73,9 +73,9 @@ dependencies: - pre-commit - pybind11-stubgen=0.10.5 - pydantic -- pylibcudf=24.10 +- pylibcudf=25.02 - pylint=3.0.3 -- pynvml=11.4 +- pynvml=12 - pypdfium2==4.30 - pytest-asyncio - pytest-benchmark=4.0 @@ -86,7 +86,7 @@ dependencies: - python-graphviz - python=3.10 - rapidjson=1.1.0 -- rapids-dask-dependency=24.10 +- rapids-dask-dependency=25.02 - rdma-core>=48 - requests-cache=1.1 - requests<2.29.0 @@ -116,4 +116,4 @@ dependencies: - pymilvus==2.3.6 - pytest-kafka==0.6.0 - torch==2.4.0+cu124 -name: dev_cuda-125_arch-x86_64 +name: dev_cuda-128_arch-x86_64 diff --git a/conda/environments/examples_cuda-125_arch-aarch64.yaml b/conda/environments/examples_cuda-128_arch-aarch64.yaml similarity index 94% rename from conda/environments/examples_cuda-125_arch-aarch64.yaml rename to conda/environments/examples_cuda-128_arch-aarch64.yaml index a0712a99c2..a80ac38edf 100644 --- a/conda/environments/examples_cuda-125_arch-aarch64.yaml +++ b/conda/environments/examples_cuda-128_arch-aarch64.yaml @@ -15,8 +15,8 @@ dependencies: - beautifulsoup4=4.12 - boto3=1.35 - click>=8 -- cudf=24.10 -- cuml=24.10.* +- cudf=25.02 +- cuml=25.02.* - cupy - datacompy=0.10 - dill=0.3.7 @@ -49,7 +49,7 @@ dependencies: - python-docx==1.1.0 - python-graphviz - python=3.10 -- rapids-dask-dependency=24.10 +- rapids-dask-dependency=25.02 - requests-cache=1.1 - requests-toolbelt=1.0 - requests<2.29.0 @@ -82,4 +82,4 @@ dependencies: - python-logging-loki - sentence-transformers==2.7 - torch==2.4.0 -name: examples_cuda-125_arch-aarch64 +name: examples_cuda-128_arch-aarch64 diff --git a/conda/environments/examples_cuda-125_arch-x86_64.yaml b/conda/environments/examples_cuda-128_arch-x86_64.yaml similarity index 94% rename from conda/environments/examples_cuda-125_arch-x86_64.yaml rename to conda/environments/examples_cuda-128_arch-x86_64.yaml index 35c6aaf716..2b145b9cd7 100644 --- a/conda/environments/examples_cuda-125_arch-x86_64.yaml +++ b/conda/environments/examples_cuda-128_arch-x86_64.yaml @@ -15,8 +15,8 @@ dependencies: - beautifulsoup4=4.12 - boto3=1.35 - click>=8 -- cudf=24.10 -- cuml=24.10.* +- cudf=25.02 +- cuml=25.02.* - cupy - datacompy=0.10 - dill=0.3.7 @@ -51,7 +51,7 @@ dependencies: - python-docx==1.1.0 - python-graphviz - python=3.10 -- rapids-dask-dependency=24.10 +- rapids-dask-dependency=25.02 - requests-cache=1.1 - requests-toolbelt=1.0 - requests<2.29.0 @@ -84,4 +84,4 @@ dependencies: - python-logging-loki - sentence-transformers==2.7 - torch==2.4.0+cu124 -name: examples_cuda-125_arch-x86_64 +name: examples_cuda-128_arch-x86_64 diff --git a/conda/environments/model-utils_cuda-125_arch-aarch64.yaml b/conda/environments/model-utils_cuda-128_arch-aarch64.yaml similarity index 88% rename from conda/environments/model-utils_cuda-125_arch-aarch64.yaml rename to conda/environments/model-utils_cuda-128_arch-aarch64.yaml index eeeeb45ce1..1367541f9c 100644 --- a/conda/environments/model-utils_cuda-125_arch-aarch64.yaml +++ b/conda/environments/model-utils_cuda-128_arch-aarch64.yaml @@ -9,7 +9,7 @@ channels: - nvidia/label/dev - pytorch dependencies: -- cuml=24.10.* +- cuml=25.02.* - jupyterlab - matplotlib - onnx @@ -23,4 +23,4 @@ dependencies: - xgboost - pip: - tensorrt-cu12 -name: model-utils_cuda-125_arch-aarch64 +name: model-utils_cuda-128_arch-aarch64 diff --git a/conda/environments/model-utils_cuda-125_arch-x86_64.yaml b/conda/environments/model-utils_cuda-128_arch-x86_64.yaml similarity index 89% rename from conda/environments/model-utils_cuda-125_arch-x86_64.yaml rename to conda/environments/model-utils_cuda-128_arch-x86_64.yaml index 9c39634775..5daca2982e 100644 --- a/conda/environments/model-utils_cuda-125_arch-x86_64.yaml +++ b/conda/environments/model-utils_cuda-128_arch-x86_64.yaml @@ -9,7 +9,7 @@ channels: - nvidia/label/dev - pytorch dependencies: -- cuml=24.10.* +- cuml=25.02.* - jupyterlab - matplotlib - onnx @@ -23,4 +23,4 @@ dependencies: - xgboost - pip: - tensorrt-cu12 -name: model-utils_cuda-125_arch-x86_64 +name: model-utils_cuda-128_arch-x86_64 diff --git a/conda/environments/runtime_cuda-125_arch-aarch64.yaml b/conda/environments/runtime_cuda-128_arch-aarch64.yaml similarity index 85% rename from conda/environments/runtime_cuda-125_arch-aarch64.yaml rename to conda/environments/runtime_cuda-128_arch-aarch64.yaml index e334ea7fa7..d315c27a1f 100644 --- a/conda/environments/runtime_cuda-125_arch-aarch64.yaml +++ b/conda/environments/runtime_cuda-128_arch-aarch64.yaml @@ -12,11 +12,11 @@ dependencies: - appdirs - beautifulsoup4=4.12 - click>=8 -- cuda-cudart=12.5 -- cuda-nvrtc=12.5 -- cuda-nvtx=12.5 -- cuda-version=12.5 -- cudf=24.10 +- cuda-cudart=12.8 +- cuda-nvrtc=12.8 +- cuda-nvtx=12.8 +- cuda-version=12.8 +- cudf=25.02 - cupy - datacompy=0.10 - dill=0.3.7 @@ -37,7 +37,7 @@ dependencies: - python-confluent-kafka>=1.9.2,<1.10.0a0 - python-graphviz - python=3.10 -- rapids-dask-dependency=24.10 +- rapids-dask-dependency=25.02 - requests-cache=1.1 - requests<2.29.0 - scikit-learn=1.3.2 @@ -53,4 +53,4 @@ dependencies: - databricks-cli < 0.100 - databricks-connect - torch==2.4.0 -name: runtime_cuda-125_arch-aarch64 +name: runtime_cuda-128_arch-aarch64 diff --git a/conda/environments/runtime_cuda-125_arch-x86_64.yaml b/conda/environments/runtime_cuda-128_arch-x86_64.yaml similarity index 86% rename from conda/environments/runtime_cuda-125_arch-x86_64.yaml rename to conda/environments/runtime_cuda-128_arch-x86_64.yaml index 7a66cffa22..531a2a9c30 100644 --- a/conda/environments/runtime_cuda-125_arch-x86_64.yaml +++ b/conda/environments/runtime_cuda-128_arch-x86_64.yaml @@ -12,11 +12,11 @@ dependencies: - appdirs - beautifulsoup4=4.12 - click>=8 -- cuda-cudart=12.5 -- cuda-nvrtc=12.5 -- cuda-nvtx=12.5 -- cuda-version=12.5 -- cudf=24.10 +- cuda-cudart=12.8 +- cuda-nvrtc=12.8 +- cuda-nvtx=12.8 +- cuda-version=12.8 +- cudf=25.02 - cupy - datacompy=0.10 - dill=0.3.7 @@ -37,7 +37,7 @@ dependencies: - python-confluent-kafka>=1.9.2,<1.10.0a0 - python-graphviz - python=3.10 -- rapids-dask-dependency=24.10 +- rapids-dask-dependency=25.02 - requests-cache=1.1 - requests<2.29.0 - scikit-learn=1.3.2 @@ -55,4 +55,4 @@ dependencies: - milvus==2.3.5 - pymilvus==2.3.6 - torch==2.4.0+cu124 -name: runtime_cuda-125_arch-x86_64 +name: runtime_cuda-128_arch-x86_64 diff --git a/dependencies.yaml b/dependencies.yaml index 4f21cadf05..f995282226 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -20,7 +20,7 @@ files: all: output: conda matrix: - cuda: ["12.5"] + cuda: ["12.8"] arch: [x86_64, aarch64] includes: - benchmark_cpp @@ -46,7 +46,7 @@ files: dev: output: conda matrix: - cuda: ["12.5"] + cuda: ["12.8"] arch: [x86_64, aarch64] includes: - benchmark_cpp @@ -68,7 +68,7 @@ files: build: output: none matrix: - cuda: ["12.5"] + cuda: ["12.8"] arch: [x86_64, aarch64] includes: - benchmark_cpp @@ -88,7 +88,7 @@ files: test: output: none matrix: - cuda: ["12.5"] + cuda: ["12.8"] arch: [x86_64, aarch64] includes: - benchmark_cpp @@ -109,7 +109,7 @@ files: docs: output: none matrix: - cuda: ["12.5"] + cuda: ["12.8"] arch: [x86_64] includes: - benchmark_cpp @@ -132,7 +132,7 @@ files: runtime: output: conda matrix: - cuda: ["12.5"] + cuda: ["12.8"] arch: [x86_64, aarch64] includes: - cudatoolkit @@ -146,7 +146,7 @@ files: examples: output: conda matrix: - cuda: ["12.5"] + cuda: ["12.8"] arch: [x86_64, aarch64] includes: - cve-mitigation @@ -163,7 +163,7 @@ files: model-utils: output: conda matrix: - cuda: ["12.5"] + cuda: ["12.8"] arch: [x86_64, aarch64] includes: - model-training-tuning @@ -208,7 +208,7 @@ files: dfp_example: output: conda matrix: - cuda: ["12.5"] + cuda: ["12.8"] arch: [x86_64, aarch64] output: conda conda_dir: examples/digital_fingerprinting/production/conda/environments @@ -238,26 +238,26 @@ dependencies: - output_types: [conda] matrices: - matrix: - cuda: "12.5" + cuda: "12.8" packages: - - cuda-cudart=12.5 - - cuda-nvrtc=12.5 - - cuda-nvtx=12.5 - - cuda-version=12.5 + - cuda-cudart=12.8 + - cuda-nvrtc=12.8 + - cuda-nvtx=12.8 + - cuda-version=12.8 cudatoolkit-dev: specific: - output_types: [conda] matrices: - matrix: - cuda: "12.5" + cuda: "12.8" packages: - - cuda-cudart-dev=12.5 - - cuda-nvml-dev=12.5 - - cuda-nvrtc-dev=12.5 - - cuda-nvtx-dev=12.5 + - cuda-cudart-dev=12.8 + - cuda-nvml-dev=12.8 + - cuda-nvrtc-dev=12.8 + - cuda-nvtx-dev=12.8 - cuda-sanitizer-api - - cuda-version=12.5 + - cuda-version=12.8 - libcublas-dev # required by matx - libcufft-dev # required by matx - libcusolver-dev # required by matx @@ -272,7 +272,7 @@ dependencies: - output_types: [conda] packages: # Compilers - - cuda-nvcc=12.5 + - cuda-nvcc=12.8 - cxx-compiler - gxx=12.1 @@ -281,8 +281,8 @@ dependencies: - c-ares=1.32 # 1.33 causes an undefined symbol error - ccache - cmake=3.27 - - cuda-cudart-dev=12.5 - - cuda-version=12.5 + - cuda-cudart-dev=12.8 + - cuda-version=12.8 - indicators=2.3 # C++ library for displaying progress bars - libtool # Needed for DOCA build - ninja=1.11 @@ -296,17 +296,17 @@ dependencies: - output_types: [conda] packages: # Include: cudatoolkit-dev - - cudf=24.10 + - &cudf cudf=25.02 - cython=3.0 - glog>=0.7.1,<0.8 - gtest=1.14 - - libcudf=24.10 + - libcudf=25.02 - librdkafka>=1.9.2,<1.10.0a0 - libzlib >=1.3.1,<2 - - mrc=25.06 + - &mrc mrc=25.06 - nlohmann_json=3.11 - pybind11-stubgen=0.10.5 - - pylibcudf=24.10 + - pylibcudf=25.02 - rapidjson=1.1.0 - rdma-core>=48 # Needed for DOCA. - scikit-build=0.17.6 @@ -332,7 +332,7 @@ dependencies: - flake8 - isort - pylint=3.0.3 - - pynvml=11.4 + - pynvml=12 - versioneer - yapf=0.43 specific: @@ -382,8 +382,8 @@ dependencies: - appdirs - beautifulsoup4=4.12 - click>=8 - # - cuda-version=12.5 ## - - cudf=24.10 + # - cuda-version=12.8 ## + - *cudf - cupy # Version determined from cudf - datacompy=0.10 - dill=0.3.7 @@ -394,7 +394,7 @@ dependencies: - grpcio-status # - libwebp=1.3.2 # Required for CVE mitigation: https://nvd.nist.gov/vuln/detail/CVE-2023-4863 ## - mlflow>=2.10.0,<2.18 # Pin version to avoid breaking change in 2.18 to thread local variable code commit id: 5541888 - - mrc=25.06 + - *mrc - networkx=2.8.8 - numba=0.60 # Pin version to avoid https://github.com/nv-morpheus/Morpheus/issues/2166 - numpydoc=1.5 @@ -402,7 +402,7 @@ dependencies: - python-confluent-kafka>=1.9.2,<1.10.0a0 - python-graphviz - pluggy=1.3 - - rapids-dask-dependency=24.10 # provides dask and distributed + - rapids-dask-dependency=25.02 # provides dask and distributed - requests<2.29.0 - requests-cache=1.1 - scikit-learn=1.3.2 @@ -533,7 +533,7 @@ dependencies: common: - output_types: [conda] packages: - - &cuml cuml=24.10.* + - &cuml cuml=25.02.* - pip - pip: - --find-links https://data.dgl.ai/wheels/cu121/repo.html diff --git a/docker/Dockerfile b/docker/Dockerfile index b8b5fd20f8..d8106b387b 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -47,8 +47,8 @@ # Args used in FROM commands must come first ARG FROM_IMAGE="nvidia/cuda" ARG CUDA_MAJOR_VER=12 -ARG CUDA_MINOR_VER=5 -ARG CUDA_REV_VER=1 +ARG CUDA_MINOR_VER=8 +ARG CUDA_REV_VER=0 ARG LINUX_DISTRO=ubuntu ARG LINUX_VER=22.04 diff --git a/docker/build_container.sh b/docker/build_container.sh index f7323ab5c1..a99afb3814 100755 --- a/docker/build_container.sh +++ b/docker/build_container.sh @@ -43,8 +43,8 @@ DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""} # Build args CUDA_MAJOR_VER=${CUDA_MAJOR_VER:-12} -CUDA_MINOR_VER=${CUDA_MINOR_VER:-5} -CUDA_REV_VER=${CUDA_REV_VER:-1} +CUDA_MINOR_VER=${CUDA_MINOR_VER:-8} +CUDA_REV_VER=${CUDA_REV_VER:-0} FROM_IMAGE=${FROM_IMAGE:-"nvidia/cuda"} LINUX_DISTRO=${LINUX_DISTRO:-ubuntu} LINUX_VER=${LINUX_VER:-22.04} diff --git a/docs/source/basics/overview.rst b/docs/source/basics/overview.rst index ba0309e511..8829262e9f 100644 --- a/docs/source/basics/overview.rst +++ b/docs/source/basics/overview.rst @@ -111,7 +111,7 @@ ONNX To TensorRT ---------------- The ONNX to TensorRT (TRT) conversion utility requires additional packages, which can be installed using the following command: ```bash -conda env update --solver=libmamba -n morpheus --file conda/environments/model-utils_cuda-125_arch-$(arch).yaml +conda env update --solver=libmamba -n morpheus --file conda/environments/model-utils_cuda-128_arch-$(arch).yaml ``` Example usage of the ONNX to TRT conversion utility can be found in `models/README.md `_. diff --git a/docs/source/developer_guide/contributing.md b/docs/source/developer_guide/contributing.md index ec95360bb7..5cc2f369ec 100644 --- a/docs/source/developer_guide/contributing.md +++ b/docs/source/developer_guide/contributing.md @@ -159,11 +159,11 @@ Morpheus provides multiple Conda environment files to support different workflow The following are the available Conda environment files, all are located in the `conda/environments` directory, with the following naming convention: `__arch-.yaml`. | Environment | File | Description | | --- | --- | --- | -| `all` | `all_cuda-125_arch-.yaml` | All dependencies required to build, run and test Morpheus, along with all of the examples. This is a superset of the `dev`, `runtime` and `examples` environments. | -| `dev` | `dev_cuda-125_arch-.yaml` | Dependencies required to build, run and test Morpheus. This is a superset of the `runtime` environment. | -| `examples` | `examples_cuda-125_arch-.yaml` | Dependencies required to run all examples. This is a superset of the `runtime` environment. | -| `model-utils` | `model-utils_cuda-125_arch-.yaml` | Dependencies required to train models independent of Morpheus. | -| `runtime` | `runtime_cuda-125_arch-.yaml` | Minimal set of dependencies strictly required to run Morpheus. | +| `all` | `all_cuda-128_arch-.yaml` | All dependencies required to build, run and test Morpheus, along with all of the examples. This is a superset of the `dev`, `runtime` and `examples` environments. | +| `dev` | `dev_cuda-128_arch-.yaml` | Dependencies required to build, run and test Morpheus. This is a superset of the `runtime` environment. | +| `examples` | `examples_cuda-128_arch-.yaml` | Dependencies required to run all examples. This is a superset of the `runtime` environment. | +| `model-utils` | `model-utils_cuda-128_arch-.yaml` | Dependencies required to train models independent of Morpheus. | +| `runtime` | `runtime_cuda-128_arch-.yaml` | Minimal set of dependencies strictly required to run Morpheus. | ##### Updating Morpheus Dependencies @@ -184,7 +184,7 @@ When ready, commit both the changes to the `dependencies.yaml` file and the upda #### Prerequisites - Volta architecture GPU or better -- [CUDA 12.5](https://developer.nvidia.com/cuda-12-5-0-download-archive) +- [CUDA 12.8](https://developer.nvidia.com/cuda-12-5-0-download-archive) - `conda` - If `conda` is not installed, we recommend using the [MiniForge install guide](https://github.com/conda-forge/miniforge). This will install `conda` and set the channel default to use `conda-forge`. @@ -200,11 +200,11 @@ When ready, commit both the changes to the `dependencies.yaml` file and the upda ``` 1. Create the Morpheus Conda environment using either the `dev` or `all` environment file. Refer to the [Conda Environment YAML Files](#conda-environment-yaml-files) section for more information. ```bash - conda env create --solver=libmamba -n morpheus --file conda/environments/dev_cuda-125_arch-$(arch).yaml + conda env create --solver=libmamba -n morpheus --file conda/environments/dev_cuda-128_arch-$(arch).yaml ``` or ```bash - conda env create --solver=libmamba -n morpheus --file conda/environments/all_cuda-125_arch-$(arch).yaml + conda env create --solver=libmamba -n morpheus --file conda/environments/all_cuda-128_arch-$(arch).yaml ``` diff --git a/docs/source/developer_guide/guides/3_simple_cpp_stage.md b/docs/source/developer_guide/guides/3_simple_cpp_stage.md index e25e8986e5..77acf15923 100644 --- a/docs/source/developer_guide/guides/3_simple_cpp_stage.md +++ b/docs/source/developer_guide/guides/3_simple_cpp_stage.md @@ -28,7 +28,7 @@ CMAKE_CONFIGURE_EXTRA_ARGS="-DMORPHEUS_BUILD_EXAMPLES=ON" ./scripts/compile.sh ### Compiling the Example as a standalone Project The second method is to build the example as a standalone project. For those using the release container, additional dependencies will need to be installed prior to performing the build: ```bash -conda env update --solver=libmamba -n morpheus --file /workspace/conda/environments/dev_cuda-125_arch-$(arch).yaml +conda env update --solver=libmamba -n morpheus --file /workspace/conda/environments/dev_cuda-128_arch-$(arch).yaml # reload the environment conda deactivate diff --git a/docs/source/developer_guide/guides/4_source_cpp_stage.md b/docs/source/developer_guide/guides/4_source_cpp_stage.md index 0fe2805305..000b72fa9d 100644 --- a/docs/source/developer_guide/guides/4_source_cpp_stage.md +++ b/docs/source/developer_guide/guides/4_source_cpp_stage.md @@ -28,7 +28,7 @@ CMAKE_CONFIGURE_EXTRA_ARGS="-DMORPHEUS_BUILD_EXAMPLES=ON" ./scripts/compile.sh ### Compiling the Example as a standalone Project The second method is to build the example as a standalone project. For those using the release container, additional dependencies will need to be installed prior to performing the build: ```bash -conda env update --solver=libmamba -n morpheus --file /workspace/conda/environments/dev_cuda-125_arch-$(arch).yaml +conda env update --solver=libmamba -n morpheus --file /workspace/conda/environments/dev_cuda-128_arch-$(arch).yaml # reload the environment conda deactivate diff --git a/docs/source/getting_started.md b/docs/source/getting_started.md index d6ef8f1e4e..38adf9876b 100644 --- a/docs/source/getting_started.md +++ b/docs/source/getting_started.md @@ -29,7 +29,7 @@ More advanced users, or those who are interested in using the latest pre-release ## Requirements - Volta architecture GPU or better -- [CUDA 12.5](https://developer.nvidia.com/cuda-12-5-0-download-archive) +- [CUDA 12.8](https://developer.nvidia.com/cuda-12-8-0-download-archive) - [Docker](https://docs.docker.com/get-docker/) - [The NVIDIA Container Toolkit](https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/latest/install-guide.html#installation) - [NVIDIA Triton Inference Server](https://catalog.ngc.nvidia.com/orgs/nvidia/containers/tritonserver) `24.09` or higher diff --git a/examples/abp_nvsmi_detection/README.md b/examples/abp_nvsmi_detection/README.md index d045419860..50d69fe8b3 100644 --- a/examples/abp_nvsmi_detection/README.md +++ b/examples/abp_nvsmi_detection/README.md @@ -63,7 +63,7 @@ This example can be easily applied to datasets generated from your own NVIDIA GP pyNVML is not installed by default, use the following command to install it: ```bash -conda env update --solver=libmamba -n morpheus --file conda/environments/examples_cuda-125_arch-$(arch).yaml +conda env update --solver=libmamba -n morpheus --file conda/environments/examples_cuda-128_arch-$(arch).yaml ``` Run the following to start generating your dataset: diff --git a/examples/developer_guide/3_simple_cpp_stage/README.md b/examples/developer_guide/3_simple_cpp_stage/README.md index e465c2e98a..c7debead8c 100644 --- a/examples/developer_guide/3_simple_cpp_stage/README.md +++ b/examples/developer_guide/3_simple_cpp_stage/README.md @@ -21,5 +21,5 @@ limitations under the License. |-------------|-----------|-------| | Conda | ✔ | | | Morpheus Docker Container | ✔ | | -| Morpheus Release Container | ✔ | Requires adding development packages to the container's Conda environment via `conda env update --solver=libmamba -n morpheus --file /workspace/conda/environments/dev_cuda-125_arch-$(arch).yaml` | +| Morpheus Release Container | ✔ | Requires adding development packages to the container's Conda environment via `conda env update --solver=libmamba -n morpheus --file /workspace/conda/environments/dev_cuda-128_arch-$(arch).yaml` | | Dev Container | ✔ | | diff --git a/examples/developer_guide/4_rabbitmq_cpp_stage/README.md b/examples/developer_guide/4_rabbitmq_cpp_stage/README.md index cd3a54ac1d..e730b695df 100644 --- a/examples/developer_guide/4_rabbitmq_cpp_stage/README.md +++ b/examples/developer_guide/4_rabbitmq_cpp_stage/README.md @@ -23,7 +23,7 @@ This example builds upon the `examples/developer_guide/2_2_rabbitmq` example add |-------------|-----------|-------| | Conda | ✔ | | | Morpheus Docker Container | ✔ | Requires launching the RabbitMQ container on the host | -| Morpheus Release Container | ✔ | Requires launching the RabbitMQ container on the host, and adding development packages to the container's Conda environment via `conda env update --solver=libmamba -n morpheus --file /workspace/conda/environments/dev_cuda-125_arch-$(arch).yaml` | +| Morpheus Release Container | ✔ | Requires launching the RabbitMQ container on the host, and adding development packages to the container's Conda environment via `conda env update --solver=libmamba -n morpheus --file /workspace/conda/environments/dev_cuda-128_arch-$(arch).yaml` | | Dev Container | ✘ | | ## Installing Pika diff --git a/examples/digital_fingerprinting/production/Dockerfile b/examples/digital_fingerprinting/production/Dockerfile index 216e88da31..f970ee8012 100644 --- a/examples/digital_fingerprinting/production/Dockerfile +++ b/examples/digital_fingerprinting/production/Dockerfile @@ -14,7 +14,7 @@ # limitations under the License. ARG BASE_IMG=nvcr.io/nvidia/cuda -ARG BASE_IMG_TAG=12.5.1-base-ubuntu22.04 +ARG BASE_IMG_TAG=12.8.0-base-ubuntu22.04 FROM --platform=$TARGETPLATFORM ${BASE_IMG}:${BASE_IMG_TAG} AS base diff --git a/examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-125_arch-aarch64.yaml b/examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-128_arch-aarch64.yaml similarity index 92% rename from examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-125_arch-aarch64.yaml rename to examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-128_arch-aarch64.yaml index 4c018d0dab..873f5e7382 100644 --- a/examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-125_arch-aarch64.yaml +++ b/examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-128_arch-aarch64.yaml @@ -21,4 +21,4 @@ dependencies: - --extra-index-url https://download.pytorch.org/whl/cu124 - python-logging-loki - torch==2.4.0 -name: dfp_example_cuda-125_arch-aarch64 +name: dfp_example_cuda-128_arch-aarch64 diff --git a/examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-125_arch-x86_64.yaml b/examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-128_arch-x86_64.yaml similarity index 92% rename from examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-125_arch-x86_64.yaml rename to examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-128_arch-x86_64.yaml index 9440795663..2645dc579d 100644 --- a/examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-125_arch-x86_64.yaml +++ b/examples/digital_fingerprinting/production/conda/environments/dfp_example_cuda-128_arch-x86_64.yaml @@ -21,4 +21,4 @@ dependencies: - --extra-index-url https://download.pytorch.org/whl/cu124 - python-logging-loki - torch==2.4.0+cu124 -name: dfp_example_cuda-125_arch-x86_64 +name: dfp_example_cuda-128_arch-x86_64 diff --git a/examples/digital_fingerprinting/production/morpheus/benchmarks/README.md b/examples/digital_fingerprinting/production/morpheus/benchmarks/README.md index d6e7b30330..ad0a96418d 100644 --- a/examples/digital_fingerprinting/production/morpheus/benchmarks/README.md +++ b/examples/digital_fingerprinting/production/morpheus/benchmarks/README.md @@ -42,7 +42,7 @@ Install additional required dependencies: ```bash conda env update --solver=libmamba \ -n ${CONDA_DEFAULT_ENV} \ - --file ./conda/environments/examples_cuda-125_arch-$(arch).yaml + --file ./conda/environments/examples_cuda-128_arch-$(arch).yaml ``` diff --git a/examples/doca/vdb_realtime/README.md b/examples/doca/vdb_realtime/README.md index dc8b8b0542..60388e1f80 100644 --- a/examples/doca/vdb_realtime/README.md +++ b/examples/doca/vdb_realtime/README.md @@ -98,7 +98,7 @@ export NGC_API_KEY="" Then install basic requirements: ```bash -conda env update --solver=libmamba -n morpheus --file conda/environments/examples_cuda-125_arch-$(arch).yaml --prune +conda env update --solver=libmamba -n morpheus --file conda/environments/examples_cuda-128_arch-$(arch).yaml --prune ``` Run the RAG example to query the Milvus database: diff --git a/examples/gnn_fraud_detection_pipeline/README.md b/examples/gnn_fraud_detection_pipeline/README.md index e0a454595c..754804ace0 100644 --- a/examples/gnn_fraud_detection_pipeline/README.md +++ b/examples/gnn_fraud_detection_pipeline/README.md @@ -17,7 +17,7 @@ limitations under the License. # GNN Fraud Detection Pipeline ## Supported Environments -All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-125_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. Refer to the [Requirements](#requirements) section for more information. +All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-128_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. Refer to the [Requirements](#requirements) section for more information. | Environment | Supported | Notes | |-------------|-----------|-------| | Conda | ✔ | | @@ -38,7 +38,7 @@ Prior to running the GNN fraud detection pipeline, additional requirements must ```bash conda env update --solver=libmamba \ -n ${CONDA_DEFAULT_ENV} \ - --file ./conda/environments/examples_cuda-125_arch-$(arch).yaml + --file ./conda/environments/examples_cuda-128_arch-$(arch).yaml ``` ## Running diff --git a/examples/llm/agents/README.md b/examples/llm/agents/README.md index 60f228cc38..73c12d4f8d 100644 --- a/examples/llm/agents/README.md +++ b/examples/llm/agents/README.md @@ -35,7 +35,7 @@ limitations under the License. - [Run example (Kafka Pipeline)](#run-example-kafka-pipeline) ## Supported Environments -All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-125_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. Refer to the [Install Dependencies](#install-dependencies) section for more information. +All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-128_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. Refer to the [Install Dependencies](#install-dependencies) section for more information. | Environment | Supported | Notes | |-------------|-----------|-------| | Conda | ✔ | | @@ -106,7 +106,7 @@ Install the required dependencies. ```bash conda env update --solver=libmamba \ -n ${CONDA_DEFAULT_ENV} \ - --file ./conda/environments/examples_cuda-125_arch-$(arch).yaml + --file ./conda/environments/examples_cuda-128_arch-$(arch).yaml ``` diff --git a/examples/llm/completion/README.md b/examples/llm/completion/README.md index 72ecac5c4a..402977b79c 100644 --- a/examples/llm/completion/README.md +++ b/examples/llm/completion/README.md @@ -31,7 +31,7 @@ limitations under the License. - [Running the Morpheus Pipeline](#running-the-morpheus-pipeline) ## Supported Environments -All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-125_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. Refer to the [Install Dependencies](#install-dependencies) section for more information. +All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-128_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. Refer to the [Install Dependencies](#install-dependencies) section for more information. | Environment | Supported | Notes | |-------------|-----------|-------| | Conda | ✔ | | @@ -80,7 +80,7 @@ Install the required dependencies. ```bash conda env update --solver=libmamba \ -n ${CONDA_DEFAULT_ENV} \ - --file ./conda/environments/examples_cuda-125_arch-$(arch).yaml + --file ./conda/environments/examples_cuda-128_arch-$(arch).yaml ``` diff --git a/examples/llm/rag/README.md b/examples/llm/rag/README.md index a712c9618e..44a3efe53d 100644 --- a/examples/llm/rag/README.md +++ b/examples/llm/rag/README.md @@ -18,7 +18,7 @@ limitations under the License. # Retrieval Augmented Generation (RAG) Pipeline ## Supported Environments -All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-125_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. This example also requires the [VDB upload](../vdb_upload/README.md) pipeline to have been run previously. +All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-128_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. This example also requires the [VDB upload](../vdb_upload/README.md) pipeline to have been run previously. | Environment | Supported | Notes | |-------------|-----------|-------| | Conda | ✔ | | diff --git a/examples/llm/vdb_upload/README.md b/examples/llm/vdb_upload/README.md index e92d844401..caaa89c165 100644 --- a/examples/llm/vdb_upload/README.md +++ b/examples/llm/vdb_upload/README.md @@ -34,7 +34,7 @@ limitations under the License. - [Exporting and Deploying a Different Model from Hugging Face](#exporting-and-deploying-a-different-model-from-hugging-face) ## Supported Environments -All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-125_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. +All environments require additional Conda packages which can be installed with either the `conda/environments/all_cuda-128_arch-$(arch).yaml` or `conda/environments/examples_cuda-125_arch-$(arch).yaml` environment files. | Environment | Supported | Notes | |-------------|-----------|-------| | Conda | ✔ | | diff --git a/external/utilities b/external/utilities index 6c1a797499..96fbde7067 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit 6c1a797499fe2348800d88e2208a61d79b9e0cd2 +Subproject commit 96fbde70679f5631f7bd2c0e9b730499f62188ca diff --git a/models/README.md b/models/README.md index 5bc9eae482..70dc49f3b2 100644 --- a/models/README.md +++ b/models/README.md @@ -62,7 +62,7 @@ In the root directory, the file `model-information.csv` contains the following i ## Generating TensorRT Models from ONNX The Morpheus ONNX to TensorRT (TRT) conversion utility requires additional packages, which can be installed using the following command: ```bash -conda env update --solver=libmamba -n morpheus --file conda/environments/model-utils_cuda-125_arch-$(arch).yaml +conda env update --solver=libmamba -n morpheus --file conda/environments/model-utils_cuda-128_arch-$(arch).yaml ``` For users wishing to use TRT models generated using this tool with Triton will then need to refer to the [Triton Model Repository](./triton-model-repo/README.md) documentation on how to deploy the models to Triton, and how to build the Morpheus Triton Server Models Container. diff --git a/models/training-tuning-scripts/fraud-detection-models/README.md b/models/training-tuning-scripts/fraud-detection-models/README.md index 5ecd179c7e..41e296a079 100644 --- a/models/training-tuning-scripts/fraud-detection-models/README.md +++ b/models/training-tuning-scripts/fraud-detection-models/README.md @@ -26,7 +26,7 @@ Install packages for training GNN model. ```bash mamba env update \ -n ${CONDA_DEFAULT_ENV} \ - --file ./conda/environments/model-utils-125_arch-$(arch).yaml + --file ./conda/environments/model-utils-128_arch-$(arch).yaml ``` ### Options for training and tuning models. diff --git a/models/triton-model-repo/README.md b/models/triton-model-repo/README.md index f181c93a15..2a06d226e6 100644 --- a/models/triton-model-repo/README.md +++ b/models/triton-model-repo/README.md @@ -73,7 +73,7 @@ docker run --rm --gpus=all -p 8000:8000 -p 8001:8001 -p 8002:8002 -v $PWD:/model To load a TensorRT model, it first must be compiled with the `morpheus tools onnx-to-trt` utility. This utility requires additional packages to be installed. From the root of the Morpheus repo, install them with: ```bash -conda env update --solver=libmamba -n morpheus --file conda/environments/model-utils_cuda-125_arch-$(arch).yaml +conda env update --solver=libmamba -n morpheus --file conda/environments/model-utils_cuda-128_arch-$(arch).yaml ``` Then build the TensorRT model with (refer `triton-model-repo/sid-minibert-trt/1/README.md` for more info): diff --git a/python/morpheus/morpheus/_lib/common/__init__.pyi b/python/morpheus/morpheus/_lib/common/__init__.pyi index d64f663d26..3bafe800a5 100644 --- a/python/morpheus/morpheus/_lib/common/__init__.pyi +++ b/python/morpheus/morpheus/_lib/common/__init__.pyi @@ -313,4 +313,4 @@ def typeid_to_numpy_str(arg0: TypeId) -> str: pass def write_df_to_file(df: object, filename: str, file_type: FileTypes = FileTypes.Auto, **kwargs) -> None: pass -__version__ = '25.2.0' +__version__ = '25.6.0' diff --git a/python/morpheus/morpheus/_lib/cudf_helpers.pyx b/python/morpheus/morpheus/_lib/cudf_helpers.pyx index 1cdab693a3..13c7ce196f 100644 --- a/python/morpheus/morpheus/_lib/cudf_helpers.pyx +++ b/python/morpheus/morpheus/_lib/cudf_helpers.pyx @@ -53,12 +53,7 @@ from cudf.core.buffer import ( # cuda_array_interface_wrapper, ) cimport pylibcudf.libcudf.types as libcudf_types -from cudf._lib.types cimport ( - dtype_from_column_view, - # dtype_to_data_type, - # dtype_to_pylibcudf_type, -) -from cudf._lib.null_mask import bitmask_allocation_size_bytes +from cudf._lib.column cimport dtype_from_column_view from cudf._lib.column cimport Column # isort: on @@ -209,13 +204,13 @@ cdef Column from_column_view_with_fix(column_view cv, object owner): mask = as_buffer( rmm.DeviceBuffer( ptr=mask_ptr, - size=bitmask_allocation_size_bytes(base_size) + size=plc.null_mask.bitmask_allocation_size_bytes(base_size) ) ) else: mask = as_buffer( data=mask_ptr, - size=bitmask_allocation_size_bytes(base_size), + size=plc.null_mask.bitmask_allocation_size_bytes(base_size), owner=mask_owner, exposed=True ) diff --git a/python/morpheus/morpheus/_lib/cudf_helpers/__init__.pyi b/python/morpheus/morpheus/_lib/cudf_helpers/__init__.pyi index 166b0e42d8..4f7dc3beab 100644 --- a/python/morpheus/morpheus/_lib/cudf_helpers/__init__.pyi +++ b/python/morpheus/morpheus/_lib/cudf_helpers/__init__.pyi @@ -5,7 +5,6 @@ from cudf.core.column.column import ColumnBase from cudf.core.buffer.exposure_tracked_buffer import ExposureTrackedBuffer from cudf.core.buffer.spillable_buffer import SpillableBuffer from cudf.core.dtypes import StructDtype -import _cython_3_0_11 import cudf import itertools import pylibcudf @@ -17,7 +16,6 @@ __all__ = [ "SpillableBuffer", "StructDtype", "as_buffer", - "bitmask_allocation_size_bytes", "cudf", "itertools", "plc", @@ -27,4 +25,3 @@ __all__ = [ __pyx_capi__: dict # value = {'make_table_from_table_with_metadata': , 'make_table_from_table_info_data': , 'make_table_info_data_from_table': , 'data_from_table_view_indexed': } __test__ = {} -bitmask_allocation_size_bytes: _cython_3_0_11.cython_function_or_method # value = diff --git a/python/morpheus/morpheus/_lib/messages/__init__.pyi b/python/morpheus/morpheus/_lib/messages/__init__.pyi index 50bbea7829..a45a0c7249 100644 --- a/python/morpheus/morpheus/_lib/messages/__init__.pyi +++ b/python/morpheus/morpheus/_lib/messages/__init__.pyi @@ -266,4 +266,4 @@ class InferenceMemoryFIL(InferenceMemory, TensorMemory): def seq_ids(self, arg1: object) -> None: pass pass -__version__ = '25.2.0' +__version__ = '25.6.0' diff --git a/python/morpheus/morpheus/_lib/modules/__init__.pyi b/python/morpheus/morpheus/_lib/modules/__init__.pyi index ed47a38d39..a6993f4ade 100644 --- a/python/morpheus/morpheus/_lib/modules/__init__.pyi +++ b/python/morpheus/morpheus/_lib/modules/__init__.pyi @@ -14,4 +14,4 @@ __all__ = [ ] -__version__ = '25.2.0' +__version__ = '25.6.0' diff --git a/python/morpheus/morpheus/_lib/src/stages/preprocess_nlp.cpp b/python/morpheus/morpheus/_lib/src/stages/preprocess_nlp.cpp index 7806b0af73..1f5ea54675 100644 --- a/python/morpheus/morpheus/_lib/src/stages/preprocess_nlp.cpp +++ b/python/morpheus/morpheus/_lib/src/stages/preprocess_nlp.cpp @@ -160,7 +160,8 @@ nvtext::tokenizer_result PreprocessNLPStage::subword_tokenize(const std::string& stride, do_lower_case, truncation, - rmm::mr::get_current_device_resource()); + rmm::cuda_stream_default, + mr); } else { diff --git a/python/morpheus/morpheus/_lib/stages/__init__.pyi b/python/morpheus/morpheus/_lib/stages/__init__.pyi index d99f70983c..7cb12914d5 100644 --- a/python/morpheus/morpheus/_lib/stages/__init__.pyi +++ b/python/morpheus/morpheus/_lib/stages/__init__.pyi @@ -94,4 +94,4 @@ class SerializeStage(mrc.core.segment.SegmentObject): class WriteToFileStage(mrc.core.segment.SegmentObject): def __init__(self, builder: mrc.core.segment.Builder, name: str, filename: str, mode: str = 'w', file_type: morpheus._lib.common.FileTypes = FileTypes.Auto, include_index_col: bool = True, flush: bool = False) -> None: ... pass -__version__ = '25.2.0' +__version__ = '25.6.0' diff --git a/python/morpheus_llm/morpheus_llm/_lib/llm/__init__.pyi b/python/morpheus_llm/morpheus_llm/_lib/llm/__init__.pyi index 2f6f52addd..254ad4babb 100644 --- a/python/morpheus_llm/morpheus_llm/_lib/llm/__init__.pyi +++ b/python/morpheus_llm/morpheus_llm/_lib/llm/__init__.pyi @@ -231,4 +231,4 @@ class LLMTaskHandler(): Task[Optional[list[ControlMessage]]] """ pass -__version__ = '25.2.0' +__version__ = '25.6.0' diff --git a/tests/benchmarks/README.md b/tests/benchmarks/README.md index 1bf03acb88..f2dce1dae8 100644 --- a/tests/benchmarks/README.md +++ b/tests/benchmarks/README.md @@ -197,5 +197,5 @@ You can use the same Dev container created here to run the Production DFP benchm ```bash conda env update --solver=libmamba \ -n ${CONDA_DEFAULT_ENV} \ - --file ./conda/environments/examples_cuda-125_arch-$(arch).yaml + --file ./conda/environments/examples_cuda-128_arch-$(arch).yaml ```