From 9ae280a44c2d94ce3d1f37f454ced4e51fa677ec Mon Sep 17 00:00:00 2001 From: David Gardner <96306125+dagardner-nv@users.noreply.github.com> Date: Fri, 18 Aug 2023 08:39:21 -0700 Subject: [PATCH] Adopt patched pybind11 (#364) * Adopt patched pybind11 * Update versions of boost & libhwloc to work-around clang CI issue * A test for this bug exists in Morpheus, but is difficult to reproduce in MRC. A MRC based test coming soon. fixes #262 Authors: - David Gardner (https://github.com/dagardner-nv) Approvers: - Michael Demoret (https://github.com/mdemoret-nv) URL: https://github.com/nv-morpheus/MRC/pull/364 --- ci/conda/environments/dev_env.yml | 4 ++-- external/utilities | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/conda/environments/dev_env.yml b/ci/conda/environments/dev_env.yml index 58d83d9a7..5af8a91c9 100644 --- a/ci/conda/environments/dev_env.yml +++ b/ci/conda/environments/dev_env.yml @@ -25,7 +25,7 @@ dependencies: - autoconf>=2.69 - bash-completion - benchmark=1.6.0 - - boost-cpp=1.74 + - boost-cpp=1.82 - ccache - cmake=3.24 - cuda-toolkit # Version comes from the channel above @@ -46,7 +46,7 @@ dependencies: - isort - jinja2=3.0 - lcov=1.15 - - libhwloc=2.5 + - libhwloc=2.9.2 - libprotobuf=3.21 - librmm=23.06 - libtool diff --git a/external/utilities b/external/utilities index 899a46063..5adffec7d 160000 --- a/external/utilities +++ b/external/utilities @@ -1 +1 @@ -Subproject commit 899a4606388b6ad2e94662949cd65df8e8c9bdd0 +Subproject commit 5adffec7d21fe3d64567a684307e645d5609408c