Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 13 additions & 3 deletions ci/conda/recipes/morpheus-libs/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,38 +61,44 @@ outputs:
- cuda-nvtx-dev {{ cuda_compiler_version }}.*
- cuda-version {{ cuda_compiler_version }}.*
# Non-CUDA dependencies
- cuda-python {{ cuda_compiler_version }}.*
- cudf {{ rapids_version }}
- cython 3.0.*
- glog >=0.7.1,<0.8
- indicators=2.3
- libcudf {{ rapids_version }}
- librdkafka =2.6.1
# Listing mlflow in the host dependencies so that it solves along with libgcc this avoids an
# incompatible runtime environment
- mlflow>=2.18
- mrc {{ minor_version }}
- nlohmann_json 3.11.*
- pip
- pybind11-stubgen 0.10.5
- python {{ python }}
- rapidjson 1.1.0
- scikit-build 0.17.6
# We are currently depending on some deprecated functionality removed in setuptools 80+ #2224
- setuptools>=75,<80
- versioneer-518
- zlib >=1.3.1,<2 # required to build triton client
run:
# Runtime only requirements. This + setup.py is the definitive runtime requirement list
# This should be synced with `runtime` in dependencies.yaml
- appdirs
- beautifulsoup4
- click >=8
- click>=8, <8.2 # work-around for #2219
- cuda-version {{ cuda_compiler_version }}.*
- cudf
- cupy <13.4
- datacompy =0.13.1
- dill =0.3.7
- docker-py =5.0.*
- docker-py >=7.1,<8
- elasticsearch ==8.9.0
- feedparser =6.0.*
- grpcio =1.62.*
- lxml
- mlflow>=2.10.0,<2.18
- mlflow
- mrc
- networkx=2.8.8
- numba=0.60 # Pin version to avoid https://github.com/nv-morpheus/Morpheus/issues/2166
Expand Down Expand Up @@ -163,6 +169,8 @@ outputs:
- pip
- python {{ python }}
- scikit-build 0.17.6
# We are currently depending on some deprecated functionality removed in setuptools 80+ #2224
- setuptools>=75,<80
- versioneer-518
run:
- {{ pin_subpackage('morpheus-core', exact=True) }}
Expand Down Expand Up @@ -221,6 +229,8 @@ outputs:
- python {{ python }}
- rapidjson 1.1.0
- scikit-build 0.17.6
# We are currently depending on some deprecated functionality removed in setuptools 80+ #2224
- setuptools>=75,<80
- versioneer-518
- zlib >=1.3.1,<2 # required to build triton client
run:
Expand Down
9 changes: 6 additions & 3 deletions ci/conda/recipes/morpheus/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ outputs:
- cuda-nvtx-dev {{ cuda_compiler_version }}.*
- cuda-version {{ cuda_compiler_version }}.*
# Non-CUDA dependencies
- cuda-python {{ cuda_compiler_version }}.*
- cudf {{ rapids_version }}
- cython 3.0.*
- glog >=0.7.1,<0.8
Expand All @@ -80,25 +81,27 @@ outputs:
- rapidjson 1.1.0
- rdma-core >=48 # Needed for DOCA.
- scikit-build 0.17.6
# We are currently depending on some deprecated functionality removed in setuptools 80+ #2224
- setuptools>=75,<80
- versioneer-518
- zlib >=1.3.1,<2 # required to build triton client
run:
# Runtime only requirements. This + setup.py is the definitive runtime requirement list
# This should be synced with `runtime` in dependencies.yaml
- appdirs
- beautifulsoup4
- click >=8
- click>=8, <8.2 # work-around for #2219
- cuda-version {{ cuda_compiler_version }}.*
- cudf
- cupy <13.4
- datacompy =0.13.1
- dill =0.3.7
- docker-py =5.0.*
- docker-py >=7.1,<8
- elasticsearch ==8.9.0
- feedparser =6.0.*
- grpcio =1.62.*
- libwebp>=1.3.2 # Required for CVE mitigation: https://nvd.nist.gov/vuln/detail/CVE-2023-4863
- mlflow>=2.10.0,<2.18
- mlflow>=2.18
- mrc
- networkx=2.8.8
- numba=0.60 # Pin version to avoid https://github.com/nv-morpheus/Morpheus/issues/2166
Expand Down
2 changes: 1 addition & 1 deletion ci/scripts/run_ci_local.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ CUDA_FULL_VER=${CUDA_FULL_VER:-12.8.0}
DOCKER_EXTRA_ARGS=${DOCKER_EXTRA_ARGS:-""}

# Configure the base docker img
CONDA_CONTAINER="rapidsai/ci-conda:cuda${CUDA_FULL_VER}-ubuntu22.04-py3.10"
CONDA_CONTAINER="rapidsai/ci-conda:cuda${CUDA_FULL_VER}-ubuntu22.04-py3.12"
BUILD_CONTAINER="nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-build-${CONTAINER_VER}"
TEST_CONTAINER="nvcr.io/ea-nvidia-morpheus/morpheus:morpheus-ci-test-${CONTAINER_VER}"

