From 4a29d823d16676b4f354d4494a0fa9e5a9c52204 Mon Sep 17 00:00:00 2001 From: David Wendt Date: Fri, 20 Dec 2024 11:52:59 -0500 Subject: [PATCH 1/4] Fix possible overflow in WriteCoalescingCallbackWrapper::TearDown --- cpp/src/io/fst/agent_dfa.cuh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cpp/src/io/fst/agent_dfa.cuh b/cpp/src/io/fst/agent_dfa.cuh index 2a75c034dc8..89beace3811 100644 --- a/cpp/src/io/fst/agent_dfa.cuh +++ b/cpp/src/io/fst/agent_dfa.cuh @@ -308,12 +308,14 @@ class WriteCoalescingCallbackWrapper { { __syncthreads(); if constexpr (!DiscardTranslatedOutput) { - for (uint32_t out_char = threadIdx.x; out_char < tile_out_count; out_char += blockDim.x) { + for (thread_index_type out_char = threadIdx.x; out_char < tile_out_count; + out_char += blockDim.x) { out_it[tile_out_offset + out_char] = temp_storage.compacted_symbols[out_char]; } } if constexpr (!DiscardIndexOutput) { - for (uint32_t out_char = threadIdx.x; out_char < tile_out_count; out_char += blockDim.x) { + for (thread_index_type out_char = threadIdx.x; out_char < tile_out_count; + out_char += blockDim.x) { out_idx_it[tile_out_offset + out_char] = temp_storage.compacted_offset[out_char] + tile_in_offset; } From c6e5444b731ef801afb8d59e877138a140d38f03 Mon Sep 17 00:00:00 2001 From: David Wendt Date: Thu, 2 Jan 2025 11:05:27 -0500 Subject: [PATCH 2/4] fix docs-build experiment --- .../user_guide/api_docs/general_functions.rst | 34 +++++++++---------- docs/cudf/source/user_guide/api_docs/io.rst | 8 ++--- 2 files changed, 21 insertions(+), 21 deletions(-) diff --git a/docs/cudf/source/user_guide/api_docs/general_functions.rst b/docs/cudf/source/user_guide/api_docs/general_functions.rst index 38e070b0d53..5c5b5cb3b04 100644 --- a/docs/cudf/source/user_guide/api_docs/general_functions.rst +++ b/docs/cudf/source/user_guide/api_docs/general_functions.rst @@ -9,26 +9,26 @@ Data manipulations .. autosummary:: :toctree: api/ - cudf.concat - cudf.crosstab - cudf.cut - cudf.factorize - cudf.get_dummies - cudf.melt - cudf.merge - cudf.pivot - cudf.pivot_table - cudf.unstack + concat + crosstab + cut + factorize + get_dummies + melt + merge + pivot + pivot_table + unstack Top-level conversions --------------------- .. autosummary:: :toctree: api/ - cudf.to_numeric - cudf.from_dataframe - cudf.from_dlpack - cudf.from_pandas + to_numeric + from_dataframe + from_dlpack + from_pandas Top-level dealing with datetimelike data ---------------------------------------- @@ -36,8 +36,8 @@ Top-level dealing with datetimelike data .. autosummary:: :toctree: api/ - cudf.to_datetime - cudf.date_range + to_datetime + date_range Top-level dealing with Interval data ------------------------------------ @@ -45,4 +45,4 @@ Top-level dealing with Interval data .. autosummary:: :toctree: api/ - cudf.interval_range + interval_range diff --git a/docs/cudf/source/user_guide/api_docs/io.rst b/docs/cudf/source/user_guide/api_docs/io.rst index 417970715f8..ad8ba8a9bdf 100644 --- a/docs/cudf/source/user_guide/api_docs/io.rst +++ b/docs/cudf/source/user_guide/api_docs/io.rst @@ -35,10 +35,10 @@ Parquet read_parquet DataFrame.to_parquet - cudf.io.parquet.read_parquet_metadata - cudf.io.parquet.ParquetDatasetWriter - cudf.io.parquet.ParquetDatasetWriter.close - cudf.io.parquet.ParquetDatasetWriter.write_table + io.parquet.read_parquet_metadata + io.parquet.ParquetDatasetWriter + io.parquet.ParquetDatasetWriter.close + io.parquet.ParquetDatasetWriter.write_table ORC From 7f7f0dd6660c1cc72472ff4eefb066ad462648a6 Mon Sep 17 00:00:00 2001 From: David Wendt Date: Thu, 2 Jan 2025 11:10:22 -0500 Subject: [PATCH 3/4] change copyright year for style check --- cpp/src/io/fst/agent_dfa.cuh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cpp/src/io/fst/agent_dfa.cuh b/cpp/src/io/fst/agent_dfa.cuh index 89beace3811..5685b50c322 100644 --- a/cpp/src/io/fst/agent_dfa.cuh +++ b/cpp/src/io/fst/agent_dfa.cuh @@ -1,5 +1,5 @@ /* - * Copyright (c) 2022-2024, NVIDIA CORPORATION. + * Copyright (c) 2022-2025, NVIDIA CORPORATION. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. From 7fed58ce641c4368c1e8d95a4ca30ae909eabd7a Mon Sep 17 00:00:00 2001 From: David Wendt Date: Thu, 2 Jan 2025 17:21:44 -0500 Subject: [PATCH 4/4] test cmake rmm-logger change too --- cpp/CMakeLists.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt index 8c6cd922747..a370e23fd5b 100644 --- a/cpp/CMakeLists.txt +++ b/cpp/CMakeLists.txt @@ -1,5 +1,5 @@ # ============================================================================= -# Copyright (c) 2018-2024, NVIDIA CORPORATION. +# Copyright (c) 2018-2025, NVIDIA CORPORATION. # # Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except # in compliance with the License. You may obtain a copy of the License at @@ -277,7 +277,7 @@ rapids_cpm_init() # Not using rapids-cmake since we never want to find, always download. CPMAddPackage( NAME rapids_logger GITHUB_REPOSITORY rapidsai/rapids-logger GIT_SHALLOW FALSE GIT_TAG - c510947ae9d3a67530cfe3e5eaccb5a3b8ea0e55 VERSION c510947ae9d3a67530cfe3e5eaccb5a3b8ea0e55 + 1043e0f3989d75ad52f5212544b8154777e86fc9 VERSION 1043e0f3989d75ad52f5212544b8154777e86fc9 ) rapids_make_logger(cudf EXPORT_SET cudf-exports)