Updating build to work with new packages.

nv-morpheus · Aug 16, 2024 · 03ee92a · 03ee92a
1 parent 472f0b9
commit 03ee92a
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 18 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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,16 +253,17 @@ 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
           - rapidjson=1.1.0
           - 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
diff --git a/python/morpheus/morpheus/_lib/cmake/libmorpheus.cmake b/python/morpheus/morpheus/_lib/cmake/libmorpheus.cmake
@@ -98,8 +98,9 @@ target_link_libraries(morpheus
     $<$<CONFIG:Debug>:ZLIB::ZLIB>
   PUBLIC
     $<TARGET_NAME_IF_EXISTS:conda_env>
-    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
@@ -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
@@ -25,7 +25,6 @@
 
 import numpy as np
 import pytest
-
 from morpheus.io.deserializers import read_file_to_df
 
 from .test_directories import TestDirectories
+1 −1		cmake/morpheus_utils/package_config/cccl/Configure_cccl.cmake
+11 −1		cmake/morpheus_utils/package_config/glog/Configure_glog.cmake
+2 −3		cmake/morpheus_utils/package_config/matx/Configure_matx.cmake
+15 −16		cmake/morpheus_utils/package_config/matx/patches/matx_cccl_interface_fix.patch