-
Notifications
You must be signed in to change notification settings - Fork 145
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Forward-merge branch-24.10 into branch-25.02 (#1980)
## Description * Manually resolving forward merger issues from PR #1966 ## 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.
- Loading branch information
Showing
66 changed files
with
621 additions
and
2,904 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,128 @@ | ||
| <!-- | ||
| SPDX-FileCopyrightText: Copyright (c) 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. | ||
| SPDX-License-Identifier: Apache-2.0 | ||
| Licensed under the Apache License, Version 2.0 (the "License"); | ||
| you may not use this file except in compliance with the License. | ||
| You may obtain a copy of the License at | ||
| http://www.apache.org/licenses/LICENSE-2.0 | ||
| Unless required by applicable law or agreed to in writing, software | ||
| distributed under the License is distributed on an "AS IS" BASIS, | ||
| WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| See the License for the specific language governing permissions and | ||
| limitations under the License. | ||
| --> | ||
|
|
||
| # Morpheus Conda Packages | ||
| The Morpheus stages are the building blocks for creating pipelines. The stages are organized into libraries by use case. The current libraries are: | ||
| - `morpheus-core` | ||
| - `morpheus-dfp` | ||
| - `morpheus-llm` | ||
|
|
||
| The libraries are hosted as Conda packages on the [`nvidia`](https://anaconda.org/nvidia/) channel. | ||
|
|
||
| The split into multiple libraries allows for a more modular approach to using the Morpheus stages. For example, if you are building an application for Digital Finger Printing, you can install just the `morpheus-dfp` library. This reduces the size of the installed package. It also limits the dependencies eliminating unnecessary version conflicts. | ||
|
|
||
|
|
||
| ## Morpheus Core | ||
| The `morpheus-core` library contains the core stages that are common across all use cases. The Morpheus core library is built from the source code in the `python/morpheus` directory of the Morpheus repository. The core library is installed as a dependency when you install any of the other Morpheus libraries. | ||
| To set up a Conda environment with the [`morpheus-core`](https://anaconda.org/nvidia/morpheus-core) library you can run the following commands: | ||
| ### Create a Conda environment | ||
| ```bash | ||
| export CONDA_ENV_NAME=morpheus | ||
| conda create -n ${CONDA_ENV_NAME} python=3.10 | ||
| conda activate ${CONDA_ENV_NAME} | ||
| ``` | ||
| ### Add Conda channels | ||
| These channel are required for installing the runtime dependencies | ||
| ```bash | ||
| conda config --env --add channels conda-forge &&\ | ||
| conda config --env --add channels nvidia &&\ | ||
| conda config --env --add channels rapidsai &&\ | ||
| conda config --env --add channels pytorch | ||
| ``` | ||
| ### Install the `morpheus-core` library | ||
| ```bash | ||
| conda install -c nvidia morpheus-core | ||
| ``` | ||
| The `morpheus-core` Conda package installs the `morpheus` python package. It also pulls down all the necessary Conda runtime dependencies for the core stages including [`mrc`](https://anaconda.org/nvidia/mrc) and [`libmrc`](https://anaconda.org/nvidia/libmrc). | ||
| ### Install additional PyPI dependencies | ||
| Some of the stages in the core library require additional dependencies that are hosted on PyPI. These dependencies are included as a requirements file in the `morpheus` python package. The requirements files can be located and installed by running the following command: | ||
| ```bash | ||
| MORPHEUS_CORE_PKG_DIR=$(dirname $(python -c "import morpheus; print(morpheus.__file__)")) | ||
| pip install -r ${MORPHEUS_CORE_PKG_DIR}/requirements_morpheus_core.txt | ||
| ``` | ||
|
|
||
| ## Morpheus DFP | ||
| Digital Finger Printing (DFP) is a technique used to identify anomalous behavior and uncover potential threats in the environment. The `morpheus-dfp` library contains stages for DFP. It is built from the source code in the `python/morpheus_dfp` directory of the Morpheus repository. To set up a Conda environment with the [`morpheus-dfp`](https://anaconda.org/nvidia/morpheus-dfp) library you can run the following commands: | ||
| ### Create a Conda environment | ||
| ```bash | ||
| export CONDA_ENV_NAME=morpheus-dfp | ||
| conda create -n ${CONDA_ENV_NAME} python=3.10 | ||
| conda activate ${CONDA_ENV_NAME} | ||
| ``` | ||
| ### Add Conda channels | ||
| These channel are required for installing the runtime dependencies | ||
| ```bash | ||
| conda config --env --add channels conda-forge &&\ | ||
| conda config --env --add channels nvidia &&\ | ||
| conda config --env --add channels rapidsai &&\ | ||
| conda config --env --add channels pytorch | ||
| ``` | ||
| ### Install the `morpheus-dfp` library | ||
| ```bash | ||
| conda install -c nvidia morpheus-dfp | ||
| ``` | ||
| The `morpheus-dfp` Conda package installs the `morpheus_dfp` python package. It also pulls down all the necessary Conda runtime dependencies including [`morpheus-core`](https://anaconda.org/nvidia/morpheus-core). | ||
| ### Install additional PyPI dependencies | ||
| Some of the DFP stages in the library require additional dependencies that are hosted on PyPI. These dependencies are included as a requirements file in the `morpheus_dfp` python package. And can be installed by running the following command: | ||
| ```bash | ||
| MORPHEUS_DFP_PKG_DIR=$(dirname $(python -c "import morpheus_dfp; print(morpheus_dfp.__file__)")) | ||
| pip install -r ${MORPHEUS_DFP_PKG_DIR}/requirements_morpheus_dfp.txt | ||
| ``` | ||
|
|
||
| ## Morpheus LLM | ||
| The `morpheus-llm` library contains stages for Large Language Models (LLM) and Vector Databases. These stages are used for setting up Retrieval Augmented Generation (RAG) pipelines. The `morpheus-llm` library is built from the source code in the `python/morpheus_llm` directory of the Morpheus repository. | ||
| To set up a Conda environment with the [`morpheus-llm`](https://anaconda.org/nvidia/morpheus-dfp) library you can run the following commands: | ||
| ### Create a Conda environment | ||
| ```bash | ||
| export CONDA_ENV_NAME=morpheus-llm | ||
| conda create -n ${CONDA_ENV_NAME} python=3.10 | ||
| conda activate ${CONDA_ENV_NAME} | ||
| ``` | ||
| ### Add Conda channels | ||
| These channel are required for installing the runtime dependencies | ||
| ```bash | ||
| conda config --env --add channels conda-forge &&\ | ||
| conda config --env --add channels nvidia &&\ | ||
| conda config --env --add channels rapidsai &&\ | ||
| conda config --env --add channels pytorch | ||
| ``` | ||
| ### Install the `morpheus-llm` library | ||
| ```bash | ||
| conda install -c nvidia morpheus-llm | ||
| ``` | ||
| The `morpheus-llm` Conda package installs the `morpheus_llm` python package. It also pulls down all the necessary Conda packages including [`morpheus-core`](https://anaconda.org/nvidia/morpheus-core). | ||
| ### Install additional PyPI dependencies | ||
| Some of the stages in the library require additional dependencies that are hosted on PyPI. These dependencies are included as a requirements file in the `morpheus_llm` python package. And can be installed by running the following command: | ||
| ```bash | ||
| MORPHEUS_LLM_PKG_DIR=$(dirname $(python -c "import morpheus_llm; print(morpheus_llm.__file__)")) | ||
| pip install -r ${MORPHEUS_LLM_PKG_DIR}/requirements_morpheus_llm.txt | ||
| ``` | ||
|
|
||
| ## Miscellaneous | ||
| ### Morpheus Examples | ||
| The Morpheus examples are not included in the Morpheus Conda packages. To use them you need to clone the Morpheus repository and run the examples from source. For details refer to the [Morpheus Examples](./examples.md). | ||
|
|
||
| ### Namespace Updates | ||
| If you were using a Morpheus release prior to 24.10 you may need to update the namespace for the DFP, LLM and vector database stages. | ||
|
|
||
| A script, `scripts/morpheus_namespace_update.py`, has been provide to help with that and can be run as follows: | ||
| ```bash | ||
| python scripts/morpheus_namespace_update.py --directory <directory> --dfp | ||
| ``` | ||
| ```bash | ||
| python scripts/morpheus_namespace_update.py --directory <directory> --llm | ||
| ``` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.