Skip to content

Commit 056d70b

Browse files
dagardner-nvdagardner-nv
committed
Merge branch-24.03 into branch-24.06
2 parents 752e85f + 3a6fb76 commit 056d70b

File tree

186 files changed

+3457
-1126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

186 files changed

+3457
-1126
lines changed

‎.github/workflows/pr.yaml

+3-2
Original file line numberDiff line numberDiff line change
@@ -72,10 +72,11 @@ jobs:
7272
pr_info: ${{ steps.get-pr-info.outcome == 'success' && steps.get-pr-info.outputs.pr-info || '' }}
7373

7474
checks:
75+
needs: [prepare]
76+
# Only run the CI pipeline if the PR does not have the skip-ci label and we are on a PR branch
77+
if: ${{ !fromJSON(needs.prepare.outputs.has_skip_ci_label) && fromJSON(needs.prepare.outputs.is_pr )}}
7578
secrets: inherit
7679
uses: rapidsai/shared-workflows/.github/workflows/[email protected]
77-
# Only run the CI pipeline if the PR does not have the skip-ci label
78-
if: ${{ ! fromJSON(needs.prepare.outputs.has_skip_ci_label) }}
7980
with:
8081
enable_check_generated_files: false
8182

‎CHANGELOG.md

+87
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,93 @@ See the License for the specific language governing permissions and
1515
limitations under the License.
1616
-->
1717

