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

Upgrade to spdlog 1.10 #1173

Merged
merged 2 commits into from
Dec 2, 2022
Merged

Upgrade to spdlog 1.10 #1173

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3e4b24d
upgrade to spdlog 1.10
Dec 1, 2022
c328a18
update dependencies.yaml and regenerate
Dec 1, 2022
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 .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ repos:
hooks:
- id: black
args: ["--config=python/pyproject.toml"]
- repo: https://gitlab.com/pycqa/flake8
- repo: https://github.com/PyCQA/flake8
rev: 3.8.3
hooks:
- id: flake8
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-115_arch-x86_64.yaml
View file
Open in desktop
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.8.5,<1.9
- spdlog=1.10
name: all_cuda-115_arch-x86_64
2 changes: 1 addition & 1 deletion conda/environments/all_cuda-116_arch-x86_64.yaml
View file
Open in desktop
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.8.5,<1.9
- spdlog=1.10
name: all_cuda-116_arch-x86_64
3 changes: 3 additions & 0 deletions conda/recipes/librmm/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,5 +13,8 @@ cmake_version:
gtest_version:
- "=1.10.0"

spdlog_version:
- "1.10"

sysroot_version:
- "2.17"
2 changes: 1 addition & 1 deletion conda/recipes/librmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ outputs:
- cmake {{ cmake_version }}
run:
- cudatoolkit {{ cuda_spec }}
- spdlog>=1.8.5,<1.9
- spdlog {{ spdlog_version }}
test:
commands:
- test -f $PREFIX/include/rmm/thrust_rmm_allocator.h
Expand Down
1 change: 0 additions & 1 deletion conda/recipes/rmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,6 @@ requirements:
- python
- scikit-build>=0.13.1
- setuptools
- spdlog>=1.8.5,<2.0.0a0
Copy link
Contributor Author

Choose a reason for hiding this comment

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

As far as I could tell the RMM cython doesn't directly use spdlog in any way other than needing to find it during build time because of the librmm dependency. It will get spdlog from the run dependency of the librmm recipe.

run:
- cuda-python >=11.7.1,<12.0
- numba >=0.49
Expand Down
2 changes: 1 addition & 1 deletion dependencies.yaml
View file
Open in desktop
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.8.5,<1.9
- spdlog=1.10
cudatoolkit:
specific:
- output_types: conda
Expand Down