Skip to content

Update to spdlog>=1.11.0, fmt>=9.1.0. #1177

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

Merged
rapids-bot merged 20 commits into from
Feb 13, 2023
Merged

Update to spdlog>=1.11.0, fmt>=9.1.0. #1177

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
876cf91
Update to spdlog>=1.11.0, fmt>=9.1.0.
bdice Dec 7, 2022
99bade8
Add comment to explain dependencies.
bdice Dec 7, 2022
9a197ca
Merge remote-tracking branch 'upstream/branch-23.02' into update-spdl…
bdice Jan 19, 2023
8d4d42a
Remove run pins (covered by run_exports of the package).
bdice Jan 19, 2023
e5272cb
Use a host section.
bdice Jan 19, 2023
bc66b58
Add pins to conda_build_config.yaml.
bdice Jan 19, 2023
a69b55d
Rerun CI to debug build log issue.
bdice Jan 19, 2023
fd93f45
Move fmt, spdlog to host section of top level recipe requirements.
bdice Jan 19, 2023
b7e8154
Add fmt, spdlog to librmm run requirements.
bdice Jan 19, 2023
f15eb0d
Add ostream formatter for bytes.
bdice Jan 19, 2023
2d729f6
Fix style.
bdice Jan 19, 2023
62c1bf1
Move namespace.
bdice Jan 19, 2023
8781eb1
Merge branch 'branch-23.02' into update-spdlog-1.11.0
bdice Feb 8, 2023
3534fd5
Merge branch 'branch-23.04' into update-spdlog-1.11.0
bdice Feb 8, 2023
06ec0f1
depend on fmt explicitly, temporarily use rapids-cmake fork for testing
kkraus14 Feb 10, 2023
b3dd596
Merge branch 'update-spdlog-1.11.0' of github.com:bdice/rmm into upda…
kkraus14 Feb 10, 2023
56fa4d4
temporarily point python cmake to fork as well
kkraus14 Feb 10, 2023
dbd525a
fix unused header, fix export_set name for fmt
kkraus14 Feb 10, 2023
2b70941
Merge branch 'branch-23.04' into update-spdlog-1.11.0
bdice Feb 13, 2023
bcf6e7c
Don't export fmt manually.
bdice Feb 13, 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
3 changes: 2 additions & 1 deletion conda/environments/all_cuda-118_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ dependencies:
- cuda-python>=11.7.1,<12.0
- cudatoolkit=11.8
- cython>=0.29,<0.30
- fmt>=9.1.0,<10
- gcovr>=5.0
- ninja
- numba>=0.49
Expand All @@ -17,5 +18,5 @@ dependencies:
- pytest-cov
- python>=3.8,<3.11
- scikit-build>=0.13.1
- spdlog>=1.8.5,<1.9
- spdlog>=1.11.0,<1.12
name: all_cuda-118_arch-x86_64
5 changes: 4 additions & 1 deletion conda/recipes/librmm/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ cuda_compiler:
cmake_version:
- ">=3.23.1,!=3.25.0"

fmt_version:
- ">=9.1.0,<10"

gtest_version:
- "=1.10.0"

spdlog_version:
- ">=1.8.5,<1.9"
- ">=1.11.0,<1.12"

sysroot_version:
- "2.17"
10 changes: 8 additions & 2 deletions conda/recipes/librmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,14 @@ requirements:
- {{ compiler('cuda') }} {{ cuda_version }}
- sysroot_{{ target_platform }} {{ sysroot_version }}
host:
- cudatoolkit {{ cuda_version }}.*
- cudatoolkit ={{ cuda_version }}
# We require spdlog and fmt (which was devendored from spdlog
# conda-forge packages in 1.11.0) so that the spdlog headers are not
# pulled by CPM and installed as a part of the rmm packages. However,
# building against librmm still requires these headers. They are also
# added as a run requirement via the packages' run_exports.
Comment on lines +28 to +29
Copy link
Copy Markdown
Collaborator Author

@bdice bdice Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@kkraus14 Will these be added as a run requirement of both or neither of librmm and librmm-tests because of the run_exports? Should I manually re-specify them in librmm's run section?

Copy link
Copy Markdown
Contributor

@kkraus14 kkraus14 Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm building the package locally now to check. I'm not quite sure the rules on output packages as it's kinda entirely undocumented.

Copy link
Copy Markdown
Collaborator Author

@bdice bdice Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From looking at other recipes, I think we do need to specify them again as librmm run dependencies. Added in b7e8154.

Copy link
Copy Markdown
Member

@ajschmidt8 ajschmidt8 Jan 19, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

From looking at other recipes, I think we do need to specify them again as librmm run dependencies. Added in b7e8154.

I can confirm this.

run_exports from the top-level package aren't propagated to output packages.

We noticed this behavior when we first consolidated the recipes back in the day.

- fmt {{ fmt_version }}
- spdlog {{ spdlog_version }}

build:
script_env:
Expand Down Expand Up @@ -53,7 +60,6 @@ outputs:
- cmake {{ cmake_version }}
run:
- cudatoolkit {{ cuda_spec }}
- spdlog {{ spdlog_version }}
test:
commands:
- test -f $PREFIX/include/rmm/thrust_rmm_allocator.h
Expand Down
3 changes: 2 additions & 1 deletion dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,8 @@ dependencies:
- scikit-build>=0.13.1
- output_types: conda
packages:
- spdlog>=1.8.5,<1.9
- fmt>=9.1.0,<10
- spdlog>=1.11.0,<1.12
checks:
common:
- output_types: [conda, requirements]
Expand Down