Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[RELEASE] Morpheus v24.06.00 #1796

Merged
merged 91 commits into from
Jul 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
931a1b9
Forward-merge branch-24.03 into branch-24.06 [skip ci] (#1583)
mdemoret-nv Mar 27, 2024
82a80aa
Forward-merge branch-24.03 into branch-24.06 [skip ci] (#1585)
mdemoret-nv Apr 2, 2024
3c23991
Forward-merge branch-24.03 into branch-24.06 (#1591)
mdemoret-nv Apr 5, 2024
39f7f73
Support non-json serializable objects in LLMContext (#1589)
dagardner-nv Apr 5, 2024
f4169a9
Creating branch for v24.06
dagardner-nv Apr 5, 2024
752e85f
Updating versions for v24.06.00
dagardner-nv Apr 5, 2024
056d70b
Merge branch-24.03 into branch-24.06
dagardner-nv Apr 9, 2024
cb9f5e6
IWYU fixes
dagardner-nv Apr 9, 2024
c9346db
Forward-merge branch-24.03 into branch-24.06 (#1605)
dagardner-nv Apr 9, 2024
951e3b8
Forward-merge branch-24.03 into branch-24.06 (#1593)
dagardner-nv Apr 9, 2024
90a6f59
Merge branch-24.03 into branch-24.06
dagardner-nv Apr 11, 2024
c81294c
Forward-merge branch-24.03 into branch-24.06 (#1620)
dagardner-nv Apr 11, 2024
dde1d13
Use conda env create --yes instead of --force (#1636)
efajardo-nv Apr 17, 2024
6b9cb71
Misc CI improvements (#1618)
dagardner-nv Apr 18, 2024
82ce14c
Fix a typo in the devcontainer base image (#1638)
cwharris Apr 19, 2024
6ff9847
Forward-merge branch-24.03 into branch-24.06 (#1647)
dagardner-nv Apr 19, 2024
177b91f
Forward-merge branch-24.03 into branch-24.06 (#1653)
dagardner-nv Apr 22, 2024
cbfea7d
Fix `cupy_to_tensor` to also infer `uint8` and `int8` dtypes (#1621)
efajardo-nv Apr 23, 2024
ec18300
Fix tests to detect issue #1626 (#1629)
dagardner-nv Apr 24, 2024
31b6101
`ControlMessage` support in `TritonInferenceStage` and `PreallocatorM…
cwharris Apr 24, 2024
bedc169
Forward-merge branch-24.03 into branch-24.06 (#1657)
dagardner-nv Apr 24, 2024
57d11a2
Truncate strings exceeding max_length when inserting to Milvus (#1665)
dagardner-nv May 1, 2024
9d3de8a
Strip HTML & XML tags from RSS feed input (#1670)
dagardner-nv May 1, 2024
808c52c
Update examples to execute from the root of the repo (#1674)
dagardner-nv May 2, 2024
fefa1cc
Update dfp-model-card.md
HesAnEasyCoder May 3, 2024
33599b8
Update root-cause-analysis-model-card.md
HesAnEasyCoder May 3, 2024
eb8036f
Update abp-model-card.md
HesAnEasyCoder May 6, 2024
c010017
Update dfp-model-card.md
HesAnEasyCoder May 6, 2024
9108041
Update gnn-fsi-model-card.md
HesAnEasyCoder May 6, 2024
4e962d0
Update phishing-model-card.md
HesAnEasyCoder May 6, 2024
4f2b6c8
Update root-cause-analysis-model-card.md
HesAnEasyCoder May 6, 2024
c88527b
Update dfp-model-card.md (#1644)
HesAnEasyCoder May 7, 2024
4c3fc5d
Update phishing-model-card.md (#1680)
HesAnEasyCoder May 8, 2024
a5a6841
Update gnn-fsi-model-card.md (#1681)
HesAnEasyCoder May 8, 2024
26eb9f8
Update abp-model-card.md (#1683)
HesAnEasyCoder May 8, 2024
78dab99
Enable C++ mode for `abp_pcap_detection` example (#1687)
dagardner-nv May 8, 2024
bf80d93
Support the filter_null parameter in the C++ impl of the FileSourceSt…
dagardner-nv May 9, 2024
9719d9f
Ensuring consistent use of the export macro `MORPHEUS_EXPORT` (#1672)
aserGarcia May 9, 2024
266612e
Remove `pyarrow_hotfix` import from `__init__.py` (#1692)
efajardo-nv May 9, 2024
26c95e1
Update `ControlMessage` to hold arbitrary Python objects & update `Me…
yczhang-nv May 9, 2024
1e8518b
DOCA stage split: source + convert (#1617)
e-ago May 15, 2024
b61502a
Remove unused MLflow client arg from DFP inference implementations (#…
efajardo-nv May 15, 2024
0ff42af
Merge remote-tracking branch 'upstream/branch-24.06' into patch-10
AnuradhaKaruppiah May 15, 2024
26a82e3
Merge remote-tracking branch 'upstream/branch-24.06' into patch-12
mdemoret-nv May 15, 2024
58a572a
Update dfp-model-card.md (#1682)
AnuradhaKaruppiah May 16, 2024
ee9d932
Update root-cause-analysis-model-card.md (#1684)
AnuradhaKaruppiah May 16, 2024
08e40dc
Support `ControlMessage` for `Preprocess` and `PostProcess` stages (#…
yczhang-nv May 20, 2024
2fe4dd3
Fix non-deterministic output of gnn sampler (#1677)
tzemicheal May 21, 2024
6c722c7
Use EnvConfigValue for passing env-configured arguments to services (…
cwharris May 21, 2024
6eeff86
Update devcontainer to use latest build utils (#1658)
cwharris May 24, 2024
3360602
Add function return documentation for `LLMService` (#1721)
acaklovic-nv May 28, 2024
e136ab2
Fix description for `cache_mode` option of DFP Rolling Window module …
efajardo-nv May 29, 2024
ca14433
Update CI to install DOCA and build Morpheus DOCA components. (#1622)
cwharris May 29, 2024
12abdce
Support passing a custom parser to `HttpServerSourceStage` and `HttpC…
dagardner-nv May 30, 2024
580be43
Generate deprecation warning for `MultiMessage` (#1719)
yczhang-nv May 31, 2024
bb51e61
Allow passing `metadata` to `LangChainAgentNode._run_single` (#1710)
dagardner-nv Jun 1, 2024
d9e6474
Enable Python install by default in `compile.sh` (#1724)
dagardner-nv Jun 1, 2024
21c1694
Improve the logging tests and add support for resetting the logger (#…
mdemoret-nv Jun 4, 2024
61ed7c3
Add group by column stage (#1699)
dagardner-nv Jun 4, 2024
fc3e45c
Updating all uses of the `secrets.PROJECT_MANAGEMENT_PAT` to use a re…
mdemoret-nv Jun 6, 2024
0b284b5
Always run the PR builder step even if others are cancelled (#1736)
mdemoret-nv Jun 14, 2024
46f842d
Add struct column support to `cudf_helpers` (#1538)
efajardo-nv Jun 18, 2024
700b035
Fixes for C++ impl for `DeserializeStage` and add missing `get_info` …
dagardner-nv Jun 18, 2024
6d2d53d
Misc improvements for sid_visualization example (#1751)
dagardner-nv Jun 24, 2024
039bcf2
Disable shared memory by default, and fix `--stop_after` flag for `vd…
dagardner-nv Jun 24, 2024
b214137
Provide a default set of questions for the standalone RAG pipeline (#…
dagardner-nv Jun 24, 2024
5bc4836
Remove setting of `prog_name`, this implies that an executable named …
dagardner-nv Jun 24, 2024
7133977
DOCA: fix optional deps + remove PreallocatorMixin from source stage …
e-ago Jun 24, 2024
00aa144
Fix `RabbitMQ` output path (#1756)
yczhang-nv Jun 24, 2024
b4829f6
Fix conda errors in release container (#1750)
dagardner-nv Jun 25, 2024
7ec58a7
resolve rapids-dependency-file-generator warning (#1735)
jameslamb Jun 25, 2024
20cb0f3
Clarify Documentation: Run fetch_data.py Outside Docker Container (#1…
ifengw-nv Jun 25, 2024
6ea6c49
Add GIT_CLONE_PROTECTION_ACTIVE env config to fix build script (#1748)
jadu-nv Jun 25, 2024
8095a76
Fix triton multi threading when using the C++ stage (#1739)
mdemoret-nv Jun 26, 2024
7f24aef
Merge Agent Morpheus changes (#1760)
dagardner-nv Jun 26, 2024
a09261c
Auditing the dependencies and syncing `dependencies.yaml` with `meta.…
mdemoret-nv Jun 26, 2024
18eca56
Introduce multi-endpoint servers and health check endpoints to HttpSe…
jadu-nv Jun 26, 2024
ba23b31
Remove pre-built container section from `getting_started.md` (#1764)
yczhang-nv Jun 26, 2024
09f7817
Add troubleshooting reference for unsuccessful documentation builds (…
ifengw-nv Jun 27, 2024
f018267
Release container fixes (#1766)
dagardner-nv Jun 28, 2024
59109fe
Remove out of date instructions from `contributing.md` (#1774)
dagardner-nv Jun 28, 2024
caf6c07
Add cuda and cudf to link targets for C++ examples (#1777)
dagardner-nv Jun 28, 2024
94b7105
Remove documentation for yaml config files in `vdb_upload` pipeline u…
dagardner-nv Jun 29, 2024
56cbeb8
Removes unused envioronment variables from Morpheus build docs (#1784)
yczhang-nv Jul 1, 2024
c19aa4c
Add ransomware model to devcontainer (#1785)
yczhang-nv Jul 1, 2024
3fe4cab
Document supported environments for each example (#1786)
dagardner-nv Jul 1, 2024
c576308
Add fetch data command in build_container_release.sh (#1787)
ifengw-nv Jul 1, 2024
3e067c2
Mark the LLM Agents Kafka pipeline as broken (#1792)
dagardner-nv Jul 2, 2024
84efdc6
Fix LLM Agents Kafka pipeline (#1793)
dagardner-nv Jul 3, 2024
d9ca30f
Cleanup docs so that each as a single H1 title (#1794)
dagardner-nv Jul 3, 2024
79bf91d
Updating CHANGELOG
dagardner-nv Jul 4, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
92 changes: 89 additions & 3 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: Copyright (c) 2022-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-FileCopyrightText: Copyright (c) 2020-2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
# SPDX-License-Identifier: Apache-2.0
#
# Licensed under the Apache License, Version 2.0 (the "License");
Expand All @@ -13,6 +13,92 @@
# See the License for the specific language governing permissions and
# limitations under the License.

FROM rapidsai/devcontainers:23.12-cpp-cuda12.1-mambaforge-ubuntu22.04 AS base
ARG BASE
ARG PYTHON_PACKAGE_MANAGER

ENV PATH="${PATH}:/workspaces/morpheus/.devcontainer/bin"
FROM node:22 as node

FROM ${BASE} as base

# ===== install common packages ==================================================================

RUN <<EOF

set -x

apt-get update;

rm -rf /tmp/*;
rm -rf /var/tmp/*;
rm -rf /var/cache/apt/*;
rm -rf /var/lib/apt/lists/*;

EOF

# ===== install node + camouflage ================================================================

COPY --from=node /usr/local/bin/node /usr/local/bin/node
COPY --from=node /usr/local/include/node /usr/local/include/node
COPY --from=node /usr/local/lib/node_modules /usr/local/lib/node_modules
COPY --from=node /opt/yarn-v*/bin/* /usr/local/bin/
COPY --from=node /opt/yarn-v*/lib/* /usr/local/lib/

RUN \
<<EOF

bash -c 'echo -e "
fund=false\n
audit=false\n
save-prefix=\n
--omit=optional\n
save-exact=true\n
package-lock=false\n
update-notifier=false\n
scripts-prepend-node-path=true\n
registry=https://registry.npmjs.org/\n
" | tee /root/.npmrc >/dev/null'

ln -s /usr/local/bin/node /usr/local/bin/nodejs
ln -s /usr/local/lib/node_modules/npm/bin/npm-cli.js /usr/local/bin/npm
ln -s /usr/local/lib/node_modules/npm/bin/npx-cli.js /usr/local/bin/npx

echo "node version: $(node --version)"
echo " npm version: $(npm --version)"
echo "yarn version: $(yarn --version)"

npm install -g [email protected]

EOF


FROM base as pip-base

ENV DEFAULT_VIRTUAL_ENV=morpheus

FROM base as conda-base

ENV DEFAULT_CONDA_ENV=morpheus

FROM ${PYTHON_PACKAGE_MANAGER}-base

ENV PROJECT_MANIFEST_YML="/home/coder/morpheus/manifest.yaml"
ENV PATH="${PATH}:/home/coder/morpheus/.devcontainer/bin"

ARG CUDA
ENV CUDAARCHS="RAPIDS"
ENV CUDA_VERSION="${CUDA_VERSION:-${CUDA}}"

ARG RAPIDS
ENV RAPIDS=${RAPIDS}

ARG PYTHON_PACKAGE_MANAGER
ENV PYTHON_PACKAGE_MANAGER="${PYTHON_PACKAGE_MANAGER}"

ENV SCCACHE_REGION="us-east-2"
ENV SCCACHE_BUCKET="rapids-sccache-devs"
ENV VAULT_HOST="https://vault.ops.k8s.rapids.ai"
ENV HISTFILE="/home/coder/.cache/._bash_history"

ENV MORPHEUS_SUPPORT_DOCA=ON
COPY ./docker/optional_deps docker/optional_deps
RUN ./docker/optional_deps/doca.sh /tmp/doca
112 changes: 112 additions & 0 deletions .devcontainer/cuda12.1-conda/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,112 @@
{
"build": {
"context": "${localWorkspaceFolder}/.devcontainer",
"dockerfile": "${localWorkspaceFolder}/.devcontainer/Dockerfile",
"args": {
"CUDA": "12.1",
"PYTHON_PACKAGE_MANAGER": "conda",
"BASE": "rapidsai/devcontainers:24.06-cpp-mambaforge-ubuntu22.04"
}
},
"privileged": true,
"hostRequirements": {
"gpu": "optional"
},
"capAdd": [
"SYS_NICE",
"SYS_PTRACE"
],
"securityOpt": [
"seccomp=unconfined"
],
"runArgs": [
"--network=morpheus"
],
"containerEnv": {
"HOST_MORPHEUS_ROOT": "${localWorkspaceFolder}",
"MORPHEUS_ROOT": "${containerWorkspaceFolder}/morpheus",
"DISPLAY": "${localEnv:DISPLAY:-}",
"XAUTHORITY": "${localEnv:XAUTHORITY:-}",
"XDG_SESSION_TYPE": "${localEnv:XDG_SESSION_TYPE:-}",
"XDG_RUNTIME_DIR": "${localEnv:XDG_RUNTIME_DIR:-}",
"DBUS_SESSION_BUS_ADDRESS": "${localEnv:DBUS_SESSION_BUS_ADDRESS:-}"
},
"features": {
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils:24.6": {},
"ghcr.io/devcontainers/features/docker-outside-of-docker:1": {},
"ghcr.io/devcontainers/features/dotnet:1": {
"version": "6.0",
"installUsingApt": false
}
},
"overrideFeatureInstallOrder": [
"ghcr.io/rapidsai/devcontainers/features/rapids-build-utils",
"ghcr.io/devcontainers/features/docker-outside-of-docker",
"ghcr.io/devcontainers/features/dotnet"
],
"initializeCommand": [
"/bin/bash",
"-c",
"${localWorkspaceFolder}/.devcontainer/initialize-command.sh && mkdir -m 0755 -p ${localWorkspaceFolder}/../.{aws,cache,config,conda/pkgs,conda/${localWorkspaceFolderBasename}-cuda12.1-envs}"
],
"postAttachCommand": [
"/bin/bash",
"-c",
"if [ ${CODESPACES:-false} = 'true' ]; then . devcontainer-utils-post-attach-command; . rapids-post-attach-command; fi"
],
"workspaceFolder": "/home/coder",
"workspaceMount": "source=${localWorkspaceFolder},target=/home/coder/morpheus,type=bind,consistency=consistent",
"mounts": [
"source=/tmp/.X11-unix,target=/tmp/.X11-unix,type=bind",
"source=${localEnv:XDG_RUNTIME_DIR},target=${localEnv:XDG_RUNTIME_DIR},type=bind",
"source=/run/dbus/system_bus_socket,target=/run/dbus/system_bus_socket,type=bind",
"source=/var/run/docker.sock,target=/var/run/docker.sock,type=bind",
"source=/dev/hugepages,target=/dev/hugepages,type=bind,consistency=consistent",
"source=${localWorkspaceFolder}/../.aws,target=/home/coder/.aws,type=bind,consistency=consistent",
"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.1-envs,target=/home/coder/.conda/envs,type=bind,consistency=consistent"
],
"customizations": {
"vscode": {
"extensions": [
"cschlosser.doxdocgen", // Adding docstrings to C++ code
"eamodio.gitlens", // Enhanced Git support
"eeyore.yapf", // Python code formatter
"josetr.cmake-language-support-vscode", // CMake language support
"llvm-vs-code-extensions.vscode-clangd",
"llvm-vs-code-extensions.vscode-clangd", // Clangd language server for C++
"matepek.vscode-catch2-test-adapter",
"mechatroner.rainbow-csv", // Colorizing CSV files
"mhutchie.git-graph", // Visualizing Git history and branching
"ms-azuretools.vscode-docker", // Docker support
"ms-python.debugpy", // Python debugger
"ms-python.flake8", // Python linter
"ms-python.isort", // Python import sorter
"ms-python.pylint", // Python linter
"ms-python.python", // Python language support
"ms-python.vscode-pylance", // Python language server
"ms-toolsai.jupyter", // Jupyter notebook support
"ms-vscode.cmake-tools", // CMake support for building Morpheus
"ms-vscode.cpptools", // C++ language support
"njpwerner.autodocstring", // Adding docstrings to python code
"nvidia.nsight-vscode-edition", // CUDA integration and debugging
"stkb.rewrap", // Wrapping all text in any language
"twxs.cmake",
"vadimcn.vscode-lldb", // LLDB debugger (better than GDB for C++ debugging)
"xaver.clang-format"
],
"settings": {
"cmake.cmakePath": "/tmp/.current-conda-env/bin/cmake",
"C_Cpp.intelliSenseEngine": "disabled",
"python.terminal.activateEnvironment": false,
"files.watcherExclude": {
"**/.git/objects/**": true,
"**/.git/subtree-cache/**": true,
"**/.cache/**": true
}
}
}
}
}
127 changes: 0 additions & 127 deletions .devcontainer/devcontainer.json

This file was deleted.

7 changes: 3 additions & 4 deletions .devcontainer/docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

version: "3"

services:

triton:
Expand All @@ -29,6 +27,7 @@ services:
volumes:
- ${HOST_MORPHEUS_ROOT}/models:/models
- ${HOST_MORPHEUS_ROOT}/examples/abp_pcap_detection/abp-pcap-xgb:/models/triton-model-repo/abp-pcap-xgb
- ${HOST_MORPHEUS_ROOT}/examples/ransomware_detection/models/ransomw-model-short-rf:/models/triton-model-repo/ransomw-model-short-rf

zookeeper:
image: bitnami/zookeeper:latest
Expand All @@ -54,5 +53,5 @@ services:

networks:
default:
external:
name: morpheus
name: morpheus
external: true
Loading
Loading