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

Misc Conda Improvements #1462

Merged
merged 128 commits into from
Jan 31, 2024
Merged

Misc Conda Improvements #1462

merged 128 commits into from
Jan 31, 2024

Conversation

dagardner-nv
Copy link
Contributor

@dagardner-nv dagardner-nv commented Jan 10, 2024 •
edited
Loading

Description

  • Update examples to use package relative paths where possible allowing users of the Morpheus conda package to run examples.
  • Install pyarrow-hotfix via conda rather than pip
  • Ensure pyarrow-hotfix is installed during conda build enabling stubs to be generated.
  • Fix version restriction for sqlalchemy in meta.yaml
  • Fix type-o in dependencies.yaml causing duplicate entries for the click package.
  • Add examples target to dependencies.yaml.
  • Specify a version for sysroot_linux-64, prevents older kernel headers from being installed causing glibc link errors.
  • Update docker/build_conda_packages.sh to create .conda-bld dir if it doesn't already exist

Closes #1461

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.

mdemoret-nv and others added 30 commits July 26, 2023 19:43
@mdemoret-nv
Making the morpheus project relocatable to support building C++ compo…
bae8984 
…nents
@mdemoret-nv
Improving the install step
bfd3098
@mdemoret-nv
Removing -core from utilities
e2cc0bb
@dagardner-nv
Update morpheus utils
8bc32c1
@dagardner-nv
Merge branch 'branch-24.03' of github.com:nv-morpheus/Morpheus into d…
de526c0 
…avid-mdd_relocatable-package
@dagardner-nv
Fix merge error
7ee8b02
@dagardner-nv
Track mdd_improve-setup
ba3cd1f
@dagardner-nv
Updated mdd_improve-setup branch
9863c39
@dagardner-nv
Updated utilities repo
79263f3
@dagardner-nv
Merge branch 'branch-24.03' of github.com:nv-morpheus/Morpheus into d…
f6fa607 
…avid-mdd_relocatable-package
@dagardner-nv
Import mrc.core.segment to avoid stubgen error regarding ObjectProper…
eb4d62c 
…ties not being defined
@dagardner-nv
Remove unused import
dab8e20
@dagardner-nv
Update stage to match type refactor
0b7f31c
@dagardner-nv
Update stub file
6478686
@dagardner-nv
Add test for the external_cpp_stage
5f021a9
@dagardner-nv
Only install the cpython extensions into site-packages, avoids redund…
261b298 
…ant/unused copy of libmorpheus.so
@dagardner-nv
Ignore _version.py
d3f79c6
@dagardner-nv
Add license header, remove redundant lines
c243209
@dagardner-nv
Yapf issue nv-morpheus#984 has been fixed in our current version of y…
8d531d5 
…apf. Remove usage of older YAPF_EXCLUDE_FLAGS work-around
@dagardner-nv
Resolve missing symbols error when performing release builds
d90705a
@dagardner-nv
Update utils
1aef7f4
@dagardner-nv
Separate the initialization of cuda from enabling it
5ebddf8
@dagardner-nv
Build the install target
fd5f5e8
@dagardner-nv
Update utils
e28b800
@dagardner-nv
Set C++ std to 20, remove commented out code
2ea3d4d
@dagardner-nv
Fix type-o
e69d86d
@dagardner-nv
Include the examples dir when searching for C++ source files
a006b0b
@dagardner-nv
Include the utilities repo as it is nescesarry for building C++ stage…
b373854 
…s/messages for morpheus
@dagardner-nv
Relocate commented out calls to 'conda clean' and re-enable, remove o…
031f10f 
…ut of date comment about camouflage
@dagardner-nv
Update CR year for files changed in this PR
46cea05
@dagardner-nv dagardner-nv removed the skip-ci Optionally Skip CI for this PR label Jan 11, 2024
This was referenced Jan 11, 2024
Merged
Closed
@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 Jan 22, 2024
@dagardner-nv dagardner-nv self-assigned this Jan 24, 2024
mdemoret-nv
mdemoret-nv requested changes Jan 29, 2024
View reviewed changes
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.

Changes look good, but can we make sure all references to pyarrow-hotfix (or pyarrow_hotfix) are removed. I believe there is one in setup.py.

@mdemoret-nv
Copy link
Contributor

/merge

@rapids-bot rapids-bot bot merged commit 949279f into nv-morpheus:branch-24.03 Jan 31, 2024
9 checks passed
rapids-bot bot pushed a commit that referenced this pull request Feb 1, 2024
@dagardner-nv
Add conda builds to CI (#1466)
16ca5df 
* Adds a conda build CI step

Requires PR #1462 to be merged first

## 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:
  - David Gardner (https://github.com/dagardner-nv)
  - Michael Demoret (https://github.com/mdemoret-nv)

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

URL: #1466
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

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

Assignees

@dagardner-nv dagardner-nv

Labels
improvement Improvement to existing functionality non-breaking Non-breaking change
Projects
Morpheus Boards
Archived in project
Milestone
24.03 - Dependencies, Build System, a...
Development

Successfully merging this pull request may close these issues.

Test/verify morpheus conda package
2 participants
@dagardner-nv @mdemoret-nv