Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update to clang-16 & boost-1.82 #1186

Merged
merged 5 commits into from
Oct 11, 2023
Merged

Update to clang-16 & boost-1.82 #1186

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d55422
Starting work on #1185
dagardner-nv Sep 11, 2023
3105b58
Adopt clangdev=16, drop version restriction for include-what-you-use …
dagardner-nv Sep 11, 2023
c15b274
Merge branch 'branch-23.11' into david-update-clang16-1185
dagardner-nv Oct 9, 2023
7dc7b08
Update boost and clang to match mrc, and set IWYU version to match th…
dagardner-nv Oct 9, 2023
d224ed9
Silence deprecation warnings coming from SimpleAmqpClient incompatibi…
dagardner-nv Oct 10, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ci/conda/recipes/morpheus/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ python:
- 3.10

boost:
- 1.74
- 1.82

rapids_version:
- 23.06
4 changes: 2 additions & 2 deletions ci/scripts/common.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions docker/conda/environments/cuda11.8_dev.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
5 changes: 3 additions & 2 deletions examples/developer_guide/4_rabbitmq_cpp_stage/cmake/Configure_SimpleAmqpClient.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down
Loading