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

[morpheus-refactor] Move morpheus source to python/morpheus #1836

Merged
merged 15 commits into from
Aug 13, 2024
Merged

[morpheus-refactor] Move morpheus source to python/morpheus #1836

merged 15 commits into from
Aug 13, 2024

Conversation

AnuradhaKaruppiah
Copy link
Contributor

Description

This is the first PR to update the source layout. It moves the morpheus source code to a new sub-tree that will allow breaking out morpheus functional blocks from the morpheus-base -

.
|___ CMakeLists.txt
|___ python
|    |___ CMakeLists.txt
|    |___ morpheus
|    |    |___ CMakeLists.txt
|    |    |___ setup.py
|    |    |___ setup.cfg
|    |    |___ MANIFEST.in
|    |    |___ morpheus
|    |    |    |___ __init__.py
|    |    |    |___ _lib
|    |    |    |___ etc.
|    |___ morpheus_N

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.

@AnuradhaKaruppiah
Move morpheus to python/morpheus/morpheus
3c74d72 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Move setup files for morpheus down to python/morpheus
2b69d0d 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Update the cmake files to reflect the new directory structure
bb70a01 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Update the link to models/data
facd24c 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah AnuradhaKaruppiah requested review from a team as code owners August 8, 2024 00:50
@copy-pr-bot copy-pr-bot
Copy link

copy-pr-bot bot commented Aug 8, 2024

This pull request requires additional validation before any workflows can run on NVIDIA's runners.

Pull request vetters can view their responsibilities here.

Contributors can view more details about this message here.

@AnuradhaKaruppiah AnuradhaKaruppiah added feature request New feature or request non-breaking Non-breaking change labels Aug 8, 2024
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

dagardner-nv
dagardner-nv approved these changes Aug 9, 2024
View reviewed changes
Copy link
Contributor

@dagardner-nv dagardner-nv left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM, my main question is, are in-place python installs still supported? How does it work?

cwharris
cwharris approved these changes Aug 9, 2024
View reviewed changes
Copy link
Contributor

@cwharris cwharris left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

@AnuradhaKaruppiah
Copy link
Contributor Author

LGTM, my main question is, are in-place python installs still supported? How does it work?

That is a good question. The install is per-functional block. For eg. if you were setting up a dev env it would look something like this -

cd $MORPHEUS_ROOT
pip install -e python/morpheus
pip install -e python/morpheus_N  # hypothetical functional block

@dagardner-nv dagardner-nv added the conda-build Enables running the conda-build step on a PR label Aug 9, 2024
@AnuradhaKaruppiah
Update path of morpheus source for the conda doc build
83e274c 
Tested with -
1. configure cmake with -DMORPHEUS_BUILD_DOCS=ON
2. cmake --build build --target morpheus_docs

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Change the location from which morpheus is installed
1e470eb 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Update morpheus installation instructions in the contributing guide
51e7d3c 
This is to reflect the new directory structure python/morpheus

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Update library and dist location in the CI scripts
4e3c851 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Fixup data location in TestProcessControlMessageAndMultiMessagetiMessage
8d9d102 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Fix python wheel locations in the docs ci script
1d6a13e 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

1 similar comment
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Update the location of setup.cfg in the ci scripts
268f2ec 
This may need to re-evaluated as config needs to run accross all the
python modules

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Fix the location of the morpheus wheels in the conda package script
4d6b733 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Fix style warnings
bcbab55 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Fix path for modules that ignore linting
af30bf9 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Disable cyclic-import error in message_base
cb57c50 
This change is being done to resolve these errors -
************* Module setup
python/morpheus/setup.py:1:0: R0401: Cyclic import (morpheus.messages -> morpheus.messages.multi_message -> morpheus.messages.message_base) (cyclic-import)
python/morpheus/setup.py:1:0: R0401: Cyclic import (morpheus.messages -> morpheus.messages.multi_message -> morpheus.messages.message_meta -> morpheus.messages.message_base) (cyclic-import)
python/morpheus/setup.py:1:0: R0401: Cyclic import (morpheus.messages -> morpheus.messages.multi_inference_message -> morpheus.messages.message_meta -> morpheus.messages.message_base) (cyclic-import)
python/morpheus/setup.py:1:0: R0401: Cyclic import (morpheus.messages -> morpheus.messages.multi_tensor_message -> morpheus.messages.message_meta -> morpheus.messages.message_base) (cyclic-import)
python/morpheus/setup.py:1:0: R0401: Cyclic import (morpheus.messages -> morpheus.messages.multi_ae_message -> morpheus.messages.multi_message -> morpheus.messages.message_base) (cyclic-import)
python/morpheus/setup.py:1:0: R0401: Cyclic import (morpheus.messages -> morpheus.messages.multi_tensor_message -> morpheus.messages.memory.tensor_memory -> morpheus.messages.message_base) (cyclic-import)
python/morpheus/setup.py:1:0: R0401: Cyclic import (morpheus.messages -> morpheus.messages.memory.inference_memory -> morpheus.messages.memory.tensor_memory -> morpheus.messages.message_base) (cyclic-import)
python/morpheus/setup.py:1:0: R0401: Cyclic import (morpheus.messages -> morpheus.messages.memory.response_memory -> morpheus.messages.memory.tensor_memory -> morpheus.messages.message_base) (cyclic-import)
python/morpheus/setup.py:1:0: R0401: Cyclic import (morpheus.messages -> morpheus.messages.multi_response_message -> morpheus.messages.multi_tensor_message -> morpheus.messages.message_meta -> morpheus.messages.message_base) (cyclic-import)

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

1 similar comment
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Copy link
Contributor Author

/merge

@rapids-bot rapids-bot bot merged commit 4e3edb9 into nv-morpheus:branch-24.10 Aug 13, 2024
11 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dagardner-nv dagardner-nv dagardner-nv approved these changes

@cwharris cwharris cwharris approved these changes

Assignees
No one assigned
Labels
conda-build Enables running the conda-build step on a PR feature request New feature or request non-breaking Non-breaking change
Projects
Morpheus Boards
Status: Done
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@AnuradhaKaruppiah @cwharris @dagardner-nv