Skip to content

Commit

Permalink
Update to fmt 10.1.1 and spdlog 1.12.0. (#14355)
Browse files Browse the repository at this point in the history
This PR updates to fmt 10.1.1 and spdlog 1.12.

Depends on rapidsai/rmm#1374.

Authors:
   - Bradley Dice (https://github.com/bdice)

Approvers:
   - Vyas Ramasubramani (https://github.com/vyasr)
   - Yunsong Wang (https://github.com/PointKernel)
   - Ray Douglass (https://github.com/raydouglass)
   - Jake Awe (https://github.com/AyodeAwe)
  • Loading branch information
bdice authored Nov 30, 2023
1 parent ac35d19 commit c8074b5
Show file tree
Hide file tree
Showing 5 changed files with 14 additions and 10 deletions.
4 changes: 2 additions & 2 deletions conda/environments/all_cuda-118_arch-x86_64.yaml
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
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
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
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
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

0 comments on commit c8074b5

Please sign in to comment.