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

Update to fmt 10.1.1 and spdlog 1.12.0. #14355

Merged
merged 13 commits into from
Nov 30, 2023
Merged

Update to fmt 10.1.1 and spdlog 1.12.0. #14355

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
cc72f02
Build with spdlog 1.12.0 and fmt 10.1.1.
bdice Nov 3, 2023
df8e115
Merge branch 'branch-23.12' into spdlog_1.12_fmt_10
bdice Nov 13, 2023
e72ea6e
Merge branch 'branch-24.02' into spdlog_1.12_fmt_10
bdice Nov 16, 2023
be8e42f
Merge branch 'branch-24.02' into spdlog_1.12_fmt_10
bdice Nov 20, 2023
8be6f80
Use rmm artifacts.
bdice Nov 20, 2023
7c648d3
Fix PR number.
bdice Nov 20, 2023
e29057e
Merge remote-tracking branch 'upstream/branch-24.02' into spdlog_1.12…
bdice Nov 22, 2023
bd5077e
Cast cudaError_t to int to make logging messages work.
bdice Nov 22, 2023
3ddf725
Rerun CI.
bdice Nov 29, 2023
041370d
Merge remote-tracking branch 'upstream/branch-24.02' into spdlog_1.12…
bdice Nov 29, 2023
f4aab21
Merge branch 'branch-24.02' into spdlog_1.12_fmt_10
bdice Nov 30, 2023
af8b5a3
Revert build changes.
bdice Nov 30, 2023
edb76e2
Merge branch 'branch-24.02' into spdlog_1.12_fmt_10
bdice Nov 30, 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
4 changes: 2 additions & 2 deletions 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 @@ -31,7 +31,7 @@ dependencies:
- dlpack>=0.5,<0.6.0a0
- doxygen=1.9.1
- fastavro>=0.22.9
- fmt>=9.1.0,<10
- fmt>=10.1.1,<11
- fsspec>=0.6.0
- gcc_linux-64=11.*
- gmock>=1.13.0
Expand Down Expand Up @@ -88,7 +88,7 @@ dependencies:
- s3fs>=2022.3.0
- scikit-build>=0.13.1
- scipy
- spdlog>=1.11.0,<1.12
- spdlog>=1.12.0,<1.13
- sphinx
- sphinx-autobuild
- sphinx-copybutton
Expand Down
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-120_arch-x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ dependencies:
- dlpack>=0.5,<0.6.0a0
- doxygen=1.9.1
- fastavro>=0.22.9
- fmt>=9.1.0,<10
- fmt>=10.1.1,<11
- fsspec>=0.6.0
- gcc_linux-64=11.*
- gmock>=1.13.0
Expand Down Expand Up @@ -85,7 +85,7 @@ dependencies:
- s3fs>=2022.3.0
- scikit-build>=0.13.1
- scipy
- spdlog>=1.11.0,<1.12
- spdlog>=1.12.0,<1.13
- sphinx
- sphinx-autobuild
- sphinx-copybutton
Expand Down
4 changes: 2 additions & 2 deletions conda/recipes/libcudf/conda_build_config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,10 +32,10 @@ librdkafka_version:
- ">=1.9.0,<1.10.0a0"

fmt_version:
- ">=9.1.0,<10"
- ">=10.1.1,<11"

spdlog_version:
- ">=1.11.0,<1.12"
- ">=1.12.0,<1.13"

nvcomp_version:
- "=3.0.4"
Expand Down
8 changes: 6 additions & 2 deletions cpp/src/io/utilities/datasource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,9 @@ class memory_mapped_source : public file_source {
if (result == cudaSuccess) {
_is_map_registered = true;
} else {
CUDF_LOG_WARN("cudaHostRegister failed with {} ({})", result, cudaGetErrorString(result));
CUDF_LOG_WARN("cudaHostRegister failed with {} ({})",
static_cast<int>(result),
cudaGetErrorString(result));
}
}

Expand All @@ -207,7 +209,9 @@ class memory_mapped_source : public file_source {

auto const result = cudaHostUnregister(_map_addr);
if (result != cudaSuccess) {
CUDF_LOG_WARN("cudaHostUnregister failed with {} ({})", result, cudaGetErrorString(result));
CUDF_LOG_WARN("cudaHostUnregister failed with {} ({})",
static_cast<int>(result),
cudaGetErrorString(result));
}
}

Expand Down
4 changes: 2 additions & 2 deletions dependencies.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,7 @@ dependencies:
common:
- output_types: conda
packages:
- fmt>=9.1.0,<10
- fmt>=10.1.1,<11
- &gbench benchmark==1.8.0
- &gtest gtest>=1.13.0
- &gmock gmock>=1.13.0
Expand All @@ -246,7 +246,7 @@ dependencies:
- librdkafka>=1.9.0,<1.10.0a0
# Align nvcomp version with rapids-cmake
- nvcomp==3.0.4
- spdlog>=1.11.0,<1.12
- spdlog>=1.12.0,<1.13
build_wheels:
common:
- output_types: [requirements, pyproject]
Expand Down