Update boost and clang to match mrc, and set IWYU version to match th…

…at of clang
nv-morpheus · Oct 9, 2023 · 7dc7b08 · 7dc7b08
1 parent c15b274
commit 7dc7b08
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/ci/conda/recipes/morpheus/conda_build_config.yaml b/ci/conda/recipes/morpheus/conda_build_config.yaml
@@ -29,7 +29,7 @@ python:
   - 3.10
 
 boost:
-  - 1.74
+  - 1.82
 
 rapids_version:
   - 23.06
diff --git a/ci/scripts/common.sh b/ci/scripts/common.sh
@@ -43,8 +43,8 @@ export SKIP_YAPF=${SKIP_YAPF:-""}
 # Set BUILD_DIR to use a different build folder
 export BUILD_DIR=${BUILD_DIR:-"${MORPHEUS_ROOT}/build"}
 
-# Speficy the clang-tools version to use. Default 14
-export CLANG_TOOLS_VERSION=${CLANG_TOOLS_VERSION:-14}
+# Speficy the clang-tools version to use. Default 16
+export CLANG_TOOLS_VERSION=${CLANG_TOOLS_VERSION:-16}
 
 # Returns the `branch-YY.MM` that is used as the base for merging
 function get_base_branch() {

diff --git a/docker/conda/environments/cuda11.8_dev.yml b/docker/conda/environments/cuda11.8_dev.yml
@@ -25,7 +25,7 @@ dependencies:
     ####### Morpheus Dependencies (keep sorted!) #######
     - automake=1.16.5
     - benchmark=1.6.1
-    - boost-cpp=1.74
+    - boost-cpp=1.82
     - cachetools=5.0.0
     - ccache>=3.7
     - clangdev=16
@@ -58,7 +58,7 @@ dependencies:
     - grpcio
     - gtest>=1.13.0
     - gxx_linux-64=11.2
-    - include-what-you-use
+    - include-what-you-use=0.20
     - ipywidgets
     - isort
     - jupyter_core>=4.11.2,<5.0
-Original file line number
+Diff line change
@@ Expand Up / @@ -29,7 +29,7 @@ python: @@
       - 3.10
     boost:
-      - 1.74
+      - 1.82
     rapids_version:
       - 23.06