18+
# Morpheus 24.03.00 (7 Apr 2024)
19+
20+
## 🚨 Breaking Changes
21+
22+
- Updating `nlohman_json` to 3.11 to match MRC ([#1596](https://github.com/nv-morpheus/Morpheus/pull/1596)) [@mdemoret-nv](https://github.com/mdemoret-nv)
23+
- Add retry logic and proxy support to the NeMo LLM Service ([#1544](https://github.com/nv-morpheus/Morpheus/pull/1544)) [@mdemoret-nv](https://github.com/mdemoret-nv)
24+
- Upgrade `openai` version to 1.13 and `langchain` to version 0.1.9 ([#1529](https://github.com/nv-morpheus/Morpheus/pull/1529)) [@mdemoret-nv](https://github.com/mdemoret-nv)
25+
- Make `start_async()` available to source stages ([#1523](https://github.com/nv-morpheus/Morpheus/pull/1523)) [@efajardo-nv](https://github.com/efajardo-nv)
26+
- RAPIDS 24.02 Upgrade ([#1468](https://github.com/nv-morpheus/Morpheus/pull/1468)) [@cwharris](https://github.com/cwharris)
27+
- Decouple TritonInferenceStage from pipeline mode ([#1402](https://github.com/nv-morpheus/Morpheus/pull/1402)) [@dagardner-nv](https://github.com/dagardner-nv)
28+
29+
## 🐛 Bug Fixes
30+
31+
- Serialize datetime objects into the module config ([#1592](https://github.com/nv-morpheus/Morpheus/pull/1592)) [@dagardner-nv](https://github.com/dagardner-nv)
32+
- Remove the defaults channel from `dependencies.yml` ([#1584](https://github.com/nv-morpheus/Morpheus/pull/1584)) [@mdemoret-nv](https://github.com/mdemoret-nv)
33+
- Fix `iso_date_regex_pattern` config in `file_batcher` module and allow override ([#1580](https://github.com/nv-morpheus/Morpheus/pull/1580)) [@efajardo-nv](https://github.com/efajardo-nv)
34+
- Update DFP MLflow ModelManager to handle model retrieval using file URI ([#1578](https://github.com/nv-morpheus/Morpheus/pull/1578)) [@efajardo-nv](https://github.com/efajardo-nv)
35+
- Fix `configure_logging` in DFP benchmarks ([#1553](https://github.com/nv-morpheus/Morpheus/pull/1553)) [@efajardo-nv](https://github.com/efajardo-nv)
36+
- Catch langchain agent errors ([#1539](https://github.com/nv-morpheus/Morpheus/pull/1539)) [@dagardner-nv](https://github.com/dagardner-nv)
37+
- Adding missing dependency on `pydantic` ([#1535](https://github.com/nv-morpheus/Morpheus/pull/1535)) [@yuchenz427](https://github.com/yuchenz427)
38+
- Fix memory leak in the mutable dataframe checkout/checkin code ([#1534](https://github.com/nv-morpheus/Morpheus/pull/1534)) [@dagardner-nv](https://github.com/dagardner-nv)
39+
- Fix pathlib.Path support for FileSourceStage ([#1531](https://github.com/nv-morpheus/Morpheus/pull/1531)) [@dagardner-nv](https://github.com/dagardner-nv)
40+
- Make `start_async()` available to source stages ([#1523](https://github.com/nv-morpheus/Morpheus/pull/1523)) [@efajardo-nv](https://github.com/efajardo-nv)
41+
- Update CI Containers ([#1521](https://github.com/nv-morpheus/Morpheus/pull/1521)) [@cwharris](https://github.com/cwharris)
42+
- Fix intermittent segfault on interpreter shutdown ([#1513](https://github.com/nv-morpheus/Morpheus/pull/1513)) [@dagardner-nv](https://github.com/dagardner-nv)
43+
- Adopt updated builds of CI runners ([#1503](https://github.com/nv-morpheus/Morpheus/pull/1503)) [@dagardner-nv](https://github.com/dagardner-nv)
44+
- Update mlflow plugin version for deployments fix ([#1499](https://github.com/nv-morpheus/Morpheus/pull/1499)) [@pdmack](https://github.com/pdmack)
45+
- Add runtime environment output to fix building the release container ([#1496](https://github.com/nv-morpheus/Morpheus/pull/1496)) [@cwharris](https://github.com/cwharris)
46+
- Fix logging of sleep time ([#1493](https://github.com/nv-morpheus/Morpheus/pull/1493)) [@dagardner-nv](https://github.com/dagardner-nv)
47+
- Pin pytest to <8 ([#1485](https://github.com/nv-morpheus/Morpheus/pull/1485)) [@dagardner-nv](https://github.com/dagardner-nv)
48+
- Improve pipeline stop logic to ensure join is called exactly once for all stages ([#1479](https://github.com/nv-morpheus/Morpheus/pull/1479)) [@efajardo-nv](https://github.com/efajardo-nv)
49+
- Fix expected JSON config file extension in logger ([#1471](https://github.com/nv-morpheus/Morpheus/pull/1471)) [@efajardo-nv](https://github.com/efajardo-nv)
50+
- Fix Loss Function to Improve Model Convergence for `AutoEncoder` ([#1460](https://github.com/nv-morpheus/Morpheus/pull/1460)) [@hsin-c](https://github.com/hsin-c)
51+
- GNN fraud detection notebook fix ([#1450](https://github.com/nv-morpheus/Morpheus/pull/1450)) [@efajardo-nv](https://github.com/efajardo-nv)
52+
- Eliminate Redundant Fetches in RSS Controller ([#1442](https://github.com/nv-morpheus/Morpheus/pull/1442)) [@bsuryadevara](https://github.com/bsuryadevara)
53+
- Updating the workspace settings to remove deprecated python options ([#1440](https://github.com/nv-morpheus/Morpheus/pull/1440)) [@mdemoret-nv](https://github.com/mdemoret-nv)
54+
- Improve camouflage startup issues ([#1436](https://github.com/nv-morpheus/Morpheus/pull/1436)) [@dagardner-nv](https://github.com/dagardner-nv)
55+
- Fixes to modular DFP examples and benchmarks ([#1429](https://github.com/nv-morpheus/Morpheus/pull/1429)) [@efajardo-nv](https://github.com/efajardo-nv)
56+
57+
## 📖 Documentation
58+
59+
- Update minimum compute requirements to Volta ([#1594](https://github.com/nv-morpheus/Morpheus/pull/1594)) [@dagardner-nv](https://github.com/dagardner-nv)
60+
- Fix broken link in getting started with Morpheus doc ([#1494](https://github.com/nv-morpheus/Morpheus/pull/1494)) [@edknv](https://github.com/edknv)
61+
- Update abp-model-card.md ([#1439](https://github.com/nv-morpheus/Morpheus/pull/1439)) [@drobison00](https://github.com/drobison00)
62+
- Update gnn-fsi-model-card.md ([#1438](https://github.com/nv-morpheus/Morpheus/pull/1438)) [@drobison00](https://github.com/drobison00)
63+
- Update phishing-model-card.md ([#1437](https://github.com/nv-morpheus/Morpheus/pull/1437)) [@drobison00](https://github.com/drobison00)
64+
- Document incompatible mlflow models issue ([#1434](https://github.com/nv-morpheus/Morpheus/pull/1434)) [@dagardner-nv](https://github.com/dagardner-nv)
65+
66+
## 🚀 New Features
67+
68+
- Adding retry logic to the `TritonInferenceStage` to allow recovering from errors ([#1548](https://github.com/nv-morpheus/Morpheus/pull/1548)) [@cwharris](https://github.com/cwharris)
69+
- Create a base mixin class for ingress & egress stages ([#1473](https://github.com/nv-morpheus/Morpheus/pull/1473)) [@dagardner-nv](https://github.com/dagardner-nv)
70+
- RAPIDS 24.02 Upgrade ([#1468](https://github.com/nv-morpheus/Morpheus/pull/1468)) [@cwharris](https://github.com/cwharris)
71+
- Install headers & morpheus-config.cmake ([#1448](https://github.com/nv-morpheus/Morpheus/pull/1448)) [@dagardner-nv](https://github.com/dagardner-nv)
72+
73+
## 🛠️ Improvements
74+
75+
- Updating `nlohman_json` to 3.11 to match MRC ([#1596](https://github.com/nv-morpheus/Morpheus/pull/1596)) [@mdemoret-nv](https://github.com/mdemoret-nv)
76+
- DOCA 2.6 from public repo ([#1588](https://github.com/nv-morpheus/Morpheus/pull/1588)) [@e-ago](https://github.com/e-ago)
77+
- Support `ControlMessage` for `PreProcessNLPStage` `PreProcessFILStage` `AddScoreStageBase` ([#1573](https://github.com/nv-morpheus/Morpheus/pull/1573)) [@yuchenz427](https://github.com/yuchenz427)
78+
- Update MLflow in Production DFP example to use Python 3.10 ([#1572](https://github.com/nv-morpheus/Morpheus/pull/1572)) [@efajardo-nv](https://github.com/efajardo-nv)
79+
- Fix environment yaml paths ([#1551](https://github.com/nv-morpheus/Morpheus/pull/1551)) [@efajardo-nv](https://github.com/efajardo-nv)
80+
- Add retry logic and proxy support to the NeMo LLM Service ([#1544](https://github.com/nv-morpheus/Morpheus/pull/1544)) [@mdemoret-nv](https://github.com/mdemoret-nv)
81+
- Update to match new MRC function sig for AsyncioRunnable::on_data ([#1541](https://github.com/nv-morpheus/Morpheus/pull/1541)) [@dagardner-nv](https://github.com/dagardner-nv)
82+
- Expose max_retries parameter to OpenAIChatService & OpenAIChatClient ([#1536](https://github.com/nv-morpheus/Morpheus/pull/1536)) [@dagardner-nv](https://github.com/dagardner-nv)
83+
- Upgrade `openai` version to 1.13 and `langchain` to version 0.1.9 ([#1529](https://github.com/nv-morpheus/Morpheus/pull/1529)) [@mdemoret-nv](https://github.com/mdemoret-nv)
84+
- Update ops-bot.yaml ([#1528](https://github.com/nv-morpheus/Morpheus/pull/1528)) [@AyodeAwe](https://github.com/AyodeAwe)
85+
- Add the ability to attach Tensor objects and timestamps to `ControlMessage` ([#1511](https://github.com/nv-morpheus/Morpheus/pull/1511)) [@drobison00](https://github.com/drobison00)
86+
- Fix or silence warnings emitted during tests ([#1501](https://github.com/nv-morpheus/Morpheus/pull/1501)) [@dagardner-nv](https://github.com/dagardner-nv)
87+
- Support ControlMessage output in the C++ impl of DeserializeStage ([#1478](https://github.com/nv-morpheus/Morpheus/pull/1478)) [@dagardner-nv](https://github.com/dagardner-nv)
88+
- DOCA Source Stage improvements ([#1475](https://github.com/nv-morpheus/Morpheus/pull/1475)) [@e-ago](https://github.com/e-ago)
89+
- Update copyright headers for 2024 ([#1474](https://github.com/nv-morpheus/Morpheus/pull/1474)) [@efajardo-nv](https://github.com/efajardo-nv)
90+
- Add conda builds to CI ([#1466](https://github.com/nv-morpheus/Morpheus/pull/1466)) [@dagardner-nv](https://github.com/dagardner-nv)
91+
- Grafana log monitoring and error alerting example ([#1463](https://github.com/nv-morpheus/Morpheus/pull/1463)) [@efajardo-nv](https://github.com/efajardo-nv)
92+
- Misc Conda Improvements ([#1462](https://github.com/nv-morpheus/Morpheus/pull/1462)) [@dagardner-nv](https://github.com/dagardner-nv)
93+
- Simplification of the streaming RAG ingest example to improve usability ([#1454](https://github.com/nv-morpheus/Morpheus/pull/1454)) [@drobison00](https://github.com/drobison00)
94+
- Replace GPUtil with pynvml for benchmark reports ([#1451](https://github.com/nv-morpheus/Morpheus/pull/1451)) [@efajardo-nv](https://github.com/efajardo-nv)
95+
- Misc test improvements ([#1447](https://github.com/nv-morpheus/Morpheus/pull/1447)) [@dagardner-nv](https://github.com/dagardner-nv)
96+
- Add a --manual_seed flag to the CLI ([#1445](https://github.com/nv-morpheus/Morpheus/pull/1445)) [@dagardner-nv](https://github.com/dagardner-nv)
97+
- Optionally skip ci based on a label in the pr ([#1444](https://github.com/nv-morpheus/Morpheus/pull/1444)) [@dagardner-nv](https://github.com/dagardner-nv)
98+
- Refactor verification of optional dependencies ([#1443](https://github.com/nv-morpheus/Morpheus/pull/1443)) [@dagardner-nv](https://github.com/dagardner-nv)
99+
- Use dependencies.yaml as source-of-truth for environment files. ([#1441](https://github.com/nv-morpheus/Morpheus/pull/1441)) [@cwharris](https://github.com/cwharris)
100+
- Add mocked test & benchmark for LLM agents pipeline ([#1424](https://github.com/nv-morpheus/Morpheus/pull/1424)) [@dagardner-nv](https://github.com/dagardner-nv)
101+
- Add benchmarks for stand-alone RAG & vdb upload pipelines ([#1421](https://github.com/nv-morpheus/Morpheus/pull/1421)) [@dagardner-nv](https://github.com/dagardner-nv)
102+
- Add benchmark for completion pipeline ([#1414](https://github.com/nv-morpheus/Morpheus/pull/1414)) [@dagardner-nv](https://github.com/dagardner-nv)
103+
- Decouple TritonInferenceStage from pipeline mode ([#1402](https://github.com/nv-morpheus/Morpheus/pull/1402)) [@dagardner-nv](https://github.com/dagardner-nv)
104+
18105
# Morpheus 23.11.01 (7 Dec 2023)
19106

20107
## 🐛 Bug Fixes

‎ci/iwyu/mappings.imp

+4-35
Original file line numberDiff line numberDiff line change
@@ -52,41 +52,10 @@
5252

5353
# rxcpp
5454
# Hide includes that are exported by <rxcpp/rx.hpp>
55-
{ "include": [ "\"rx-includes.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
56-
{ "include": [ "<rxcpp/rx-util.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
57-
{ "include": [ "\"rxcpp/rx-util.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
58-
{ "include": [ "<rxcpp/rx-predef.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
59-
{ "include": [ "\"rxcpp/rx-predef.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
60-
{ "include": [ "<rxcpp/rx-subscription.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
61-
{ "include": [ "\"rxcpp/rx-subscription.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
62-
{ "include": [ "<rx-observable.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
63-
{ "include": [ "<rx-observer.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
64-
{ "include": [ "<rxcpp/rx-observer.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
65-
{ "include": [ "\"rxcpp/rx-observer.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
66-
{ "include": [ "<rx-operators.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
67-
{ "include": [ "<rx-predef.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
68-
{ "include": [ "<rxcpp/rx-scheduler.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
69-
{ "include": [ "\"rxcpp/rx-scheduler.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
70-
{ "include": [ "<rxcpp/rx-subscriber.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
71-
{ "include": [ "\"rxcpp/rx-subscriber.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
72-
{ "include": [ "<rx-subscriber.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
73-
{ "include": [ "<rxcpp/rx-notification.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
74-
{ "include": [ "\"rxcpp/rx-notification.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
75-
{ "include": [ "<rxcpp/rx-coordination.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
76-
{ "include": [ "\"rxcpp/rx-coordination.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
77-
{ "include": [ "<rxcpp/rx-sources.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
78-
{ "include": [ "\"rxcpp/rx-sources.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
79-
{ "include": [ "<rxcpp/rx-subjects.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
80-
{ "include": [ "\"rxcpp/rx-subjects.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
81-
{ "include": [ "<rxcpp/rx-operators.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
82-
{ "include": [ "\"rxcpp/rx-operators.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
83-
{ "include": [ "<rxcpp/rx-observable.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
84-
{ "include": [ "\"rxcpp/rx-observable.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
85-
{ "include": [ "<rxcpp/rx-connectable_observable.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
86-
{ "include": [ "\"rxcpp/rx-connectable_observable.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
87-
{ "include": [ "<rxcpp/rx-grouped_observable.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
88-
{ "include": [ "\"rxcpp/rx-grouped_observable.hpp\"", private, "<rxcpp/rx.hpp>", "public" ] },
89-
{ "include": [ "<sources/rx-iterate.hpp>", private, "<rxcpp/rx.hpp>", "public" ] },
55+
{ "include": ["@<rxcpp/.*>", "private", "<rxcpp/rx.hpp>", "public" ] },
56+
{ "include": ["@\"rxcpp/.*\"", "private", "<rxcpp/rx.hpp>", "public" ] },
57+
{ "include": ["@<rxcpp/rx-.*>", "private", "<rxcpp/rx.hpp>", "public" ] },
58+
{ "include": ["@\"rxcpp/rx-.*\"", "private", "<rxcpp/rx.hpp>", "public" ] },
9059

9160
#Triton Client
9261
{ "include": ["\"common.h\"", "private", "<http_client.h>", "public"] },

‎cmake/package_config/bsd/Configure_bsd.cmake

+2-6
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ function(morpheus_configure_libbsd)
3232
if (bsd_ADDED)
3333
message(STATUS "libbsd was not installed and will be built from source")
3434

35-
find_package(bsd REQUIRED)
35+
find_package(md REQUIRED)
3636

3737
set(bsd_INSTALL_DIR ${bsd_BINARY_DIR}/install)
3838
file(MAKE_DIRECTORY ${bsd_INSTALL_DIR}/include)
@@ -46,8 +46,6 @@ function(morpheus_configure_libbsd)
4646

4747
cmake_path(GET MD_LIBRARY PARENT_PATH MD_LINK_DIRECTORY)
4848

49-
message(STATUS "MD_LIBRARY: ${MD_LINK_DIRECTORY}")
50-
5149
# Get the Compiler settings to forward onto autoconf
5250
set(COMPILER_SETTINGS
5351
"CXX=${CMAKE_CXX_COMPILER_LAUNCHER} ${CMAKE_CXX_COMPILER}"
@@ -87,7 +85,7 @@ function(morpheus_configure_libbsd)
8785

8886
# Install only the headers
8987
install(
90-
DIRECTORY ${md_INSTALL_DIR}/include
88+
DIRECTORY ${bsd_INSTALL_DIR}/include
9189
TYPE INCLUDE
9290
)
9391

@@ -108,8 +106,6 @@ function(morpheus_configure_libbsd)
108106

109107
add_dependencies(bsd::bsd bsd)
110108

111-
message(STATUS "bsd_INSTALL_DIR: ${bsd_INSTALL_DIR}")
112-
113109
endif()
114110

115111
LIST(POP_BACK CMAKE_MESSAGE_CONTEXT)

‎conda/environments/all_cuda-121_arch-x86_64.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ dependencies:
117117
- --find-links https://data.dgl.ai/wheels-test/repo.html
118118
- --find-links https://data.dgl.ai/wheels/cu121/repo.html
119119
- PyMuPDF==1.23.21
120+
- databricks-cli < 0.100
120121
- databricks-connect
121122
- dgl==2.0.0
122123
- dglgo

‎conda/environments/dev_cuda-121_arch-x86_64.yaml

+4
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ channels:
1010
- pytorch
1111
dependencies:
1212
- appdirs
13+
- automake
1314
- benchmark=1.8.3
1415
- boost-cpp=1.84
1516
- breathe=4.35.0
@@ -43,6 +44,7 @@ dependencies:
4344
- ipython
4445
- isort
4546
- librdkafka>=1.9.2,<1.10.0a0
47+
- libtool
4648
- mlflow=2.9.2
4749
- mrc=24.06
4850
- myst-parser=0.18.1
@@ -72,6 +74,7 @@ dependencies:
7274
- pytorch-cuda
7375
- pytorch=*=*cuda*
7476
- rapidjson=1.1.0
77+
- rdma-core>=48
7578
- requests
7679
- requests-cache=1.1
7780
- requests-toolbelt
@@ -92,6 +95,7 @@ dependencies:
9295
- zlib=1.2.13
9396
- pip:
9497
- PyMuPDF==1.23.21
98+
- databricks-cli < 0.100
9599
- databricks-connect
96100
- milvus==2.3.5
97101
- pymilvus==2.3.6

‎conda/environments/examples_cuda-121_arch-x86_64.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ dependencies:
6161
- --find-links https://data.dgl.ai/wheels-test/repo.html
6262
- --find-links https://data.dgl.ai/wheels/cu121/repo.html
6363
- PyMuPDF==1.23.21
64+
- databricks-cli < 0.100
6465
- databricks-connect
6566
- dgl==2.0.0
6667
- dglgo

‎conda/environments/runtime_cuda-121_arch-x86_64.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ dependencies:
3737
- watchdog=3.0
3838
- websockets
3939
- pip:
40+
- databricks-cli < 0.100
4041
- databricks-connect
4142
- milvus==2.3.5
4243
- pymilvus==2.3.6

‎dependencies.yaml

+2
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,7 @@ files:
5252
- cudatoolkit
5353
- data_retrieval
5454
- development
55+
- doca
5556
- docs
5657
- python
5758
- runtime
@@ -270,6 +271,7 @@ dependencies:
270271
- websockets
271272
- pip
272273
- pip:
274+
- databricks-cli < 0.100
273275
- databricks-connect
274276
- milvus==2.3.5 # update to match pymilvus when available
275277
- pymilvus==2.3.6

‎docker/Dockerfile

-3
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,6 @@ FROM conda_env as base_extended
149149
# Add one or more optional dependencies to the base environment
150150
ARG MORPHEUS_ROOT_HOST
151151
ARG MORPHEUS_SUPPORT_DOCA="FALSE"
152-
ARG DOCA_REPO_HOST
153-
ARG DOCA_VERSION=2.6.0-0.0.1
154-
155152
# Set this environment variable so it auto builds DOCA
156153
ENV MORPHEUS_SUPPORT_DOCA=${MORPHEUS_SUPPORT_DOCA}
157154

‎docker/build_container.sh

-3
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}
3131
CUDA_MAJOR_VER=${CUDA_MAJOR_VER:-12}
3232
CUDA_MINOR_VER=${CUDA_MINOR_VER:-1}
3333
CUDA_REV_VER=${CUDA_REV_VER:-1}
34-
DOCA_REPO_HOST=${DOCA_REPO_HOST:-""}
3534
FROM_IMAGE=${FROM_IMAGE:-"nvidia/cuda"}
3635
LINUX_DISTRO=${LINUX_DISTRO:-ubuntu}
3736
LINUX_VER=${LINUX_VER:-22.04}
@@ -47,7 +46,6 @@ DOCKER_ARGS="${DOCKER_ARGS} --target ${DOCKER_TARGET}"
4746
DOCKER_ARGS="${DOCKER_ARGS} --build-arg CUDA_MAJOR_VER=${CUDA_MAJOR_VER}"
4847
DOCKER_ARGS="${DOCKER_ARGS} --build-arg CUDA_MINOR_VER=${CUDA_MINOR_VER}"
4948
DOCKER_ARGS="${DOCKER_ARGS} --build-arg CUDA_REV_VER=${CUDA_REV_VER}"
50-
DOCKER_ARGS="${DOCKER_ARGS} --build-arg DOCA_REPO_HOST=${DOCA_REPO_HOST}"
5149
DOCKER_ARGS="${DOCKER_ARGS} --build-arg FROM_IMAGE=${FROM_IMAGE}"
5250
DOCKER_ARGS="${DOCKER_ARGS} --build-arg LINUX_DISTRO=${LINUX_DISTRO}"
5351
DOCKER_ARGS="${DOCKER_ARGS} --build-arg LINUX_VER=${LINUX_VER}"
@@ -66,7 +64,6 @@ echo "Building morpheus:${DOCKER_TAG} with args..."
6664
echo " CUDA_MAJOR_VER : ${CUDA_MAJOR_VER}"
6765
echo " CUDA_MINOR_VER : ${CUDA_MINOR_VER}"
6866
echo " CUDA_REV_VER : ${CUDA_REV_VER}"
69-
echo " DOCA_REPO_HOST : ${DOCA_REPO_HOST}"
7067
echo " FROM_IMAGE : ${FROM_IMAGE}"
7168
echo " LINUX_DISTRO : ${LINUX_DISTRO}"
7269
echo " LINUX_VER : ${LINUX_VER}"

0 commit comments

Comments
 (0)