Skip to content

Commit

Permalink
Revert "Upgrade to spdlog 1.10 (#1173)" (#1176)
Browse files Browse the repository at this point in the history
This reverts commit 7bf7a76.

cc: @kkraus14 There's a handful of issues this caused downstream. We'll be sorting through these and fixing them but need to quickly revert this for now.

Currrent problems:

1. rmm's meta.yaml doesn't correctly specify spdlog as a build dep. It's [incorrectly listed as a runtime dep](https://github.com/rapidsai/rmm/blob/7bf7a763a3b6a32a7a57f900de35e2e5f30f17c0/conda/recipes/librmm/meta.yaml#L56). This means that rmm [pulls spdlog via CPM with rapids-cmake](https://github.com/rapidsai/rmm/actions/runs/3595940512/jobs/6056061203#step:6:595) `-- CPM: adding package [email protected] (v1.8.5)` and then clobbers its own installed spdlog headers:

```
2022-12-01T19:46:46.2167513Z ClobberWarning: This transaction has incompatible packages due to a shared path.
2022-12-01T19:46:46.2168766Z   packages: conda-forge/linux-64::spdlog-1.10.0-h924138e_0, file:///tmp/conda-bld-output/linux-64::librmm-23.02.00a-cuda11_gc328a18d_11
2022-12-01T19:46:46.2169686Z   path: 'include/spdlog/async.h'
```

2. spdlog 1.10.0 doesn't work with nvcc. We need spdlog 1.11.0 to get fmt 9.1.0, which contains [a necessary fix](fmtlib/fmt#2971). However, there's some uncertainty about how to handle the spdlog conda-forge package which [no longer vendors fmt](conda-forge/spdlog-feedstock#50) while rapids-cmake is still using the upstream repo which continues to vendor fmt. Does this inconsistency matter, as long as we pin `fmt=9.1.0` in the conda package cases? @kkraus14 It looks like you weighed in on this matter [here](conda-forge/spdlog-feedstock#53) and [here](conda-forge/conda-forge-pinning-feedstock#3654). If you have insights that can help us with this quandary, please share!

Authors:
  - Bradley Dice (https://github.com/bdice)

Approvers:
  - Mark Harris (https://github.com/harrism)
  - Ray Douglass (https://github.com/raydouglass)

URL: #1176
  • Loading branch information
bdice authored Dec 6, 2022
1 parent 7bf7a76 commit 4d1dee1
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-115_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ dependencies:
- pytest-cov
- python>=3.8,<3.10
- scikit-build>=0.13.1
- spdlog=1.10
- spdlog>=1.8.5,<1.9
name: all_cuda-115_arch-x86_64
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-116_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,5 +22,5 @@ dependencies:
- pytest-cov
- python>=3.8,<3.10
- scikit-build>=0.13.1
- spdlog=1.10
- spdlog>=1.8.5,<1.9
name: all_cuda-116_arch-x86_64
2 changes: 1 addition & 1 deletion conda/recipes/librmm/conda_build_config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ gtest_version:
- "=1.10.0"

spdlog_version:
- "1.10"
- ">=1.8.5,<1.9"

sysroot_version:
- "2.17"
2 changes: 1 addition & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ dependencies:
- scikit-build>=0.13.1
- output_types: conda
packages:
- spdlog=1.10
- spdlog>=1.8.5,<1.9
cudatoolkit:
specific:
- output_types: conda
Expand Down

0 comments on commit 4d1dee1

Please sign in to comment.