Skip to content

Commit 21f699a

Browse files
mroeschkemroeschke
authored
Merge branch 'branch-25.06' into rm/cudf_helpers/patch
2 parents e54c652 + 4d9e934 commit 21f699a

File tree

77 files changed

+276
-213
lines changed

Some content is hidden

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

77 files changed

+276
-213
lines changed

‎.github/workflows/ci_pipe.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ jobs:
230230
matrix:
231231
arch: ["amd64", "arm64"]
232232
include:
233-
- runner: linux-amd64-gpu-v100-latest-1
233+
- runner: linux-amd64-gpu-l4-latest-1
234234
arch: "amd64"
235235
- runner: linux-arm64-cpu16
236236
arch: "arm64"

‎.github/workflows/pr.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ jobs:
9595
conda_run_build: ${{ !fromJSON(needs.prepare.outputs.is_pr) || fromJSON(needs.prepare.outputs.has_conda_build_label) }}
9696
# Upload morpheus conda packages only for non PR branches. Use 'main' for main branch and 'dev' for all other branches
9797
conda_upload_label: ${{ !fromJSON(needs.prepare.outputs.is_pr) && (fromJSON(needs.prepare.outputs.is_main_branch) && 'main' || 'dev') || '' }}
98-
base_container: rapidsai/ci-conda:cuda12.8.0-ubuntu22.04-py3.10
99-
container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-250213
100-
test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-250213
98+
base_container: rapidsai/ci-conda:cuda12.8.0-ubuntu22.04-py3.12
99+
container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-250225
100+
test_container: nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-250225
101101
secrets:
102102
CONDA_TOKEN: ${{ secrets.CONDA_TOKEN }}
103103
NGC_API_KEY: ${{ secrets.NGC_API_KEY }}

‎.pre-commit-config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ repos:
2525
- id: isort
2626
args: ["--filter-files", "--settings-file=./pyproject.toml"]
2727
- repo: https://github.com/PyCQA/flake8
28-
rev: 6.1.0
28+
rev: 7.0.0
2929
hooks:
3030
- id: flake8
3131
entry: pflake8

‎CHANGELOG.md

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

