Skip to content

Commit

Permalink
Merge branch-24.12 into main [skip ci] (#2751)
Browse files Browse the repository at this point in the history
Change version to 24.12.1

Note: merge this PR with **Create a merge commit to merge**
  • Loading branch information
NvTimLiu authored Jan 10, 2025
2 parents dc40a2d + 45bd6a3 commit 894dc4d
Show file tree
Hide file tree
Showing 4 changed files with 25 additions and 4 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.
4 changes: 2 additions & 2 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
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.
Expand All @@ -21,7 +21,7 @@

<groupId>com.nvidia</groupId>
<artifactId>spark-rapids-jni</artifactId>
<version>24.12.0</version>
<version>24.12.1</version>
<packaging>jar</packaging>
<name>RAPIDS Accelerator JNI for Apache Spark</name>
<description>
Expand Down
4 changes: 2 additions & 2 deletions src/main/cpp/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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. You may obtain a copy of the License at
Expand Down Expand Up @@ -51,7 +51,7 @@ rapids_cuda_init_architectures(SPARK_RAPIDS_JNI)

project(
SPARK_RAPIDS_JNI
VERSION 24.12.00
VERSION 24.12.01
LANGUAGES C CXX CUDA
)

Expand Down

0 comments on commit 894dc4d

Please sign in to comment.