From 0772f87963989cd12214bf4adf6fa127701b969f Mon Sep 17 00:00:00 2001
From: David Gardner <96306125+dagardner-nv@users.noreply.github.com>
Date: Wed, 11 Oct 2023 06:55:01 -0700
Subject: [PATCH] Update to clang-16 & boost-1.82 (#1186)

* Silence deprecation warnings from SimpleAmqpClient #1255

fixes #1185

Authors:
  - David Gardner (https://github.com/dagardner-nv)

Approvers:
  - Devin Robison (https://github.com/drobison00)

URL: https://github.com/nv-morpheus/Morpheus/pull/1186
---
 ci/conda/recipes/morpheus/conda_build_config.yaml           | 2 +-
 ci/scripts/common.sh                                        | 4 ++--
 docker/conda/environments/cuda11.8_dev.yml                  | 6 +++---
 .../cmake/Configure_SimpleAmqpClient.cmake                  | 5 +++--
 4 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/ci/conda/recipes/morpheus/conda_build_config.yaml b/ci/conda/recipes/morpheus/conda_build_config.yaml
index b4d6fe33d0..f6bfd9e8d5 100644
--- 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
index 4847041f15..d942aec853 100644
--- 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
index 66a2d11448..2df2b75fa4 100644
--- a/docker/conda/environments/cuda11.8_dev.yml
+++ b/docker/conda/environments/cuda11.8_dev.yml
@@ -25,10 +25,10 @@ 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=14
+    - clangdev=16
     - click >=8
     - cmake=3.24
     - configargparse=1.5
@@ -58,7 +58,7 @@ dependencies:
     - grpcio
     - gtest>=1.13.0
     - gxx_linux-64=11.2
-    - include-what-you-use=0.18
+    - include-what-you-use=0.20
     - ipywidgets
     - isort
     - jupyter_core>=4.11.2,<5.0
diff --git a/examples/developer_guide/4_rabbitmq_cpp_stage/cmake/Configure_SimpleAmqpClient.cmake b/examples/developer_guide/4_rabbitmq_cpp_stage/cmake/Configure_SimpleAmqpClient.cmake
index 1ba113026b..7aa248e8e1 100644
--- a/examples/developer_guide/4_rabbitmq_cpp_stage/cmake/Configure_SimpleAmqpClient.cmake
+++ b/examples/developer_guide/4_rabbitmq_cpp_stage/cmake/Configure_SimpleAmqpClient.cmake
@@ -41,8 +41,9 @@ function(find_and_configure_SimpleAmqpClient version)
   # Needed to pick up the generated export.h
   target_include_directories(SimpleAmqpClient PUBLIC "${rabbitmq_BINARY_DIR}/include")
 
-  # Suppress #warning deprecation messages from rabbitmq
-  target_compile_options(SimpleAmqpClient PRIVATE -Wno-cpp)
+  # Suppress #warning deprecation messages from rabbitmq and SimpleAmqpClient
+  # https://github.com/nv-morpheus/Morpheus/issues/1255
+  target_compile_options(SimpleAmqpClient PRIVATE -Wno-cpp -DBOOST_DISABLE_PRAGMA_MESSAGE)
 
 endfunction()