Skip to content

Commit 3c26560

Browse files
authored
Merge branch-25.10 into main [skip ci] (#13589)
Change version to 25.10.0 Note: merge this PR with **Create a merge commit to merge**
2 parents 5e6e35f + 08bdcc4 commit 3c26560

File tree

579 files changed

+12893
-1937
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

579 files changed

+12893
-1937
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,15 +28,12 @@ Please provide a description of the changes proposed in this pull request. Here
2828

2929
### Checklists
3030

31-
<!-- Check the items below by putting "x" in the brackets for what is done. Not all of these items may be relevant to every PR. -->
32-
33-
This PR has:
31+
<!--
32+
Check the items below by putting "x" in the brackets for what is done.
33+
Not all of these items may be relevant to every PR, so please check only those that apply.
34+
-->
3435

35-
- [ ] added documentation for new or modified features or behaviors.
36-
- [ ] updated the license in the source code files when it is required.
37-
- [ ] added new tests or modified existing tests to cover new code paths.
36+
- [ ] This PR has added documentation for new or modified features or behaviors.
37+
- [ ] This PR has added new tests or modified existing tests to cover new code paths.
3838
(Please explain in the PR description how the new code paths are tested, such as names of the new/existing tests that cover them.)
39-
40-
Please select one of the following options:
41-
- [ ] Performance testing has been performed and its results are added in the PR description.
42-
- [ ] An issue is filed for performance testing and its link is added in the PR description. (Select this if performance testing will not be completed before the PR is submitted.)
39+
- [ ] Performance testing has been performed and its results are added in the PR description. Or, an issue has been filed with a link in the PR description.

.github/workflows/shell-check.yml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
# Copyright (c) 2025, NVIDIA CORPORATION.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
# A workflow to check shell script syntax
16+
name: shell check
17+
18+
on:
19+
pull_request:
20+
types: [opened, synchronize, reopened]
21+
22+
jobs:
23+
shell-check:
24+
runs-on: ubuntu-latest
25+
if: "!contains(github.event.pull_request.title, '[bot]')"
26+
steps:
27+
- name: Checkout code
28+
uses: NVIDIA/spark-rapids-common/checkout@main
29+
30+
- name: Run ShellCheck
31+
uses: NVIDIA/spark-rapids-common/shell-check@main

CHANGELOG.md

Lines changed: 191 additions & 226 deletions
Large diffs are not rendered by default.

CONTRIBUTING.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ mvn -pl dist -PnoSnapshots package -DskipTests
127127
Verify that shim-specific classes are hidden from a conventional classloader.
128128

129129
```bash
130-
$ javap -cp dist/target/rapids-4-spark_2.12-25.08.0-cuda12.jar com.nvidia.spark.rapids.shims.SparkShimImpl
130+
$ javap -cp dist/target/rapids-4-spark_2.12-25.10.0-cuda12.jar com.nvidia.spark.rapids.shims.SparkShimImpl
131131
Error: class not found: com.nvidia.spark.rapids.shims.SparkShimImpl
132132
```
133133

134134
However, its bytecode can be loaded if prefixed with `spark3XY` not contained in the package name
135135

136136
```bash
137-
$ javap -cp dist/target/rapids-4-spark_2.12-25.08.0-cuda12.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
138-
Warning: File dist/target/rapids-4-spark_2.12-25.08.0-cuda12.jar(/spark320/com/nvidia/spark/rapids/shims/SparkShimImpl.class) does not contain class spark320.com.nvidia.spark.rapids.shims.SparkShimImpl
137+
$ javap -cp dist/target/rapids-4-spark_2.12-25.10.0-cuda12.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
138+
Warning: File dist/target/rapids-4-spark_2.12-25.10.0-cuda12.jar(/spark320/com/nvidia/spark/rapids/shims/SparkShimImpl.class) does not contain class spark320.com.nvidia.spark.rapids.shims.SparkShimImpl
139139
Compiled from "SparkShims.scala"
140140
public final class com.nvidia.spark.rapids.shims.SparkShimImpl {
141141
```
@@ -177,7 +177,7 @@ mvn package -pl dist -am -Dbuildver=340 -DallowConventionalDistJar=true
177177
Verify `com.nvidia.spark.rapids.shims.SparkShimImpl` is conventionally loadable:
178178
179179
```bash
180-
$ javap -cp dist/target/rapids-4-spark_2.12-25.08.0-cuda12.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
180+
$ javap -cp dist/target/rapids-4-spark_2.12-25.10.0-cuda12.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
181181
Compiled from "SparkShims.scala"
182182
public final class com.nvidia.spark.rapids.shims.SparkShimImpl {
183183
```

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ as a `provided` dependency.
7575
<dependency>
7676
<groupId>com.nvidia</groupId>
7777
<artifactId>rapids-4-spark_2.12</artifactId>
78-
<version>25.08.0</version>
78+
<version>25.10.0</version>
7979
<scope>provided</scope>
8080
</dependency>
8181
```

aggregator/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,13 @@
2222
<parent>
2323
<groupId>com.nvidia</groupId>
2424
<artifactId>rapids-4-spark-jdk-profiles_2.12</artifactId>
25-
<version>25.08.0</version>
25+
<version>25.10.0</version>
2626
<relativePath>../jdk-profiles/pom.xml</relativePath>
2727
</parent>
2828
<artifactId>rapids-4-spark-aggregator_2.12</artifactId>
2929
<name>RAPIDS Accelerator for Apache Spark Aggregator</name>
3030
<description>Creates an aggregated shaded package of the RAPIDS plugin for Apache Spark</description>
31-
<version>25.08.0</version>
31+
<version>25.10.0</version>
3232

3333
<properties>
3434
<rapids.module>aggregator</rapids.module>

api_validation/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,11 +22,11 @@
2222
<parent>
2323
<groupId>com.nvidia</groupId>
2424
<artifactId>rapids-4-spark-shim-deps-parent_2.12</artifactId>
25-
<version>25.08.0</version>
25+
<version>25.10.0</version>
2626
<relativePath>../shim-deps/pom.xml</relativePath>
2727
</parent>
2828
<artifactId>rapids-4-spark-api-validation_2.12</artifactId>
29-
<version>25.08.0</version>
29+
<version>25.10.0</version>
3030

3131
<properties>
3232
<rapids.module>api_validation</rapids.module>

build/buildall

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function bloopInstall() {
7575
rm -rf $bloopDir
7676
mv $bloopTmpConfigDir $bloopDir
7777
echo "generated bloop files under $bloopDir"
78-
bloopDirsGenerated+=($bloopDir)
78+
bloopDirsGenerated+=("${bloopDir}")
7979
done
8080
echo "#### Created bloop projects ${bloopDirsGenerated[@]}"
8181
echo "Execute"

build/coverage-report

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#!/bin/bash
22

33
#
4-
# Copyright (c) 2020-2024, NVIDIA CORPORATION. All rights reserved.
4+
# Copyright (c) 2020-2025, NVIDIA CORPORATION. All rights reserved.
55
#
66
# Licensed under the Apache License, Version 2.0 (the "License");
77
# you may not use this file except in compliance with the License.
@@ -46,13 +46,13 @@ if [ ! -f "$JDEST" ]; then
4646
fi
4747

4848
if [ "$#" != "0" ]; then
49-
ARGS=$@
49+
ARGS=("$@")
5050
else
51-
ARGS=$(find . -name "jacoco.exec" -printf "%p ")
51+
ARGS=($(find . -name "jacoco.exec" -printf "%p "))
5252
fi
5353

5454
mkdir -p $XML_LOC
5555
# run the report
56-
java -jar "$JDEST" report --classfiles "$TMP_CLASS" --html "$HTML_LOC" --xml "$XML_LOC/jacoco.xml" $SOURCE_WITH_ARGS $ARGS
56+
java -jar "$JDEST" report --classfiles "$TMP_CLASS" --html "$HTML_LOC" --xml "$XML_LOC/jacoco.xml" $SOURCE_WITH_ARGS "${ARGS[@]}"
5757

5858
echo "The report is at file://"$(readlink -f "$HTML_LOC"/index.html)

build/make-scala-version-build-files.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env bash
22
#
3-
# Copyright (c) 2023-2024, NVIDIA CORPORATION. All rights reserved.
3+
# Copyright (c) 2023-2025, NVIDIA CORPORATION. All rights reserved.
44
#
55
# Licensed under the Apache License, Version 2.0 (the "License");
66
# you may not use this file except in compliance with the License.
@@ -53,7 +53,7 @@ fi
5353
TO_VERSION=$1
5454

5555
check_scala_version() {
56-
for i in ${VALID_VERSIONS[*]}; do [ $i = "$1" ] && return 0; done
56+
for i in "${VALID_VERSIONS[@]}"; do [ $i = "$1" ] && return 0; done
5757
echo "Invalid Scala version: $1. Valid versions: ${VALID_VERSIONS[*]}" 1>&2
5858
exit 1
5959
}

0 commit comments

Comments
 (0)