Skip to content

Commit

Permalink
Revert boost upgrade, and update clang to v16 (nv-morpheus#382)
Browse files Browse the repository at this point in the history
fixes nv-morpheus#379 ?

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

Approvers:
  - Christopher Harris (https://github.com/cwharris)
  - Michael Demoret (https://github.com/mdemoret-nv)

URL: nv-morpheus#382
  • Loading branch information
dagardner-nv authored Sep 11, 2023
1 parent 483194d commit 5747320
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 10 deletions.
16 changes: 8 additions & 8 deletions ci/conda/environments/clang_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,11 +19,11 @@ name: mrc
channels:
- conda-forge
dependencies:
- clang=15
- clang-tools=15
- clangdev=15
- clangxx=15
- libclang=15
- libclang-cpp=15
- llvmdev=15
- include-what-you-use=0.19
- clang=16
- clang-tools=16
- clangdev=16
- clangxx=16
- libclang=16
- libclang-cpp=16
- llvmdev=16
- include-what-you-use
4 changes: 2 additions & 2 deletions ci/conda/environments/dev_env.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ dependencies:
- autoconf>=2.69
- bash-completion
- benchmark=1.6.0
- boost-cpp=1.82
- boost-cpp=1.74
- ccache
- cmake=3.24
- cuda-toolkit # Version comes from the channel above
Expand All @@ -46,7 +46,7 @@ dependencies:
- isort
- jinja2=3.0
- lcov=1.15
- libhwloc=2.9.2
- libhwloc=2.5
- libprotobuf=3.21
- librmm=23.06
- libtool
Expand Down

0 comments on commit 5747320

Please sign in to comment.