Expand Down
3 changes: 2 additions & 1 deletion conda/environments/all_cuda-128_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies:
- cuda-nvrtc=12.8
- cuda-nvtx-dev=12.8
- cuda-nvtx=12.8
- cuda-python=12.8
- cuda-sanitizer-api
- cuda-version=12.8
- cudf=25.02
Expand Down Expand Up @@ -66,7 +67,7 @@ dependencies:
- libtool
- libwebp=1.3.2
- libzlib>=1.3.1,<1.4
- mlflow>=2.10.0,<2.18
- mlflow>=2.18
- mrc=25.06
- myst-parser>=4.0
- nbsphinx
Expand Down
3 changes: 2 additions & 1 deletion conda/environments/all_cuda-128_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ dependencies:
- cuda-nvrtc=12.8
- cuda-nvtx-dev=12.8
- cuda-nvtx=12.8
- cuda-python=12.8
- cuda-sanitizer-api
- cuda-version=12.8
- cudf=25.02
Expand Down Expand Up @@ -67,7 +68,7 @@ dependencies:
- libtool
- libwebp=1.3.2
- libzlib>=1.3.1,<1.4
- mlflow>=2.10.0,<2.18
- mlflow>=2.18
- mrc=25.06
- myst-parser>=4.0
- nbsphinx
Expand Down
3 changes: 2 additions & 1 deletion conda/environments/dev_cuda-128_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dependencies:
- cuda-nvml-dev=12.8
- cuda-nvrtc-dev=12.8
- cuda-nvtx-dev=12.8
- cuda-python=12.8
- cuda-sanitizer-api
- cuda-version=12.8
- cudf=25.02
Expand Down Expand Up @@ -55,7 +56,7 @@ dependencies:
- libtool
- libwebp=1.3.2
- libzlib>=1.3.1,<1.4
- mlflow>=2.10.0,<2.18
- mlflow>=2.18
- mrc=25.06
- myst-parser>=4.0
- nbsphinx
Expand Down
3 changes: 2 additions & 1 deletion conda/environments/dev_cuda-128_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ dependencies:
- cuda-nvml-dev=12.8
- cuda-nvrtc-dev=12.8
- cuda-nvtx-dev=12.8
- cuda-python=12.8
- cuda-sanitizer-api
- cuda-version=12.8
- cudf=25.02
Expand Down Expand Up @@ -56,7 +57,7 @@ dependencies:
- libtool
- libwebp=1.3.2
- libzlib>=1.3.1,<1.4
- mlflow>=2.10.0,<2.18
- mlflow>=2.18
- mrc=25.06
- myst-parser>=4.0
- nbsphinx
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/examples_cuda-128_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies:
- jsonpatch>=1.33
- kfp
- libwebp=1.3.2
- mlflow>=2.10.0,<2.18
- mlflow>=2.18
- mrc=25.06
- networkx=2.8.8
- nodejs=18.*
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/examples_cuda-128_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ dependencies:
- jsonpatch>=1.33
- kfp
- libwebp=1.3.2
- mlflow>=2.10.0,<2.18
- mlflow>=2.18
- mrc=25.06
- networkx=2.8.8
- newspaper3k==0.2.8
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/runtime_cuda-128_arch-aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies:
- grpcio
- grpcio-status
- libwebp=1.3.2
- mlflow>=2.10.0,<2.18
- mlflow>=2.18
- mrc=25.06
- networkx=2.8.8
- numba=0.60
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/runtime_cuda-128_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ dependencies:
- grpcio
- grpcio-status
- libwebp=1.3.2
- mlflow>=2.10.0,<2.18
- mlflow>=2.18
- mrc=25.06
- networkx=2.8.8
- numba=0.60
Expand Down
5 changes: 3 additions & 2 deletions dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -296,6 +296,7 @@ dependencies:
- output_types: [conda]
packages:
# Include: cudatoolkit-dev
- cuda-python=12.8
- &cudf cudf=25.02
- cython=3.0
- glog>=0.7.1,<0.8
Expand Down Expand Up @@ -334,7 +335,7 @@ dependencies:
- pylint=3.0.3
- pynvml=12
# We are currently depending on some deprecated functionality removed in setuptools 80+ #2224
- setuptools>=75,<80
- setuptools>=75,<80
- versioneer
- yapf=0.43
specific:
Expand Down Expand Up @@ -397,7 +398,7 @@ dependencies:
- grpcio
- grpcio-status
# - libwebp=1.3.2 # Required for CVE mitigation: https://nvd.nist.gov/vuln/detail/CVE-2023-4863 ##
- mlflow>=2.10.0,<2.18 # Pin version to avoid breaking change in 2.18 to thread local variable code commit id: 5541888
- mlflow>=2.18
- *mrc
- networkx=2.8.8
- numba=0.60 # Pin version to avoid https://github.com/nv-morpheus/Morpheus/issues/2166
Expand Down
10 changes: 10 additions & 0 deletions tests/conftest.py
Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,16 @@ def pytest_runtest_teardown(item, nextitem):
reset_logging(logger_name=None) # Reset the root logger as well


@pytest.fixture(scope="session", autouse=True)
def ensure_cudf_helper():
"""
Ensures that the cudf helper is loaded before any tests are run. This is necessary to ensure that the
`cudf` module is available for tests that require it.
"""
from morpheus.common import load_cudf_helper
load_cudf_helper()


@pytest.fixture(scope="function")
def df_type(request: pytest.FixtureRequest):

Expand Down
2 changes: 1 addition & 1 deletion tests/morpheus/test_cli.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def mlflow_uri(tmp_path):

yield uri

num_runs = len(fluent._active_run_stack)
num_runs = len(fluent._active_run_stack.get())
for _ in range(num_runs):
mlflow.end_run()

Expand Down
Loading