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.

Sign up for GitHub

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

Jump to bottom

Fix vdb_upload runtime error #1643

Merged
merged 43 commits into from
Apr 22, 2024
Merged

Fix vdb_upload runtime error #1643

merged 43 commits into from
Apr 22, 2024

Conversation

dagardner-nv
Copy link
Contributor

@dagardner-nv dagardner-nv commented Apr 18, 2024 •
edited
Loading

Description

  • Add ControlMessage to the accepted_types for InferenceStage when in Python mode
  • fix import of CppTensorMemory
  • Set default value of ['rss'] for --source_type avoids issue where command line flag values are ignored.
  • Fix bug in overrides of config fixture which prevented parameterization on the use_cpp fixture.
  • fix type-o in config value stop_after_rec not stop_after_sec
  • Ensure a default int value for stop_after_rec to avoid schema validation error
  • Revert the default value for --vector_db_resource_name back to 'RSS', allowing the output of running this example to be used as the input for the RAG pipeline

Closes #1642
Closes #1645

By Submitting this PR I confirm:

  • I am familiar with the Contributing Guidelines.
  • 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.

@dagardner-nv
Add tests to reproduce nv-morpheus#1639
af9bb17
@dagardner-nv
More repo tests
61d391c
@dagardner-nv
Rollback change
9cfed05
@dagardner-nv
Only set the pe_count for python impls
8f6209a
@dagardner-nv
Revert "More repo tests"
2d124ad 
This reverts commit 61d391c.
@dagardner-nv
Revert "Add tests to reproduce nv-morpheus#1639"
1aec440 
This reverts commit af9bb17.
@dagardner-nv
Remove the launch options entirely since we currently don't have a re…
8444f77 
…liable way to perform a multi-threaded triton unittest
@dagardner-nv
Revert "Remove the launch options entirely since we currently don't h…
ee03438 
…ave a reliable way to perform a multi-threaded triton unittest"

This reverts commit 8444f77.
@dagardner-nv
Revert "Only set the pe_count for python impls"
a0092c7 
This reverts commit 8f6209a.
@dagardner-nv
Disable the hammah validation script until nv-morpheus#1641 is resolved
d0d2e70
@dagardner-nv
Don't hard-code the thread-count to 1
e35748e
@dagardner-nv
Ensure the C++ impl of the triton stage only uses a single progress e…
ab3b144 
…ngine
@dagardner-nv
WIP : bypassed the message incompatibility error, but now failing on …
c401291 
…a validation error on the rss source schema
@dagardner-nv dagardner-nv added bug Something isn't working non-breaking Non-breaking change Merge After Dependencies PR is completed and reviewed but depends on another PR; do not merge out of order ! - Hotfix Related to a Hotfix Release skip-ci Optionally Skip CI for this PR labels Apr 18, 2024
@dagardner-nv dagardner-nv self-assigned this Apr 18, 2024
@dagardner-nv dagardner-nv requested a review from a team as a code owner April 18, 2024 23:41
@dagardner-nv dagardner-nv marked this pull request as draft April 19, 2024 15:14
dagardner-nv and others added 6 commits April 19, 2024 08:48
@dagardner-nv
Revert "WIP : bypassed the message incompatibility error, but now fai…
a52d6e9 
…ling on a validation error on the rss source schema"

This reverts commit c401291.
@dagardner-nv
Mark ControlMessage as one of the accepted input messages
1df9642
@dagardner-nv
Set a default non-None value for stop_after_sec
f1e703d
@dagardner-nv
Fix import for CppTensorMemory
31679dd
@efajardo-nv @dagardner-nv
Use conda env create --yes instead of --force (nv-morpheus#1636)
9f09023 
conda dropped support for the --force flag to conda env create. This changes that flag name to --yes.
See https://github.com/conda/conda/blob/main/CHANGELOG.md#2430-2024-03-12 and rapidsai/miniforge-cuda#63 for more info.

## 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:
  - Eli Fajardo (https://github.com/efajardo-nv)

Approvers:
  - David Gardner (https://github.com/dagardner-nv)

URL: nv-morpheus#1636
@dagardner-nv
Merge branch 'david-triton-sid-threading' of github.com:dagardner-nv/…
9a7a6ab 
…Morpheus into david-vdb-upload-control-msg-1642
@dagardner-nv dagardner-nv removed the skip-ci Optionally Skip CI for this PR label Apr 19, 2024
@dagardner-nv dagardner-nv marked this pull request as ready for review April 19, 2024 17:59
@dagardner-nv dagardner-nv removed the Merge After Dependencies PR is completed and reviewed but depends on another PR; do not merge out of order label Apr 19, 2024
@dagardner-nv
Copy link
Contributor Author

/merge

@rapids-bot rapids-bot bot merged commit 31d963a into nv-morpheus:branch-24.03 Apr 22, 2024
12 of 13 checks passed
@dagardner-nv dagardner-nv deleted the david-vdb-upload-control-msg-1642 branch April 22, 2024 18:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@yczhang-nv yczhang-nv yczhang-nv approved these changes

@mdemoret-nv mdemoret-nv mdemoret-nv approved these changes

Assignees

@dagardner-nv dagardner-nv

Labels
! - Hotfix Related to a Hotfix Release bug Something isn't working non-breaking Non-breaking change
Projects
Morpheus Boards
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@dagardner-nv @mdemoret-nv @yczhang-nv @efajardo-nv