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.

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

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

Merged
merged 20 commits into from
Feb 13, 2023
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
20 commits
Select commit Hold shift + click to select a range
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-115_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
- cudatoolkit=11.5
- cython>=0.29,<0.30
- flake8=3.8.3
- fmt>=9.1.0
- gcovr>=5.0
- isort=5.10.1
- ninja
Expand All @@ -22,5 +23,5 @@ dependencies:
- pytest-cov
- python>=3.8,<3.10
- scikit-build>=0.13.1
- spdlog>=1.8.5,<1.9
- spdlog>=1.11.0
name: all_cuda-115_arch-x86_64
3 changes: 2 additions & 1 deletion conda/environments/all_cuda-116_arch-x86_64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ dependencies:
- cudatoolkit=11.6
- cython>=0.29,<0.30
- flake8=3.8.3
- fmt>=9.1.0
- gcovr>=5.0
- isort=5.10.1
- ninja
Expand All @@ -22,5 +23,5 @@ dependencies:
- pytest-cov
- python>=3.8,<3.10
- scikit-build>=0.13.1
- spdlog>=1.8.5,<1.9
- spdlog>=1.11.0
name: all_cuda-116_arch-x86_64
5 changes: 4 additions & 1 deletion conda/recipes/librmm/conda_build_config.yaml
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"

gtest_version:
- "=1.10.0"

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

sysroot_version:
- "2.17"
12 changes: 10 additions & 2 deletions conda/recipes/librmm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,16 @@ outputs:
requirements:
build:
- cmake {{ cmake_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 so they are also
# exported as a run requirement.
- fmt {{ fmt_version }}
- spdlog {{ spdlog_version }}
bdice marked this conversation as resolved.
Show resolved Hide resolved
run:
- cudatoolkit {{ cuda_spec }}
- fmt {{ fmt_version }}
- spdlog {{ spdlog_version }}
bdice marked this conversation as resolved.
Show resolved Hide resolved
test:
commands:
Expand Down Expand Up @@ -89,7 +97,7 @@ outputs:
- test -f $PREFIX/include/rmm/mr/host/new_delete_resource.hpp
- test -f $PREFIX/include/rmm/mr/host/pinned_memory_resource.hpp
about:
home: http://rapids.ai/
home: https://rapids.ai/
license: Apache-2.0
summary: librmm library
- name: librmm-tests
Expand All @@ -109,6 +117,6 @@ outputs:
- gtest {{ gtest_version }}
- gmock {{ gtest_version }}
about:
home: http://rapids.ai/
home: https://rapids.ai/
license: Apache-2.0
summary: librmm test & benchmark executables
2 changes: 1 addition & 1 deletion conda/recipes/rmm/meta.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ test:
- rmm

about:
home: http://rapids.ai/
home: https://rapids.ai/
license: Apache-2.0
license_family: Apache
license_file: LICENSE
Expand Down
3 changes: 2 additions & 1 deletion dependencies.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ dependencies:
- scikit-build>=0.13.1
- output_types: conda
packages:
- spdlog>=1.8.5,<1.9
- fmt>=9.1.0
bdice marked this conversation as resolved.
Show resolved Hide resolved
- spdlog>=1.11.0
bdice marked this conversation as resolved.
Show resolved Hide resolved
cudatoolkit:
specific:
- output_types: conda
Expand Down