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

[RELEASE] Morpheus v22.06 #237

Merged
merged 83 commits into from
Jul 5, 2022
Merged
Show file tree
Hide file tree
Changes from 73 commits
Commits
Show all changes
83 commits
Select commit Hold shift + click to select a range
54a1059
Creating 22.06 branch
mdemoret-nv Apr 26, 2022
d665158
Update license header to Apache v2
dagardner-nv Apr 26, 2022
322d8a4
Fix path to log_parsing
dagardner-nv Apr 26, 2022
45964ba
Merge branch 'branch-22.04' into david-log-parsing-ex2
dagardner-nv Apr 27, 2022
7356a73
Formatting
dagardner-nv Apr 27, 2022
454f7d2
Removed unused SubwordTokenizer per feedback from Eli
dagardner-nv Apr 27, 2022
721b4d0
Merge branch 'branch-22.04' into branch-22.06
mdemoret-nv Apr 27, 2022
3603da7
README changes
BartleyR Apr 28, 2022
d338078
Updated README with docs link
BartleyR Apr 28, 2022
b6c78a6
README updates for clarity
BartleyR Apr 28, 2022
f1de88f
Install new apt key
dagardner-nv Apr 28, 2022
182edf3
Merge branch 'branch-22.06' into david-fix-docker
dagardner-nv Apr 28, 2022
e217d92
docs: small fixes in README.md and CONTRIBUTING.md
lobotmcj Apr 28, 2022
60e430e
Update README.md
pdmack Apr 29, 2022
b779c3d
Merge pull request #71 from BartleyR/branch-22.06
BartleyR Apr 29, 2022
ceb479f
Fixed URL to NGC Morpheus collection
BartleyR Apr 29, 2022
5cb5fc3
Updated Docker to fix upstream key rotation from CUDA images
BartleyR Apr 29, 2022
df49557
Merge remote-tracking branch 'nvidia/branch-22.06' into branch-22.06
lobotmcj Apr 29, 2022
89725e2
Minor typo in log parsing example
BartleyR May 2, 2022
d61f9ab
Corrected several typos and incorrect references/styles in README.md …
BartleyR May 2, 2022
0c38827
Rename mlflow conda env file
pdmack May 4, 2022
8040ef0
* Update version fo triton (#61)
dagardner-nv May 4, 2022
f5bf0ff
Clear the log handlers on both the root and morpheus logger after eac…
dagardner-nv May 4, 2022
0a90a72
Revert "Install new apt key" (#79)
dagardner-nv May 4, 2022
4fb46ee
Merge pull request #82 from pdmack/pdmack_mlflow-env-file
mdemoret-nv May 5, 2022
6d497a4
Updates to README.md for clarity (#91)
BartleyR May 6, 2022
a575067
Update hammah-inference.py (#90)
pdmack May 10, 2022
13d0527
Apply enterprise sphinx html theme to docs (#97)
efajardo-nv May 12, 2022
34b2825
Add pybind11/cython stubs to Morpheus package (#100)
mdemoret-nv May 13, 2022
6b56c9a
Reorganize the python package files (#98)
mdemoret-nv May 13, 2022
bd60e5d
Update morpheus dev container to support flag for building with debug…
drobison00 May 17, 2022
820258d
Update morpheus_quickstart_guide.md (#106)
pdmack May 17, 2022
77a5918
Add pybind11-stubgen to conda environment yaml. (#109)
drobison00 May 17, 2022
91225b9
Update mlflow-env.yml (#113)
pdmack May 18, 2022
c52cb24
Jenkins integration (#80)
dagardner-nv May 23, 2022
23fe46a
Updating CODEOWNERS for New Organization (#118)
mdemoret-nv May 23, 2022
d46382b
Updates to developer_guide for clarity. (#96)
lobotmcj May 23, 2022
38428c3
Ensure default path values in morpheus.cli are no longer relative (#62)
dagardner-nv May 27, 2022
2710f93
Add script to capture triton config (#116)
pdmack May 27, 2022
81bb6d1
Set Python3_FIND_STRATEGY=Location (#131)
dagardner-nv May 27, 2022
fd24e3e
Migrate Neo's tensor code directly into Morpheus (#129)
dagardner-nv May 31, 2022
0bb7910
Update morpheus_quickstart_guide.md (#127)
bsuryadevara Jun 1, 2022
36af32c
AppShieldSource stage (#136)
bsuryadevara Jun 3, 2022
b94bd9b
Split data dir, moving large files into examples/data (#130)
dagardner-nv Jun 7, 2022
55edc6a
Fixes Timestamp Nodes When Running with `--debug` (#145)
mdemoret-nv Jun 8, 2022
1a1be1a
Limit which lfs assets are pulled by default (#139)
dagardner-nv Jun 8, 2022
fc243ce
Jenkins improvememts (#107)
dagardner-nv Jun 8, 2022
3042621
Update ops-bot.yaml
ajschmidt8 Jun 13, 2022
33a938c
Fix for CI check script (#158)
dagardner-nv Jun 13, 2022
3354cf0
update cudf to 22.04, cuda to 11.5 (#148)
cwharris Jun 13, 2022
075c5ba
remove ssh instructions from CONTRIBUTING guide (#162)
cwharris Jun 14, 2022
fa67e6d
Update mlflow-env.yml (#146)
pdmack Jun 14, 2022
b4023b5
Dockerfile COPY section needs update (#141)
pdmack Jun 15, 2022
4248ed8
Update cuda11.5_dev.yml (#167)
pdmack Jun 15, 2022
849ee2b
Adding in pybind11-stubgen to the conda package (#163)
mdemoret-nv Jun 15, 2022
83cf138
Include C++ Unittests in CI (#135)
dagardner-nv Jun 17, 2022
526f80d
Update morpheus_quickstart_guide.md (#142)
pdmack Jun 17, 2022
10e3fa7
release container build fixes (#164)
cwharris Jun 21, 2022
25f401f
Update Morpheus to Use SRF 22.06 (#152)
mdemoret-nv Jun 21, 2022
e1c75dd
Add missing git-lfs package to docker container (#179)
dagardner-nv Jun 23, 2022
c2a1eb8
Update to rapids 22.06 (#180)
cwharris Jun 23, 2022
75fcb9f
Rollback CI images and fix dev container (#191)
cwharris Jun 24, 2022
cee6ca0
Adding new SRF cmake variables (#198)
mdemoret-nv Jun 27, 2022
9fba09c
Fix GNN example and update installation instructions (#189)
cwharris Jun 27, 2022
d35593c
nlp_si_detection example improvements (#193)
dagardner-nv Jun 27, 2022
f6e9873
Update GNN FSI pipeline example & notebook. (#182)
tzemicheal Jun 27, 2022
2a96c11
Ransomware detection pipeline (#149)
bsuryadevara Jun 28, 2022
8a40730
Use git version 2.35.3 in release build (#224)
mdemoret-nv Jun 28, 2022
30f275e
ransomware ds requirements (#196)
raykallen Jun 28, 2022
010f011
Documentation fixes (#147)
dagardner-nv Jun 28, 2022
ec8afcd
Fixes Pipeline.visualize (#203)
dagardner-nv Jun 28, 2022
f468c01
Revert ransomware feature config changes (#234)
bsuryadevara Jun 29, 2022
7684908
Add CLI Relative Path Fallback (#232)
mdemoret-nv Jun 29, 2022
35f01d3
Missing 'supports_cpp_node' impl function (#239)
bsuryadevara Jun 29, 2022
4906d5e
Pin cuda-python to 11.7.0 (#246)
dagardner-nv Jun 30, 2022
ac015d0
Move Morpheus Data Files Out of LFS (#242)
mdemoret-nv Jun 30, 2022
df07349
Fixing `to-kafka` Stage by Converting to a Pass Through Node (#245)
mdemoret-nv Jun 30, 2022
22ddb57
Pin Conda Package `cuda-python <=11.7.0` to Fix Conda Build (#252)
mdemoret-nv Jun 30, 2022
0030a1d
Fix 22.06 style checks (#249)
mdemoret-nv Jun 30, 2022
cb12889
Fixing the from-kafka stage (#257)
mdemoret-nv Jul 5, 2022
00541f6
Fixing Python Kafka Source with Multiple Threads (#262)
mdemoret-nv Jul 5, 2022
eba4037
Fixing Outstanding Style Errors (#261)
mdemoret-nv Jul 5, 2022
45a3c38
Updating CHANGELOG
mdemoret-nv Jul 5, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
Checks: -*,readability-identifier-naming,modernize-*,-modernize-use-trailing-return-type,-modernize-use-nodiscard,google-readability-todo

#WarningsAsErrors: '*'
HeaderFilterRegex: '.*\/include\/trtlab\/neo\/.*'
HeaderFilterRegex: '.*\/include\/morpheus\/.*'
AnalyzeTemporaryDtors: false
FormatStyle: file
CheckOptions:
Expand Down
5 changes: 3 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
examples/data/** filter=lfs diff=lfs merge=lfs -text
morpheus/_version.py export-subst
data/* filter=lfs diff=lfs merge=lfs -text
tests/expected_data/* filter=lfs diff=lfs merge=lfs -text
morpheus/data/* filter=lfs diff=lfs merge=lfs -text
tests/mock_triton_server/payloads/** filter=lfs diff=lfs merge=lfs -text
tests/tests_data/** filter=lfs diff=lfs merge=lfs -text
17 changes: 11 additions & 6 deletions .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,10 +1,15 @@
# Default Approval rule if one of the later sections does not apply
* @BartleyR @mdemoret-nv @pdmack @raykallen
* @nv-morpheus/morpheus-codeowners

# Engineering is requried for changes to the following
/morpheus/ @BartleyR @mdemoret-nv @pdmack @bsuryadevara @dagardner-nv @drobison00 @efajardo-nv @cwharris
/cmake/ @BartleyR @mdemoret-nv @pdmack @bsuryadevara @dagardner-nv @drobison00 @efajardo-nv @cwharris
/tests/ @BartleyR @mdemoret-nv @pdmack @bsuryadevara @dagardner-nv @drobison00 @efajardo-nv @cwharris
# Engineering is requried for changes to the following:
/ci/ @nv-morpheus/morpheus-codeowners-eng
/cmake/ @nv-morpheus/morpheus-codeowners-eng
/docker/ @nv-morpheus/morpheus-codeowners-eng
/docs/ @nv-morpheus/morpheus-codeowners-eng
/examples/ @nv-morpheus/morpheus-codeowners-eng
/morpheus/ @nv-morpheus/morpheus-codeowners-eng
/scripts/ @nv-morpheus/morpheus-codeowners-eng
/tests/ @nv-morpheus/morpheus-codeowners-eng

# Data Science is requried for changes to `models`
/models/ @BartleyR @mdemoret-nv @pdmack @bsuryadevara @raykallen @gbatmaz @tzemicheal
/models/ @nv-morpheus/morpheus-codeowners-ds
3 changes: 2 additions & 1 deletion .github/ops-bot.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -5,4 +5,5 @@ auto_merger: true
branch_checker: true
label_checker: true
release_drafter: true
external_contributors: false
copy_prs: true
rerun_tests: true
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -196,6 +196,9 @@ mlruns/*
/conda-build/
.conda-bld

# Ignore generated pyi files for pybind and cython modules
morpheus/_lib/**/*.pyi

# Explicitly ignore .vscode/settings.json and .vscode/launch.json. Shared settings should go in morpheus.code-workspace
# and user settings will go in .vscode/launch.json and .vscode/settings.json
.vscode/settings.json
Expand Down
2 changes: 2 additions & 0 deletions .lfsconfig
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[lfs]
fetchinclude = morpheus/data/*
2 changes: 1 addition & 1 deletion .pylintrc
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
# A comma-separated list of package or module names from where C extensions may
# be loaded. Extensions are loading into the active Python interpreter and may
# run arbitrary code.
extension-pkg-allow-list=neo,morpheus._lib
extension-pkg-allow-list=srf,morpheus._lib

# Specify a score threshold to be exceeded before program exits with error.
fail-under=10
Expand Down
13 changes: 13 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ option(BUILD_SHARED_LIBS "Default value for whether or not to build shared or st
option(MORPHEUS_BUILD_BENCHMARKS "Whether or not to build benchmarks" OFF)
option(MORPHEUS_BUILD_EXAMPLES "Whether or not to build examples" OFF)
option(MORPHEUS_BUILD_TESTS "Whether or not to build tests" OFF)
option(MORPHEUS_BUILD_PYTHON_STUBS "Whether or not to generated .pyi stub files for C++ Python modules. Disable to avoid requiring loading the NVIDIA GPU Driver during build" ON)
option(MORPHEUS_USE_CCACHE "Enable caching compilation results with ccache" OFF)
option(MORPHEUS_USE_CLANG_TIDY "Enable running clang-tidy as part of the build process" OFF)
option(MORPHEUS_USE_CONDA "Enables finding dependencies via conda instead of vcpkg.
Expand All @@ -39,6 +40,8 @@ set(CMAKE_CXX_EXTENSIONS ON)
set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
set(CMAKE_POSITION_INDEPENDENT_CODE TRUE)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
set(CMAKE_BUILD_RPATH_USE_ORIGIN TRUE)
set(CMAKE_INSTALL_RPATH "$ORIGIN")

enable_testing()

Expand Down Expand Up @@ -71,6 +74,12 @@ include(cmake/dependencies.cmake)
# - Post dependencies setup --------
include(cmake/setup_compiler.cmake)

# To make it easier for CI to find output files, set the default executable suffix to .x if not set
if("${CMAKE_EXECUTABLE_SUFFIX}" STREQUAL "")
set(CMAKE_EXECUTABLE_SUFFIX ".x")
endif()


##################################
##### Morpheus Python Setup ######
##################################
Expand All @@ -85,13 +94,15 @@ file(GLOB_RECURSE MORPHEUS_PYTHON_FILES
LIST_DIRECTORIES FALSE
CONFIGURE_DEPENDS
"morpheus/*.py"
"morpheus/py.typed"
)

set(MORPHEUS_ROOT_PYTHON_FILES
"pyproject.toml"
"setup.cfg"
"setup.py"
"versioneer.py"
"MANIFEST.in"
)

# Add the root python files to the list
Expand Down Expand Up @@ -132,6 +143,8 @@ install(
COMPONENT Wheel
FILES_MATCHING
PATTERN "*.py"
PATTERN "py.typed"
PATTERN "data/*"
)


Expand Down
Loading