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

Rebase CI images on rapidsai/ci-conda #1467

Closed
wants to merge 163 commits into from
Closed

Rebase CI images on rapidsai/ci-conda #1467

wants to merge 163 commits into from

Conversation

dagardner-nv
Copy link
Contributor

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

Description

  • Use the newly renamed rapidsai/ci-conda image as the base.
  • Switch to using conda rather than mamba since conda now uses the libmamba solver this is a work-around for mamba env update fails with pip dependencies mamba-org/mamba#3059
  • Switch to using rapids-dependency-file-generator to generate conda yamls when building the CI image.

Requires PRs #1462 and #1466 to be merged first

Closes #1207

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 added the Merge After Dependencies PR is completed and reviewed but depends on another PR; do not merge out of order label Jan 17, 2024
@dagardner-nv dagardner-nv marked this pull request as ready for review January 17, 2024 16:20
dagardner-nv and others added 21 commits January 17, 2024 15:06
@dagardner-nv
Merge branch 'branch-24.03' into david-mdd_relocatable-package
09842ab
@dagardner-nv
Remove commented out line [no ci]
e15c206
@dagardner-nv
Limit debug printing to just morpheus [no ci]
5015467
@dagardner-nv
Add comment explaining why bootstrapping cuda is now a two-step proce…
cc5d39a 
…ss [no ci]
@dagardner-nv
Don't call morpheus_utils_configure_grpc
3c7addb
@dagardner-nv
Formatting fix
6954460
@dagardner-nv
Add pkg-config which is needed by mrc's cmake scripts to discover dep…
2c740ce 
…s propperly
@dagardner-nv
Remove component
9967192
@dagardner-nv
Merge branch 'david-mdd_relocatable-package' into david_test_conda
c277694
@dagardner-nv
Merge branch 'david_test_conda' into david_conda_ci_pkg
8f6bed6
@dagardner-nv
Merge branch 'david_conda_ci_pkg' of github.com:dagardner-nv/Morpheus…
997f018 
… into david-rebase-ci-images [no ci]
@dagardner-nv
Sort channels [no ci]
37cd51c
@dagardner-nv
Ensure we receive a cuda build of pyarrow
6d10b3b
@dagardner-nv
Add pkg-config to build env for conda package
287461b
@dagardner-nv
Merge branch 'david_conda_ci_pkg' of github.com:dagardner-nv/Morpheus…
3caecc2 
… into david-rebase-ci-images
@dagardner-nv
pytorch channel no longer needed
fc1bef0
@dagardner-nv
Merge branch 'branch-24.03' into david_test_conda
40adcb8
@dagardner-nv
Remove unused cmake script
9c226bb
@dagardner-nv
Merge branch 'david_test_conda' into david_conda_ci_pkg
b2b618e
@dagardner-nv
Merge branch 'branch-24.03' into david_conda_ci_pkg
7e811fd
@dagardner-nv
Merge branch 'david_conda_ci_pkg' into david-rebase-ci-images
ee0649c
@dagardner-nv dagardner-nv added DO NOT MERGE PR should not be merged; see PR for details and removed Merge After Dependencies PR is completed and reviewed but depends on another PR; do not merge out of order labels Feb 1, 2024
@dagardner-nv
Copy link
Contributor Author

No longer needed, superseded by PR 1468

@dagardner-nv dagardner-nv deleted the david-rebase-ci-images branch February 7, 2024 18:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@dagardner-nv dagardner-nv

Labels
conda-build Enables running the conda-build step on a PR DO NOT MERGE PR should not be merged; see PR for details improvement Improvement to existing functionality non-breaking Non-breaking change
Projects
Morpheus Boards
Archived in project
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[FEA]: Rebase CI images on rapidsai/ci-conda
2 participants
@dagardner-nv @mdemoret-nv