diff --git a/ci/conda/recipes/morpheus/conda_build_config.yaml b/ci/conda/recipes/morpheus/conda_build_config.yaml index e173b151fa..a5681ca12e 100644 --- a/ci/conda/recipes/morpheus/conda_build_config.yaml +++ b/ci/conda/recipes/morpheus/conda_build_config.yaml @@ -14,16 +14,16 @@ # limitations under the License. c_compiler_version: - - 11.2 + - 12.1 cxx_compiler_version: - - 11.2 + - 12.1 cuda_compiler: - cuda-nvcc cuda_compiler_version: - - 12.1 + - 12.5 python: - 3.10 diff --git a/ci/conda/recipes/morpheus/meta.yaml b/ci/conda/recipes/morpheus/meta.yaml index fc55e54f30..2961b541b1 100644 --- a/ci/conda/recipes/morpheus/meta.yaml +++ b/ci/conda/recipes/morpheus/meta.yaml @@ -56,7 +56,7 @@ outputs: - libtool # Needed for DOCA build - ninja =1.11 - pkg-config =0.29 # for mrc cmake - - sysroot_linux-64 =2.17 + - sysroot_linux-64 =2.28 host: # CUDA dependencies - cuda-cudart-dev {{ cuda_compiler_version }}.* @@ -68,7 +68,7 @@ outputs: # Non-CUDA dependencies - cudf {{ rapids_version }} - cython 3.0.* - - glog 0.6.* + - glog >=0.7.1,<8 - libcudf {{ rapids_version }} - librdkafka >=1.9.2,<1.10.0a0 - mrc {{ minor_version }} diff --git a/conda/environments/all_cuda-125_arch-x86_64.yaml b/conda/environments/all_cuda-125_arch-x86_64.yaml index 7795ea97f5..2b1d819c32 100644 --- a/conda/environments/all_cuda-125_arch-x86_64.yaml +++ b/conda/environments/all_cuda-125_arch-x86_64.yaml @@ -44,12 +44,12 @@ dependencies: - exhale=0.3.6 - feedparser=6.0 - flake8 -- gcc_linux-64=11.2 - git-lfs - glog>=0.7.1,<0.8 - grpcio - grpcio-status -- gxx_linux-64=11.2 +- gtest=1.14 +- gxx=12.1 - huggingface_hub=0.20.2 - include-what-you-use=0.20 - ipython @@ -105,7 +105,7 @@ dependencies: - sphinx - sphinx_rtd_theme - sqlalchemy<2.0 -- sysroot_linux-64=2.17 +- sysroot_linux-64>=2.28 - tqdm=4 - transformers=4.36.2 - tritonclient=2.34 diff --git a/conda/environments/dev_cuda-125_arch-x86_64.yaml b/conda/environments/dev_cuda-125_arch-x86_64.yaml index 86c1927e88..b11d215ec5 100644 --- a/conda/environments/dev_cuda-125_arch-x86_64.yaml +++ b/conda/environments/dev_cuda-125_arch-x86_64.yaml @@ -37,12 +37,12 @@ dependencies: - exhale=0.3.6 - feedparser=6.0 - flake8 -- gcc_linux-64=11.2 - git-lfs - glog>=0.7.1,<0.8 - grpcio - grpcio-status -- gxx_linux-64=11.2 +- gtest=1.14 +- gxx=12.1 - include-what-you-use=0.20 - ipython - isort @@ -86,7 +86,7 @@ dependencies: - sphinx - sphinx_rtd_theme - sqlalchemy<2.0 -- sysroot_linux-64=2.17 +- sysroot_linux-64>=2.28 - tqdm=4 - tritonclient=2.34 - typing_utils=0.1 diff --git a/dependencies.yaml b/dependencies.yaml index 53f6d53091..b336b1e31d 100644 --- a/dependencies.yaml +++ b/dependencies.yaml @@ -230,8 +230,7 @@ dependencies: # Compilers - cuda-nvcc=12.5 - cxx-compiler - - gcc_linux-64=11.2 - - gxx_linux-64=11.2 + - gxx=12.1 # Non-Compiler Dependencies - automake=1.16.5 # Needed for DOCA build @@ -242,7 +241,7 @@ dependencies: - libtool # Needed for DOCA build - ninja=1.11 - pkg-config=0.29 # for mrc cmake - - sysroot_linux-64=2.17 + - sysroot_linux-64>=2.28 # Build dependencies for Morpheus on the host arch. Mirrors the `host` section in # ci/conda/recipes/morpheus/meta.yaml @@ -254,8 +253,10 @@ dependencies: - cudf=24.06 - cython=3.0 - glog>=0.7.1,<0.8 + - gtest=1.14 - libcudf=24.06 - librdkafka>=1.9.2,<1.10.0a0 + - libzlib >=1.3.1,<2 - mrc=24.10 - nlohmann_json=3.11 - pybind11-stubgen=0.10.5 @@ -263,7 +264,6 @@ dependencies: - rdma-core>=48 # Needed for DOCA. - scikit-build=0.17.6 - versioneer-518 - - libzlib >=1.3.1,<2 checks: common: diff --git a/external/utilities b/external/utilities index fb2c9503fb..9984a4bdb5 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit fb2c9503fbfdd08503013f712b8bc1e4d9869933 +Subproject commit 9984a4bdb5eb6de55d9c25dc3ad4ad1cd2679c39 diff --git a/python/morpheus/morpheus/_lib/cmake/libmorpheus.cmake b/python/morpheus/morpheus/_lib/cmake/libmorpheus.cmake index b4d3e5baaf..0a1992e95d 100644 --- a/python/morpheus/morpheus/_lib/cmake/libmorpheus.cmake +++ b/python/morpheus/morpheus/_lib/cmake/libmorpheus.cmake @@ -98,8 +98,9 @@ target_link_libraries(morpheus $<$:ZLIB::ZLIB> PUBLIC $ - cudf::cudf CUDA::nvtx3 + cudf::cudf + glog::glog mrc::pymrc RDKAFKA::RDKAFKA TritonClient::httpclient_static diff --git a/python/morpheus/morpheus/_lib/tests/CMakeLists.txt b/python/morpheus/morpheus/_lib/tests/CMakeLists.txt index 788055a7c0..16379378b8 100644 --- a/python/morpheus/morpheus/_lib/tests/CMakeLists.txt +++ b/python/morpheus/morpheus/_lib/tests/CMakeLists.txt @@ -26,6 +26,7 @@ add_executable(test_cuda target_link_libraries(test_cuda PRIVATE + glog::glog GTest::gtest GTest::gtest_main matx::matx diff --git a/tests/_utils/__init__.py b/tests/_utils/__init__.py index c11afb671b..b116dffb69 100644 --- a/tests/_utils/__init__.py +++ b/tests/_utils/__init__.py @@ -25,7 +25,6 @@ import numpy as np import pytest - from morpheus.io.deserializers import read_file_to_df from .test_directories import TestDirectories