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

Morpheus changes related to utility consolidation #531

Merged
69 commits merged into from
Jan 24, 2023
Merged

Morpheus changes related to utility consolidation #531

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
69 commits
Select commit Hold shift + click to select a range
b2a976f
Start new update branch
drobison00 Dec 2, 2022
22d63fb
Checkpoint
drobison00 Dec 2, 2022
3aead15
Checkpoint
drobison00 Dec 2, 2022
da9cf59
Checkpoint
drobison00 Dec 2, 2022
3cfe2b9
Baseline conversion to utilities lib works
drobison00 Dec 2, 2022
99048ea
Checkpoint - transitioning morpheus _libs
drobison00 Dec 2, 2022
71493e2
More file consolidation
drobison00 Dec 2, 2022
12f0033
SRF->MRC changes compiling -- still some python errors
drobison00 Dec 6, 2022
4e034ac
Additional SRF->MRC conversions
drobison00 Dec 6, 2022
6d5e221
Add MRC config -- currently working if we install mrc directly and bu…
drobison00 Dec 7, 2022
81afaa0
Merge utilities updates
drobison00 Dec 7, 2022
6ee23e6
Update to use submodules
drobison00 Dec 8, 2022
d59e28d
Remove local cmake Configure
drobison00 Dec 8, 2022
a983414
Fix modules path
drobison00 Dec 8, 2022
bf953f4
Merge branch 'branch-23.01' into devin_issue_496_mrc_refactor
drobison00 Dec 9, 2022
d4dc62b
Build updates
drobison00 Dec 12, 2022
31fe7a5
Merge MRC migration base
drobison00 Dec 12, 2022
edfdea1
Update utilities repo tag, cleanup cmakelists
drobison00 Dec 12, 2022
1c55054
Consolidate scripts
drobison00 Dec 13, 2022
6e93745
Migrate more common scripts to utilities
drobison00 Dec 13, 2022
dabb100
Updates for final merge PR
drobison00 Dec 13, 2022
b91165e
Updates for final merge PR
drobison00 Dec 13, 2022
e60f5b9
Updates for final merge PR
drobison00 Dec 13, 2022
1cd0f04
Merge branch 'branch-23.01' into devin_issue_496_mrc_refactor
drobison00 Dec 13, 2022
1168775
Merge with mrc migration branch
drobison00 Dec 13, 2022
a6c885f
Update utilities
drobison00 Dec 13, 2022
b38058f
Formatting fixes
drobison00 Dec 13, 2022
c40ac86
Merge branch 'devin_issue_496_mrc_refactor' into devin_issue_87_mrc_r…
drobison00 Dec 13, 2022
7597924
Merge with branch-23.01
drobison00 Dec 13, 2022
918b5ab
Merge branch 'devin_issue_496_mrc_refactor' into devin_issue_87_mrc_r…
drobison00 Dec 13, 2022
d088828
Update external utils
drobison00 Dec 13, 2022
c419486
Update formatting
drobison00 Dec 13, 2022
e48d745
Merge branch 'devin_issue_496_mrc_refactor' into devin_issue_87_mrc_r…
drobison00 Dec 13, 2022
9293171
Formatting fixes
drobison00 Dec 14, 2022
ecdb6b7
Merge branch 'branch-23.01' into devin_issue_496_mrc_refactor
drobison00 Dec 14, 2022
88df477
Merge branch 'devin_issue_496_mrc_refactor' into devin_issue_87_mrc_r…
drobison00 Dec 14, 2022
a3f25f8
Bump utilities repo, add cmake debugging flags
drobison00 Dec 14, 2022
3dba9fb
Bump utilities version
drobison00 Dec 14, 2022
de12859
Syncing MRC and Morpheus .clang-format
mdemoret-nv Dec 14, 2022
649daec
Update CONTRIBUTING.md
drobison00 Dec 14, 2022
181ce01
Merge latest 23.01
drobison00 Dec 16, 2022
66514f5
Bump utilities repo version
drobison00 Dec 16, 2022
99196c6
Update CMakeLists.txt
drobison00 Dec 17, 2022
77703a0
PR feedback updates, utilitis repo bump
drobison00 Dec 17, 2022
ad4c3f4
Migrate a few more files to utilities, bump utils repo version
drobison00 Dec 19, 2022
e826167
Docs update
drobison00 Dec 19, 2022
690cb0d
Roll back Sphinx deps as default cuda11.5 environment deps
drobison00 Dec 20, 2022
e0760cb
Update morpheus to use new package creation code, bump utilities version
drobison00 Dec 20, 2022
4694c12
Update git modules versions
drobison00 Dec 20, 2022
8665f04
Bump utils repo version
drobison00 Dec 20, 2022
758426e
Merge branch 'branch-23.01' into devin_issue_87_mrc_rebase_branch
drobison00 Jan 6, 2023
6b13a4b
Merge with branch-23.01, bump utilities version
drobison00 Jan 6, 2023
498b85c
Roll to utilities branch 23.01
drobison00 Jan 6, 2023
7ddd8e6
Formatting fixes
drobison00 Jan 6, 2023
2de7319
Merge 23.01
drobison00 Jan 17, 2023
82e71bd
Update build scripts to update and initialize sub-repos
drobison00 Jan 17, 2023
80dbc8e
Update setup.py to ignore flake8 E402 errors
drobison00 Jan 17, 2023
ac0b506
Build fix
drobison00 Jan 17, 2023
31cf9c8
Formatting fix
drobison00 Jan 17, 2023
ba1fe2b
Update CI to default to cuda arch all
drobison00 Jan 17, 2023
396c06e
Add subset of compute caps to build for in CI
drobison00 Jan 17, 2023
9a236e2
CI tweak
drobison00 Jan 17, 2023
b8c0943
Merge branch-23.01
drobison00 Jan 23, 2023
94f0a54
Update utilities for build_wheel fix, and add Morpheus option for CI …
drobison00 Jan 24, 2023
77633ad
more dist updates
drobison00 Jan 24, 2023
dec6d6c
Merge branch 'branch-23.01' into devin_issue_87_mrc_rebase_branch
drobison00 Jan 24, 2023
dfc1933
Tweak CI morpheus wheel installation
drobison00 Jan 24, 2023
27d0bac
Fix python install to include morpheus testing data
drobison00 Jan 24, 2023
a528e02
Update submodule url to be portable across forks
drobison00 Jan 24, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
SRF->MRC changes compiling -- still some python errors
  • Loading branch information