18+
# Morpheus 25.02.01 (28 Feb 2025)
19+
20+
## 🐛 Bug Fixes
21+
22+
- Perform apt upgrade during docker build of the models container ([#2174](https://github.com/nv-morpheus/Morpheus/pull/2174)) [@dagardner-nv](https://github.com/dagardner-nv)
23+
- Remove pe_count option from MonitorStage ([#2178](https://github.com/nv-morpheus/Morpheus/pull/2178)) [@yczhang-nv](https://github.com/yczhang-nv)
24+
- Pick up changes from nv-morpheus/morpheus-visualizations#50 ([#2186](https://github.com/nv-morpheus/Morpheus/pull/2186)) [@dagardner-nv](https://github.com/dagardner-nv)
25+
26+
## 📖 Documentation
27+
28+
- Remove out of date documentation ([#2173](https://github.com/nv-morpheus/Morpheus/pull/2173)) [@dagardner-nv](https://github.com/dagardner-nv)
29+
- Include a Third Party OSS notice in the entrypoint banner ([#2176](https://github.com/nv-morpheus/Morpheus/pull/2176)) [@dagardner-nv](https://github.com/dagardner-nv)
30+
1831
# Morpheus 25.02.00 (04 Feb 2025)
1932

2033
## 🐛 Bug Fixes

‎ci/conda/recipes/morpheus-libs/conda_build_config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ cuda_compiler_version:
2626
- 12.8
2727

2828
python:
29-
- 3.10
29+
- 3.12
3030

3131
rapids_version:
3232
- 25.02

‎ci/conda/recipes/morpheus-libs/meta.yaml

+7-7
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ outputs:
5151
- cmake =3.27
5252
- ninja =1.11
5353
- pkg-config =0.29
54-
- sysroot_linux-64 =2.28
54+
- sysroot_linux-64>=2.28
5555
host:
5656
# CUDA dependencies
5757
- cuda-cudart-dev {{ cuda_compiler_version }}.*
@@ -66,7 +66,7 @@ outputs:
6666
- glog >=0.7.1,<0.8
6767
- indicators=2.3
6868
- libcudf {{ rapids_version }}
69-
- librdkafka >=1.9.2,<1.10.0a0
69+
- librdkafka =2.6.1
7070
- mrc {{ minor_version }}
7171
- nlohmann_json 3.11.*
7272
- pip
@@ -75,7 +75,7 @@ outputs:
7575
- rapidjson 1.1.0
7676
- scikit-build 0.17.6
7777
- versioneer-518
78-
- zlib 1.3.1 # required to build triton client
78+
- zlib >=1.3.1,<2 # required to build triton client
7979
run:
8080
# Runtime only requirements. This + setup.py is the definitive runtime requirement list
8181
# This should be synced with `runtime` in dependencies.yaml
@@ -84,8 +84,8 @@ outputs:
8484
- click >=8
8585
- cuda-version {{ cuda_compiler_version }}.*
8686
- cudf
87-
- cupy # Version determined from cudf
88-
- datacompy =0.10.*
87+
- cupy <13.4
88+
- datacompy =0.13.1
8989
- dill =0.3.7
9090
- docker-py =5.0.*
9191
- elasticsearch ==8.9.0
@@ -100,7 +100,7 @@ outputs:
100100
- pydantic
101101
- pluggy =1.3.*
102102
- python
103-
- python-confluent-kafka >=1.9.2,<1.10.0a0
103+
- python-confluent-kafka =2.6.1
104104
- python-graphviz
105105
- rapids-dask-dependency {{ rapids_version }} # provides dask and distributed
106106
- requests<2.29.0
@@ -222,7 +222,7 @@ outputs:
222222
- rapidjson 1.1.0
223223
- scikit-build 0.17.6
224224
- versioneer-518
225-
- zlib 1.3.1 # required to build triton client
225+
- zlib >=1.3.1,<2 # required to build triton client
226226
run:
227227
- {{ pin_subpackage('morpheus-core', exact=True) }}
228228

‎ci/conda/recipes/morpheus-libs/morpheus_core_test.sh

+13-4
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,20 @@ if [[ $(arch) == "aarch64" ]]; then
1919
exit 0
2020
fi
2121

22+
package_name="morpheus"
23+
file_name="requirements_morpheus_core_arch-$(arch).txt"
24+
25+
# Install requirements if they are included in the package
2226
python3 <<EOF
23-
import importlib.resources
2427
import subprocess
25-
requirements_file = importlib.resources.path("morpheus", "requirements_morpheus_core_arch-$(arch).txt")
26-
subprocess.call(f"pip install -r {requirements_file}".split())
28+
import sys
29+
import importlib.resources as ir
30+
31+
package_name = "${package_name}"
32+
file_name = "${file_name}"
33+
34+
with ir.as_file(ir.files(anchor=package_name).joinpath(file_name)) as requirements_file:
35+
subprocess.call(f"pip install -r {requirements_file}".split())
2736
EOF
2837

29-
pytest tests/morpheus
38+
pytest tests/${package_name}

‎ci/conda/recipes/morpheus-libs/morpheus_dfp_build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,5 +56,5 @@ cmake -B ${BUILD_DIR} \
5656
# Build the components
5757
cmake --build ${BUILD_DIR} -j${PARALLEL_LEVEL:-$(nproc)} --target install
5858

59-
# Install the mprpheus dfp python wheel components
59+
# Install the morpheus dfp python wheel components
6060
${PYTHON} -m pip install -vv ${BUILD_DIR}/python/morpheus_dfp/dist/*.whl

‎ci/conda/recipes/morpheus-libs/morpheus_dfp_test.sh

+13-4
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,20 @@ if [[ $(arch) == "aarch64" ]]; then
1919
exit 0
2020
fi
2121

22+
package_name="morpheus_dfp"
23+
file_name="requirements_morpheus_dfp_arch-$(arch).txt"
24+
25+
# Install requirements if they are included in the package
2226
python3 <<EOF
23-
import importlib.resources
2427
import subprocess
25-
requirements_file = importlib.resources.path("morpheus_dfp", "requirements_morpheus_dfp_arch-$(arch).txt")
26-
subprocess.call(f"pip install -r {requirements_file}".split())
28+
import sys
29+
import importlib.resources as ir
30+
31+
package_name = "${package_name}"
32+
file_name = "${file_name}"
33+
34+
with ir.as_file(ir.files(anchor=package_name).joinpath(file_name)) as requirements_file:
35+
subprocess.call(f"pip install -r {requirements_file}".split())
2736
EOF
2837

29-
pytest tests/morpheus_dfp
38+
pytest tests/${package_name}

‎ci/conda/recipes/morpheus-libs/morpheus_llm_test.sh

+12-4
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,20 @@ if [[ $(arch) == "aarch64" ]]; then
1919
exit 0
2020
fi
2121

22+
package_name="morpheus_llm"
23+
file_name="requirements_morpheus_llm_arch-$(arch).txt"
24+
2225
# Install requirements if they are included in the package
2326
python3 <<EOF
24-
import importlib.resources
2527
import subprocess
26-
requirements_file = importlib.resources.path("morpheus_llm", "requirements_morpheus_llm_arch-$(arch).txt")
27-
subprocess.call(f"pip install -r {requirements_file}".split())
28+
import sys
29+
import importlib.resources as ir
30+
31+
package_name = "${package_name}"
32+
file_name = "${file_name}"
33+
34+
with ir.as_file(ir.files(anchor=package_name).joinpath(file_name)) as requirements_file:
35+
subprocess.call(f"pip install -r {requirements_file}".split())
2836
EOF
2937

30-
pytest tests/morpheus_llm
38+
pytest tests/${package_name}

‎ci/conda/recipes/morpheus/conda_build_config.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ cuda_compiler_version:
2626
- 12.8
2727

2828
python:
29-
- 3.10
29+
- 3.12
3030

3131
rapids_version:
3232
- 25.02

‎ci/conda/recipes/morpheus/meta.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ outputs:
7171
- glog >=0.7.1,<0.8
7272
- indicators=2.3
7373
- libcudf {{ rapids_version }}
74-
- librdkafka >=1.9.2,<1.10.0a0
74+
- librdkafka =2.6.1
7575
- mrc {{ minor_version }}
7676
- nlohmann_json 3.11.*
7777
- pip
@@ -81,7 +81,7 @@ outputs:
8181
- rdma-core >=48 # Needed for DOCA.
8282
- scikit-build 0.17.6
8383
- versioneer-518
84-
- zlib 1.3.1 # required to build triton client
84+
- zlib >=1.3.1,<2 # required to build triton client
8585
run:
8686
# Runtime only requirements. This + setup.py is the definitive runtime requirement list
8787
# This should be synced with `runtime` in dependencies.yaml
@@ -90,8 +90,8 @@ outputs:
9090
- click >=8
9191
- cuda-version {{ cuda_compiler_version }}.*
9292
- cudf
93-
- cupy # Version determined from cudf
94-
- datacompy =0.10.*
93+
- cupy <13.4
94+
- datacompy =0.13.1
9595
- dill =0.3.7
9696
- docker-py =5.0.*
9797
- elasticsearch ==8.9.0
@@ -106,7 +106,7 @@ outputs:
106106
- pydantic
107107
- pluggy =1.3.*
108108
- python
109-
- python-confluent-kafka >=1.9.2,<1.10.0a0
109+
- python-confluent-kafka =2.6.1
110110
- python-graphviz
111111
- rapids-dask-dependency {{ rapids_version }} # provides dask and distributed
112112
- requests<2.29.0

‎ci/conda/recipes/python-dbg/meta.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ requirements:
3737
build:
3838
- bzip2 [unix]
3939
- libffi [unix] # Required for _ctypes, pip will complain that setuptools doesn't exist if _ctypes is missing.
40-
- openssl >=1.1.1n,<2.0 # Required for TLS/SSL capabilities in pip.
40+
- openssl >=3.0,<3.1 # Required for TLS/SSL capabilities in pip.
4141
- readline [unix]
4242
- sqlite [unix]
4343
- tk [unix]
@@ -46,7 +46,7 @@ requirements:
4646
run:
4747
- bzip2 [unix]
4848
- libffi [unix]
49-
- openssl >=1.1.1n,<2.0 # Required for TLS/SSL capabilities in pip.
49+
- openssl >=3.0,<3.1 # Required for TLS/SSL capabilities in pip.
5050
- readline [unix]
5151
- sqlite [unix]
5252
- tk [unix]

‎ci/conda/recipes/run_conda_build.sh

-1
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}rapi
121121
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia")
122122
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}nvidia/label/dev")
123123
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}pytorch")
124-
CONDA_ARGS_ARRAY+=("-c" "${CONDA_CHANNEL_ALIAS:+"${CONDA_CHANNEL_ALIAS%/}/"}defaults")
125124

126125
if [[ ${NUMARGS} == 0 ]]; then
127126
echo -e "${r}ERROR: No arguments were provided. Please provide at least one package to build. Available packages:${x}"

‎ci/runner/Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ ARG CUDA_VER=12.8.0
2020
ARG LINUX_DISTRO=ubuntu
2121
ARG LINUX_VER=22.04
2222
ARG PROJ_NAME=morpheus
23-
ARG PYTHON_VER=3.10
23+
ARG PYTHON_VER=3.12
2424
ARG REAL_ARCH=x86_64
2525

2626

‎ci/scripts/cpp_checks.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ if [[ -n "${MORPHEUS_MODIFIED_FILES}" ]]; then
6060

6161
# Run using a clang-tidy wrapper to allow warnings-as-errors and to eliminate any output except errors (since
6262
# clang-tidy-diff.py doesn't return the correct error codes)
63-
CLANG_TIDY_OUTPUT=`get_unified_diff ${CPP_FILE_REGEX} | ${CLANG_TIDY_DIFF} \
63+
CLANG_TIDY_OUTPUT=`get_unified_diff ${CPP_FILE_REGEX} | python -W ignore ${CLANG_TIDY_DIFF} \
6464
-extra-arg="-Wno-ignored-optimization-argument" -j 0 -path ${BUILD_DIR} -p1 -quiet 2>&1`
6565

6666
if [[ -n "${CLANG_TIDY_OUTPUT}" && ${CLANG_TIDY_OUTPUT} != "No relevant changes found." ]]; then

‎ci/scripts/github/conda_libs.sh

+3-1
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,12 @@ fetch_base_branch
3131
# Print the info just to be sure base is active
3232
conda info
3333

34+
rapids-logger "Installing Boa and Git LFS"
35+
conda install --solver=libmamba -c conda-forge boa git-lfs
36+
3437
# Pull down data needed for running the per-library unit tests
3538
rapids-logger "Pulling LFS assets"
3639

37-
conda install git-lfs
3840
git lfs install
3941
${MORPHEUS_ROOT}/scripts/fetch_data.py fetch tests validation
4042

‎ci/scripts/run_ci_local.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ GIT_BRANCH=$(git branch --show-current)
5959
GIT_COMMIT=$(git log -n 1 --pretty=format:%H)
6060

6161
LOCAL_CI_TMP=${LOCAL_CI_TMP:-${MORPHEUS_ROOT}/.tmp/local_ci_tmp}
62-
CONTAINER_VER=${CONTAINER_VER:-250213}
62+
CONTAINER_VER=${CONTAINER_VER:-250225}
6363
CUDA_VER=${CUDA_VER:-12.8}
6464
CUDA_FULL_VER=${CUDA_FULL_VER:-12.8.0}
6565
DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}

‎conda/environments/all_cuda-128_arch-aarch64.yaml

+8-9
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ dependencies:
3737
- cupy<13.4
3838
- cxx-compiler
3939
- cython=3.0
40-
- datacompy=0.10
40+
- datacompy=0.13.1
4141
- dill=0.3.7
4242
- docker-py=5.0
4343
- doxygen=1.9.2
@@ -63,7 +63,7 @@ dependencies:
6363
- libcufft-dev
6464
- libcurand-dev
6565
- libcusolver-dev
66-
- librdkafka>=1.9.2,<1.10.0a0
66+
- librdkafka=2.6.1
6767
- libtool
6868
- libwebp=1.3.2
6969
- libzlib >=1.3.1,<2
@@ -80,7 +80,7 @@ dependencies:
8080
- numpydoc=1.5
8181
- onnx=1.15
8282
- openai==1.13.*
83-
- papermill=2.4.0
83+
- papermill=2.6.0
8484
- pip
8585
- pkg-config=0.29
8686
- pluggy=1.3
@@ -95,10 +95,10 @@ dependencies:
9595
- pytest-benchmark=4.0
9696
- pytest-cov
9797
- pytest=7.4.4
98-
- python-confluent-kafka>=1.9.2,<1.10.0a0
98+
- python-confluent-kafka=2.6.1
9999
- python-docx==1.1.0
100100
- python-graphviz
101-
- python=3.10
101+
- python=3.12
102102
- rapidjson=1.1.0
103103
- rapids-dask-dependency=25.02
104104
- rdma-core>=48
@@ -124,12 +124,11 @@ dependencies:
124124
- yapf=0.43
125125
- pip:
126126
- --extra-index-url https://download.pytorch.org/whl/cu124
127-
- --find-links https://data.dgl.ai/wheels-test/repo.html
128-
- --find-links https://data.dgl.ai/wheels/cu121/repo.html
127+
- --find-links https://data.dgl.ai/wheels/torch-2.3/repo.html
128+
- --find-links https://data.dgl.ai/wheels/torch-2.4/cu124/repo.html
129129
- databricks-cli < 0.100
130130
- databricks-connect
131-
- dgl==2.0.0
132-
- dglgo
131+
- dgl
133132
- faiss-cpu
134133
- google-search-results==2.4
135134
- gpudb>=7.2.2.3

0 commit comments

Comments
 (0)