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

upgrade spdlog to 1.8.5 #658

Merged
merged 16 commits into from
May 24, 2021
Merged

upgrade spdlog to 1.8.5 #658

Show file tree
Hide file tree
Changes from 14 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
d330b62
upgrade spdlog to 1.8.2
rongou Dec 11, 2020
c5fe167
pin version
rongou Dec 16, 2020
47208de
Merge branch 'branch-0.18' into upgrade-spdlog
rongou Jan 5, 2021
0f1fb3f
install spdlog 1.8.2 in ci/gpu build script
rongou Jan 5, 2021
e1ba64b
fix conda call
rongou Jan 5, 2021
213229a
use conda-forge for spdlog
rongou Jan 6, 2021
d2fe386
reinstall spdlog from conda-forge
rongou Jan 6, 2021
b2b3dcc
maybe this will work
rongou Jan 7, 2021
5903805
Merge branch 'branch-0.20' into upgrade-spdlog
rongou Apr 19, 2021
6a4b42f
update to 1.8.5
rongou Apr 19, 2021
5264fa1
Merge remote-tracking branch 'upstream/branch-0.20' into upgrade-spdlog
rongou Apr 22, 2021
bfda4a7
fix librmm recipe
rongou Apr 22, 2021
fb08b67
test spdlog 1.8.5
rongou Apr 22, 2021
35a1d68
fix conda remove
rongou Apr 22, 2021
3c0099a
Merge remote-tracking branch 'upstream/branch-21.06' into upgrade-spdlog
rongou May 21, 2021
ecbd264
revert test change
rongou May 21, 2021
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
4 changes: 2 additions & 2 deletions ci/gpu/build.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@ conda activate rapids
gpuci_conda_retry install rapids-build-env=${MINOR_VERSION}.*

# https://docs.rapids.ai/maintainers/depmgmt/
# conda remove -f rapids-build-env
# gpuci_conda_retry install "your-pkg=1.0.0"
conda remove --force -y rapids-build-env
gpuci_conda_retry install "spdlog=1.8.5"

gpuci_logger "Check versions"
python --version
Expand Down
2 changes: 1 addition & 1 deletion cmake/Modules/RMM_thirdparty.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# spdlog

set(RMM_MIN_VERSION_spdlog 1.7.0)
set(RMM_MIN_VERSION_spdlog 1.8.5)

CPMFindPackage(
NAME spdlog
Expand Down
2 changes: 1 addition & 1 deletion conda/environments/rmm_dev_cuda10.1.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ dependencies:
- cffi>=1.10.0
- pytest
- cudatoolkit=10.1
- spdlog=1.7.0
- spdlog>=1.8.5,<2.0.0a0
- cython>=0.29,<0.30
2 changes: 1 addition & 1 deletion conda/environments/rmm_dev_cuda10.2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ dependencies:
- cffi>=1.10.0
- pytest
- cudatoolkit=10.2
- spdlog=1.7.0
- spdlog>=1.8.5,<2.0.0a0
- cython>=0.29,<0.30
2 changes: 1 addition & 1 deletion conda/environments/rmm_dev_cuda11.0.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,5 @@ dependencies:
- cffi>=1.10.0
- pytest
- cudatoolkit=11.0
- spdlog=1.7.0
- spdlog>=1.8.5,<2.0.0a0
- cython>=0.29,<0.30
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 @@ -35,7 +35,7 @@ requirements:
- cudatoolkit {{ cuda_version }}.*
run:
- {{ pin_compatible('cudatoolkit', max_pin='x.x') }}
- spdlog=1.7.0
- spdlog>=1.8.5,<2.0.0a0

test:
commands:
Expand Down
2 changes: 1 addition & 1 deletion conda/recipes/rmm/meta.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ requirements:
- librmm {{ version }}
- setuptools
- cython >=0.29,<0.30
- spdlog=1.7.0
- spdlog>=1.8.5,<2.0.0a0
- cudatoolkit {{ cuda_version }}.*
run:
- python
Expand Down