@drobison00
drobison00 committed Dec 6, 2022
commit 12f0033302b12b1e53b4d91a4c926cd932c481dc
6 changes: 3 additions & 3 deletions cmake/dependencies.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,10 +101,10 @@ include(deps/Configure_pybind11)
set(RDKAFKA_VERSION 1.6.2)
include(deps/Configure_rdkafka)

# SRF (Should come after all third party but before NVIDIA repos)
# MRC (Should come after all third party but before NVIDIA repos)
# =====
set(SRF_VERSION 22.11 CACHE STRING "Which version of SRF to use")
include(deps/Configure_srf)
set(MRC_VERSION 23.01 CACHE STRING "Which version of MRC to use")
include(deps/Configure_mrc)

# CuDF
# =====
Expand Down
6 changes: 3 additions & 3 deletions morpheus/_lib/cmake/libraries/cuda_utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,14 +37,14 @@ target_include_directories(cuda_utils_objs
"${MORPHEUS_LIB_ROOT}/include"
cudf::cudf
matx::matx
srf::pysrf
mrc::pymrc
)

target_link_libraries(cuda_utils_objs
PUBLIC
cudf::cudf
matx::matx
srf::pysrf
mrc::pymrc
)

add_library(cuda_utils
Expand All @@ -64,7 +64,7 @@ target_include_directories(cuda_utils

target_link_libraries(cuda_utils
PUBLIC
srf::pysrf
mrc::pymrc
matx::matx
cudf::cudf
Python3::NumPy
Expand Down
2 changes: 1 addition & 1 deletion morpheus/_lib/cmake/python_modules/common.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ morpheus_add_pybind11_module(
"${MORPHEUS_LIB_ROOT}/include"
LINK_TARGETS
morpheus
srf::pysrf
mrc::pymrc
OUTPUT_TARGET
common_target
INSTALL_DEST
Expand Down
2 changes: 1 addition & 1 deletion morpheus/_lib/cmake/python_modules/file_types.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ morpheus_add_pybind11_module(
"${MORPHEUS_LIB_ROOT}/include"
LINK_TARGETS
morpheus
srf::pysrf
mrc::pymrc
OUTPUT_TARGET
file_types_target
INSTALL_DEST
Expand Down
2 changes: 1 addition & 1 deletion morpheus/_lib/cmake/python_modules/messages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ morpheus_add_pybind11_module(
"${MORPHEUS_LIB_ROOT}/include"
LINK_TARGETS
morpheus
srf::pysrf
mrc::pymrc
OUTPUT_TARGET
messages_target
INSTALL_DEST
Expand Down
2 changes: 1 addition & 1 deletion morpheus/_lib/cmake/python_modules/stages.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ morpheus_add_pybind11_module(
"${MORPHEUS_LIB_ROOT}/include"
LINK_TARGETS
morpheus
srf::pysrf
mrc::pymrc
OUTPUT_TARGET
stages_target
INSTALL_DEST
Expand Down
Loading