Skip to content

Commit

Permalink
Forward-merge branch-24.10 into branch-25.02 (#2070)
Browse files Browse the repository at this point in the history
Forward-merge triggered by push to branch-24.10 that creates a PR to
keep branch-25.02 up-to-date. If this PR is unable to be immediately
merged due to conflicts, it will remain open for the team to manually
merge. See [forward-merger
docs](https://docs.rapids.ai/maintainers/forward-merger/) for more info.
  • Loading branch information
dagardner-nv authored Nov 22, 2024
2 parents 747680c + 84f2bab commit 3c520f8
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 32 deletions.
1 change: 1 addition & 0 deletions .github/workflows/pr.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ on:
branches:
- 'pull-request/**'
- 'branch-*'
- 'main'

# This allows a subsequently queued workflow run to interrupt previous runs
concurrency:
Expand Down
4 changes: 2 additions & 2 deletions ci/conda/recipes/morpheus-libs/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion ci/conda/recipes/morpheus/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.*
Expand Down
29 changes: 0 additions & 29 deletions docs/source/getting_started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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]...]...
<Help Paragraph Omitted>
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
Expand Down

0 comments on commit 3c520f8

Please sign in to comment.