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

Breakout morpheus_llm #1853

Merged
merged 23 commits into from
Aug 23, 2024
Merged

Breakout morpheus_llm #1853

merged 23 commits into from
Aug 23, 2024

Conversation

AnuradhaKaruppiah
Copy link
Contributor

@AnuradhaKaruppiah AnuradhaKaruppiah commented Aug 19, 2024 •
edited
Loading

This PR breaks out the LLM source code into -

  1. A separate subdirectory - python/morpheus_llm
  2. Compiled as a separate shared lib -
    libmorpheus_llm.so
    |_ llm/init.cpython-310-x86_64-linux-gnu.so
  3. And setup as a separate python package
    a. morpheus_llm - all llm modules are now in this namespace
    b. with the following distribution -
    ./build/python/morpheus_llm/dist/morpheus_llm-24.10.0a0+46.g125a6be9.dirty-py3-none-any.whl

To build and install all components in a dev env you can use these steps (steps also updated in contributing.md) -

  1. ./scripts/compile_all.sh
  2. pip install -e python/morpheus
  3. pip install -e python/morpheus_llm

Items of note -
To ensure right order of build-n-install morpheus_llm has dependencies on the following targets -

  1. cudf_helpers
  2. morpheus
  3. all "py_morpheus" targets
    Ref: python/morpheus_llm/morpheus_llm/_lib/cmake/libmorpheus_llm.cmake

Pending (major) items -

  1. Need to breakout llm related build/conda environment requirements from the base morpheus requirements
  2. Need to breakout llm python tests (cpp tests have been moved as a part of this commit).

@AnuradhaKaruppiah AnuradhaKaruppiah requested review from a team as code owners August 19, 2024 20:34
@copy-pr-bot copy-pr-bot
Copy link

copy-pr-bot bot commented Aug 19, 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 non-breaking Non-breaking change improvement Improvement to existing functionality conda-build Enables running the conda-build step on a PR labels Aug 19, 2024
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah AnuradhaKaruppiah added breaking Breaking change non-breaking Non-breaking change and removed non-breaking Non-breaking change breaking Breaking change labels Aug 19, 2024
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

dagardner-nv
dagardner-nv requested changes Aug 21, 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.

Looks good, just need to fix the documentation builds.

ci/scripts/github/docs.sh Show resolved Hide resolved
python/CMakeLists.txt Show resolved Hide resolved
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Copy link
Contributor Author

@dagardner-nv Can you please take another look at the review. I have updated it -

  1. To include a build flag for morpheus_llm - commits 1, 2, 3

  2. Changed the include dir name to morpheus_llm to prevent namespace conflict when MORPHEUS_PYTHON_INPLACE_BUILD=OFF - commits 1, 2, 3

  3. Update the docs build for including morpheus_llm in the py_api.html and python/morpheus_llm/morpheus_llm/_lib while generating the C++ APIs - commit

dagardner-nv
dagardner-nv approved these changes Aug 23, 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, just one issue noted above re documentation builds.

docs/CMakeLists.txt Show resolved Hide resolved
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

1 similar comment
@AnuradhaKaruppiah
Copy link
Contributor Author

/ok to test

@AnuradhaKaruppiah
Move the llm source from morpheus to morpheus_llm
483ef08 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
CMake and setup for morpheus_llm
9f46045 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Change the llm imports from morpheus to morpheus_llm
c576442 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Update llm imports in examples and tests to match the new namespace
3b42227 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Remove all vestiges of morpheus.llm
03b452d 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
test fixup
2f36101 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Update developer docs to install morpheus_llm
ab6799b 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Update ci scripts to include morpheus_llm artifacts
7575950 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Style fixes using ./ci/scripts/fix_all.sh
2c65c45 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Add a dependency on cudf_helpers
7689db0 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Fixup morpheus_llm tests
12d7417 
Drop test_cuda.cu. That is a part of the morpheus tests.

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Set relative path for morpheus in morpheus_llm
16aba8f 
This workaround is needed for building morpheus_llm py bindings without
installing morpheus.

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Set a dependency on all morpheus python targets
2c7fcf8 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Misc LLM setup fixes
78aad25 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Drop unnecessary dependency statement to avoid confusion
b464ba3 
morpheus is already specified via target_link_libraries ensuring it will
be built before morpheus_llm

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Rename the morpheus/llm include dir to morpheus_llm/llm
14ab635 
This is needed to setup the namespace correctly when building with
MORPHEUS_PYTHON_INPLACE_BUILD=OFF

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Fixup path in reference to llm headers
3c97a43 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Header/import ordering fixes using fix_all
78d0820 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Add a build flag to turn off building morpheus_llm
a032a73 
This is on by default

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
conda recipe update to build morpheus_llm
df7c42b 
Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Enable building morpheus_llm in the docker config
aaa544a 
This may need to be fixed up

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Add morpheus_llm as an input to morpheus documentation
5087cea 
We may need to revisit this and split up the documentation

