Skip to content

Commit 95a5928

Browse files
authored
Merge branch-25.06 into main [skip ci] (#12860)
Change version to 25.06.0 Note: merge this PR with **Create a merge commit to merge**
2 parents 51345be + c6ffd1f commit 95a5928

File tree

575 files changed

+14730
-9419
lines changed

Some content is hidden

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

575 files changed

+14730
-9419
lines changed

.github/workflows/blossom-ci.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ jobs:
7575
github.actor == 'pxLi' ||
7676
github.actor == 'SurajAralihalli' ||
7777
github.actor == 'jihoonson' ||
78-
github.actor == 'ustcfy' ||
7978
github.actor == 'knoguchi22' ||
8079
github.actor == 'warrickhe'
8180
)
Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
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 if comment exists in PR description
16+
name: pr description check
17+
18+
on:
19+
pull_request_target:
20+
types: [opened, edited, reopened]
21+
22+
jobs:
23+
pr-description-check:
24+
runs-on: ubuntu-latest
25+
permissions:
26+
statuses: write
27+
pull-requests: read
28+
contents: read
29+
if: "!contains(github.event.pull_request.title, '[bot]')"
30+
steps:
31+
- name: pr-desciption-check
32+
uses: NVIDIA/spark-rapids-common/pr-description-check@main
33+
with:
34+
github-token: ${{ secrets.GITHUB_TOKEN }}

CHANGELOG.md

Lines changed: 218 additions & 181 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.04.0-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl
130+
$ javap -cp dist/target/rapids-4-spark_2.12-25.06.0-cuda11.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.04.0-cuda11.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
138-
Warning: File dist/target/rapids-4-spark_2.12-25.04.0-cuda11.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.06.0-cuda11.jar spark320.com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
138+
Warning: File dist/target/rapids-4-spark_2.12-25.06.0-cuda11.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
```
@@ -178,7 +178,7 @@ mvn package -pl dist -am -Dbuildver=340 -DallowConventionalDistJar=true
178178
Verify `com.nvidia.spark.rapids.shims.SparkShimImpl` is conventionally loadable:
179179
180180
```bash
181-
$ javap -cp dist/target/rapids-4-spark_2.12-25.04.0-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
181+
$ javap -cp dist/target/rapids-4-spark_2.12-25.06.0-cuda11.jar com.nvidia.spark.rapids.shims.SparkShimImpl | head -2
182182
Compiled from "SparkShims.scala"
183183
public final class com.nvidia.spark.rapids.shims.SparkShimImpl {
184184
```

README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ Documentation on the current release can be found [here](https://nvidia.github.i
99

1010
To get started and try the plugin out use the [getting started guide](https://docs.nvidia.com/spark-rapids/user-guide/latest/getting-started/overview.html).
1111

12+
[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/NVIDIA/spark-rapids)
13+
1214
## Compatibility
1315

1416
The SQL plugin tries to produce results that are bit for bit identical with Apache Spark.
@@ -73,7 +75,7 @@ as a `provided` dependency.
7375
<dependency>
7476
<groupId>com.nvidia</groupId>
7577
<artifactId>rapids-4-spark_2.12</artifactId>
76-
<version>25.04.0</version>
78+
<version>25.06.0</version>
7779
<scope>provided</scope>
7880
</dependency>
7981
```

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.04.0</version>
25+
<version>25.06.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.04.0</version>
31+
<version>25.06.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.04.0</version>
25+
<version>25.06.0</version>
2626
<relativePath>../shim-deps/pom.xml</relativePath>
2727
</parent>
2828
<artifactId>rapids-4-spark-api-validation_2.12</artifactId>
29-
<version>25.04.0</version>
29+
<version>25.06.0</version>
3030

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

datagen/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,12 +24,12 @@ Where `$SPARK_VERSION` is a compressed version number, like 330 for Spark 3.3.0.
2424

2525
After this the jar should be at
2626
`target/datagen_2.12-$PLUGIN_VERSION-spark$SPARK_VERSION.jar`
27-
for example a Spark 3.3.0 jar for the 25.04.0 release would be
28-
`target/datagen_2.12-25.04.0-spark330.jar`
27+
for example a Spark 3.3.0 jar for the 25.06.0 release would be
28+
`target/datagen_2.12-25.06.0-spark330.jar`
2929

3030
To get a spark shell with this you can run
3131
```shell
32-
spark-shell --jars target/datagen_2.12-25.04.0-spark330.jar
32+
spark-shell --jars target/datagen_2.12-25.06.0-spark330.jar
3333
```
3434

3535
After that you should be good to go.

datagen/ScaleTest.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ $SPARK_HOME/bin/spark-submit \
4444
--conf spark.sql.parquet.datetimeRebaseModeInWrite=CORRECTED \
4545
--class com.nvidia.rapids.tests.scaletest.ScaleTestDataGen \ # the main class
4646
--jars $SPARK_HOME/examples/jars/scopt_2.12-3.7.1.jar \ # one dependency jar just shipped with Spark under $SPARK_HOME
47-
./target/datagen_2.12-25.04.0-spark332.jar \
47+
./target/datagen_2.12-25.06.0-spark332.jar \
4848
1 \
4949
10 \
5050
parquet \

datagen/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,13 @@
2121
<parent>
2222
<groupId>com.nvidia</groupId>
2323
<artifactId>rapids-4-spark-shim-deps-parent_2.12</artifactId>
24-
<version>25.04.0</version>
24+
<version>25.06.0</version>
2525
<relativePath>../shim-deps/pom.xml</relativePath>
2626
</parent>
2727
<artifactId>datagen_2.12</artifactId>
2828
<name>Data Generator</name>
2929
<description>Tools for generating large amounts of data</description>
30-
<version>25.04.0</version>
30+
<version>25.06.0</version>
3131
<properties>
3232
<rapids.module>datagen</rapids.module>
3333
<target.classifier/>

0 commit comments

Comments
 (0)