From 97dc7a6f41e843c536d87269178bf1db980bf7fe Mon Sep 17 00:00:00 2001 From: David Gardner <96306125+dagardner-nv@users.noreply.github.com> Date: Thu, 21 Nov 2024 10:46:31 -0800 Subject: [PATCH 1/2] Remove references to pipeline-ae in docs (#2063) Closes https://github.com/nv-morpheus/Morpheus/issues/2046 ## 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) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) URL: https://github.com/nv-morpheus/Morpheus/pull/2063 --- docs/source/getting_started.md | 29 ----------------------------- 1 file changed, 29 deletions(-) diff --git a/docs/source/getting_started.md b/docs/source/getting_started.md index 02e430ea6e..0ccceba847 100644 --- a/docs/source/getting_started.md +++ b/docs/source/getting_started.md @@ -376,35 +376,6 @@ Commands: validate Validate pipeline output for testing. ``` -And for the AE pipeline: - -``` -$ morpheus run pipeline-ae --help -Usage: morpheus run pipeline-ae [OPTIONS] COMMAND1 [ARGS]... [COMMAND2 [ARGS]...]... - - - -Commands: - add-class Add detected classifications to each message. - add-scores Add probability scores to each message. - buffer (Deprecated) Buffer results. - delay (Deprecated) Delay results for a certain duration. - filter Filter message by a classification threshold. - from-azure Source stage is used to load Azure Active Directory messages. - from-cloudtrail Load messages from a CloudTrail directory. - from-duo Source stage is used to load Duo Authentication messages. - inf-pytorch Perform inference with PyTorch. - inf-triton Perform inference with Triton Inference Server. - monitor Display throughput numbers at a specific point in the pipeline. - preprocess Prepare Autoencoder input DataFrames for inference. - serialize Includes & excludes columns from messages. - timeseries Perform time series anomaly detection and add prediction. - to-file Write all messages to a file. - to-kafka Write all messages to a Kafka cluster. - train-ae Train an Autoencoder model on incoming data. - trigger Buffer data until the previous stage has completed. - validate Validate pipeline output for testing. -``` > **Note**: The available commands for different types of pipelines are not the same. This means that the same stage may have different options when used in different pipelines. Check the CLI help for the most up-to-date information during development. ## Next Steps From 84f2babb93642855e3a70d92cbf88c9b837848e6 Mon Sep 17 00:00:00 2001 From: David Gardner <96306125+dagardner-nv@users.noreply.github.com> Date: Fri, 22 Nov 2024 10:02:22 -0800 Subject: [PATCH 2/2] Execute CI on the main branch (#2064) * This would enable conda package uploads for releases, matching the behavior in MRC Closes https://github.com/nv-morpheus/Morpheus/issues/2042 ## 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) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) URL: https://github.com/nv-morpheus/Morpheus/pull/2064 --- .github/workflows/pr.yaml | 1 + ci/conda/recipes/morpheus-libs/meta.yaml | 4 ++-- ci/conda/recipes/morpheus/meta.yaml | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml index ba75c3090f..82cb8b43ec 100644 --- a/.github/workflows/pr.yaml +++ b/.github/workflows/pr.yaml @@ -20,6 +20,7 @@ on: branches: - 'pull-request/**' - 'branch-*' + - 'main' # This allows a subsequently queued workflow run to interrupt previous runs concurrency: diff --git a/ci/conda/recipes/morpheus-libs/meta.yaml b/ci/conda/recipes/morpheus-libs/meta.yaml index 747f734371..f6d88716bf 100644 --- a/ci/conda/recipes/morpheus-libs/meta.yaml +++ b/ci/conda/recipes/morpheus-libs/meta.yaml @@ -91,7 +91,7 @@ outputs: - feedparser =6.0.* - grpcio =1.62.* - lxml - - mlflow>=2.10.0,<3 + - mlflow>=2.10.0,<2.18 - mrc - networkx=2.8.8 - numpydoc =1.5.* @@ -239,7 +239,7 @@ outputs: - scripts/fetch_data.py - tests/* script: morpheus_llm_test.sh - + about: home: https://github.com/nv-morpheus/Morpheus license: Apache-2.0 diff --git a/ci/conda/recipes/morpheus/meta.yaml b/ci/conda/recipes/morpheus/meta.yaml index 23327bcbc7..fd60e49243 100644 --- a/ci/conda/recipes/morpheus/meta.yaml +++ b/ci/conda/recipes/morpheus/meta.yaml @@ -97,7 +97,7 @@ outputs: - feedparser =6.0.* - grpcio =1.62.* - libwebp>=1.3.2 # Required for CVE mitigation: https://nvd.nist.gov/vuln/detail/CVE-2023-4863 - - mlflow>=2.10.0,<3 + - mlflow>=2.10.0,<2.18 - mrc - networkx=2.8.8 - numpydoc =1.5.*