Signed-off-by: Anuradha Karuppiah <anuradhak@nvidia.com>
@AnuradhaKaruppiah
Currently docs can only be generated if morpheus_llm is on
ce77f77 
Added a message in the main CMakelists.txt t check for this and fail the
build early. Sample output -
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>
Runing CMake configure...
+ cmake -S . -B build -GNinja -DCMAKE_MESSAGE_CONTEXT_SHOW=ON
  -DMORPHEUS_USE_CLANG_TIDY=OFF -DMORPHEUS_PYTHON_INPLACE_BUILD=ON
-DMORPHEUS_PYTHON_PERFORM_INSTALL=ON -DMORPHEUS_USE_CCACHE=ON
-DMORPHEUS_USE_CONDA=ON -DMORPHEUS_SUPPORT_DOCA=OFF
-DMORPHEUS_BUILD_MORPHEUS_LLM=ON
-DCMAKE_AR=/home/ubuntu/miniforge3/envs/comp-llm/bin/x86_64-conda-linux-gnu-ar
-DCMAKE_CXX_COMPILER_AR=/home/ubuntu/miniforge3/envs/comp-llm/bin/x86_64-conda-linux-gnu-gcc-ar
-DCMAKE_C_COMPILER_AR=/home/ubuntu/miniforge3/envs/comp-llm/bin/x86_64-conda-linux-gnu-gcc-ar
-DCMAKE_RANLIB=/home/ubuntu/miniforge3/envs/comp-llm/bin/x86_64-conda-linux-gnu-ranlib
-DCMAKE_CXX_COMPILER_RANLIB=/home/ubuntu/miniforge3/envs/comp-llm/bin/x86_64-conda-linux-gnu-gcc-ranlib
-DCMAKE_C_COMPILER_RANLIB=/home/ubuntu/miniforge3/envs/comp-llm/bin/x86_64-conda-linux-gnu-gcc-ranlib
-DCMAKE_LINKER=/home/ubuntu/miniforge3/envs/comp-llm/bin/x86_64-conda-linux-gnu-ld
-DCMAKE_STRIP=/home/ubuntu/miniforge3/envs/comp-llm/bin/x86_64-conda-linux-gnu-strip
-DMORPHEUS_BUILD_DOCS=ON -DMORPHEUS_BUILD_MORPHEUS_LLM=OFF
CMake Error at CMakeLists.txt:51 (message):
  MORPHEUS_BUILD_MORPHEUS_LLM must be ON if MORPHEUS_BUILD_DOCS is ON
>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>

-- Configuring incomplete, errors occurred!

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

/ok to test

@AnuradhaKaruppiah
Copy link
Contributor Author

/merge

@rapids-bot rapids-bot bot merged commit 78c48d6 into nv-morpheus:branch-24.10 Aug 23, 2024
11 checks passed
@AnuradhaKaruppiah AnuradhaKaruppiah mentioned this pull request Aug 23, 2024
Merged
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

Assignees
No one assigned
Labels
conda-build Enables running the conda-build step on a PR improvement Improvement to existing functionality non-breaking Non-breaking change
Projects
Morpheus Boards
Status: Done
Milestone
No milestone
Development

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