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.

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

Ensure default path values in morpheus.cli are no longer relative #62

Merged
28 commits merged into from
May 27, 2022

Conversation

dagardner-nv
Copy link
Contributor

@dagardner-nv dagardner-nv commented Apr 27, 2022

Moves the data dir under the morpheus dir. This allows it to be easily installable via setuptools & discoverable relative to morpheus.__file__ and sets a new attribute morpheus.DATA_DIR.

This change also fixes a few random bugs related to non-inplace morpheus builds.

Allows morphues cli to be run are outside of the root of the repo
fixes #60

@mdemoret-nv mdemoret-nv changed the base branch from branch-22.04 to branch-22.06 April 27, 2022 23:07
@mdemoret-nv mdemoret-nv added bug Something isn't working non-breaking Non-breaking change labels Apr 27, 2022
morpheus/cli.py Outdated Show resolved Hide resolved
tests/test_cli.py Outdated Show resolved Hide resolved
@cwharris
Copy link
Contributor

mostly LGTM, just had a few questions.

Co-authored-by: Christopher Harris <xixonia@gmail.com>
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

@dagardner-nv dagardner-nv requested review from a team as code owners May 23, 2022 21:03
Copy link
Contributor

@mdemoret-nv mdemoret-nv left a comment

Choose a reason for hiding this comment

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

Couple of small changes

.gitattributes Outdated Show resolved Hide resolved
CMakeLists.txt Outdated Show resolved Hide resolved
morpheus/cmake/utils/python_module_tools.cmake Outdated Show resolved Hide resolved
Copy link
Contributor

@mdemoret-nv mdemoret-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 now.

@mdemoret-nv
Copy link
Contributor

@gpucibot merge

@ghost ghost merged commit 38428c3 into nv-morpheus:branch-22.06 May 27, 2022
pdmack added a commit that referenced this pull request Jun 6, 2022
data dir has been relocated
Relates to #62 and #141
ghost pushed a commit that referenced this pull request Jun 7, 2022
Brings directory size down to 1.6MB down from 270MB

+ Move large files to `exaples/data` 
+ Migrate existing files in `exaples/data` to git-lfs
+ Add missing `email_with_addresses.jsonlines` needed for phishing detection developer guide
+ Update file paths in docs for data files
+ Update import paths in developer guide

Depends on changes in ~~#62~~
Fixes #120

Authors:
  - David Gardner (https://github.com/dagardner-nv)
  - Michael Demoret (https://github.com/mdemoret-nv)

Approvers:
  - https://github.com/raykallen
  - Michael Demoret (https://github.com/mdemoret-nv)

URL: #130
ghost pushed a commit that referenced this pull request Jun 8, 2022
+ Performs a non-inplace morpheus build.
+ Adds $ORIGIN to rpath of build binaries, fixing issue where libmorpheus.so was unable to find libmorpheus-utils.so (fixes #111 )
+ ~~Removes the need for a gpu for the build stage~~ Blocked by Neo/nvml issue #186
+ Common operations moved to common.sh
+ Fixes ci scripts so that they work locally (fixes #114 )
+ Improve the way sccache is configured (fixes #110 )

This pull req incorporates changes from #62

Authors:
  - David Gardner (https://github.com/dagardner-nv)
  - Michael Demoret (https://github.com/mdemoret-nv)

Approvers:
  - Devin Robison (https://github.com/drobison00)
  - Michael Demoret (https://github.com/mdemoret-nv)

URL: #107
ghost pushed a commit that referenced this pull request Jun 15, 2022
data dir is now underneath ./morpheus

Relates to #62

Authors:
  - Pete MacKinnon (https://github.com/pdmack)

Approvers:
  - Christopher Harris (https://github.com/cwharris)
  - Michael Demoret (https://github.com/mdemoret-nv)

URL: #141
ghost pushed a commit that referenced this pull request Jun 17, 2022
data dir has been relocated
Relates to #62 and #141

Authors:
  - Pete MacKinnon (https://github.com/pdmack)

Approvers:
  - Michael Demoret (https://github.com/mdemoret-nv)

URL: #142
@dagardner-nv dagardner-nv deleted the david-cli-rel-paths branch February 12, 2024 23:20
This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working non-breaking Non-breaking change
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[BUG] Relative paths in the CLI should always be computed as relative to the root
3 participants