Skip to content

Commit

Permalink
[auto-merge] bot-auto-merge-branch-24.12 to branch-25.02 [skip ci] [b…
Browse files Browse the repository at this point in the history
…ot] (#2746)

auto-merge triggered by github actions on `bot-auto-merge-branch-24.12`
to create a PR keeping `branch-25.02` up-to-date. If this PR is unable
to be merged due to conflicts, it will remain open until manually fix.
  • Loading branch information
nvauto authored Jan 9, 2025
2 parents c8e631d + ce4cf87 commit 637357e
Show file tree
Hide file tree
Showing 2 changed files with 21 additions and 0 deletions.
21 changes: 21 additions & 0 deletions patches/0_hot_fix_parquet.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
diff --git a/cpp/src/io/parquet/decode_fixed.cu b/cpp/src/io/parquet/decode_fixed.cu
index 9acbe026bb..32bb334966 100644
--- a/cpp/src/io/parquet/decode_fixed.cu
+++ b/cpp/src/io/parquet/decode_fixed.cu
@@ -1,5 +1,5 @@
/*
- * Copyright (c) 2024, NVIDIA CORPORATION.
+ * Copyright (c) 2024-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.
@@ -961,9 +961,6 @@ CUDF_KERNEL void __launch_bounds__(decode_block_size_t, 8)
return;
}

- // if we have no work to do (eg, in a skip_rows/num_rows case) in this page.
- if (s->num_rows == 0) { return; }
-
using value_decoder_type = std::conditional_t<
split_decode_t,
decode_fixed_width_split_values_func<decode_block_size_t, has_lists_t, state_buf_t>,
Empty file removed patches/noop.patch
Empty file.

0 comments on commit 637357e

Please sign in to comment.