Skip to content

Commit 8cc6bf9

Browse files
authored
Merge branch 'NVIDIA:main' into main
2 parents ec78131 + 5e6e35f commit 8cc6bf9

File tree

729 files changed

+28621
-11484
lines changed

Some content is hidden

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

729 files changed

+28621
-11484
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 30 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -2,32 +2,41 @@
22
33
Thank you for contributing to RAPIDS Accelerator for Apache Spark!
44
5-
Here are some guidelines to help the review process go smoothly.
5+
Please read https://github.com/NVIDIA/spark-rapids/blob/HEAD/CONTRIBUTING.md#creating-a-pull-request before making this PR.
66
7-
1. Please write a description in this text box of the changes that are being
8-
made.
7+
The following are the guidelines to help the review process go smoothly. Please read them carefully and fill out relevant information as much as possible.
98
10-
2. Please ensure that you have written units tests for the changes made/features
11-
added.
9+
Thank you for your cooperation!
1210
13-
3. If you are closing an issue please use one of the automatic closing words as
14-
noted here: https://help.github.com/articles/closing-issues-using-keywords/
15-
16-
4. If your pull request is not ready for review but you want to make use of the
17-
continuous integration testing facilities please label it with `[WIP]`.
11+
-->
1812

19-
5. If your pull request is ready to be reviewed without requiring additional
20-
work on top of it, then remove the `[WIP]` label (if present).
13+
<!--
14+
Please replace #xxxx with the ID of the issue fixed in this PR. If such issue does not exist, please consider filing one and link it here.
15+
-->
16+
Fixes #xxxx.
2117

22-
6. Once all work has been done and review has taken place please do not add
23-
features or make changes out of the scope of those requested by the reviewer
24-
(doing this just add delays as already reviewed code ends up having to be
25-
re-reviewed/it is hard to tell what is new etc!). Further, please avoid
26-
rebasing your branch during the review process, as this causes the context
27-
of any comments made by reviewers to be lost. If conflicts occur during
28-
review then they should be resolved by merging into the branch used for
29-
making the pull request.
18+
### Description
3019

31-
Many thanks in advance for your cooperation!
20+
<!--
21+
Please provide a description of the changes proposed in this pull request. Here are some questions to help you fill out the description:
3222
23+
- What is the problem you are trying to solve? Describe it from the user's perspective. If you have an existing github issue, please add a summary of the issue here.
24+
- After this change, what will the user experience be like? Please describe any user-facing changes, such as new configurations or new behaviors. If you are introducing new configurations, please add some guidelines on how to use them.
25+
- How are you fixing the problem? Please provide a technical description of your solution. You can add or link your design doc if it exists.
26+
- How are the new features/behaviors tested? Please describe the test cases you added or modified. If they are tested in a cluster, please describe it as well.
3327
-->
28+
29+
### Checklists
30+
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:
34+
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.
38+
(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.)

.github/workflows/blossom-ci.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,7 @@ jobs:
7575
github.actor == 'pxLi' ||
7676
github.actor == 'SurajAralihalli' ||
7777
github.actor == 'jihoonson' ||
78-
github.actor == 'ustcfy' ||
79-
github.actor == 'knoguchi22' ||
80-
github.actor == 'warrickhe'
78+
github.actor == 'knoguchi22'
8179
)
8280
steps:
8381
- name: Check if comment is issued by authorized person

.github/workflows/mvn-verify-check/get-deps-sha1.sh

Lines changed: 27 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
set -e
1818

1919
scala_ver=${1:-"2.12"}
20-
base_URL="https://oss.sonatype.org/service/local/artifact/maven/resolve"
20+
base_URL="https://central.sonatype.com/repository/maven-snapshots/com/nvidia"
2121
project_jni="spark-rapids-jni"
2222
project_private="rapids-4-spark-private_${scala_ver}"
2323
project_hybrid="rapids-4-spark-hybrid_${scala_ver}"
@@ -26,26 +26,43 @@ jni_ver=$(mvn help:evaluate -q -pl dist -Dexpression=spark-rapids-jni.version -D
2626
private_ver=$(mvn help:evaluate -q -pl dist -Dexpression=spark-rapids-private.version -DforceStdout)
2727
hybrid_ver=$(mvn help:evaluate -q -pl dist -Dexpression=spark-rapids-hybrid.version -DforceStdout)
2828

29+
get_latest_snapshot_version() {
30+
local project_URL="$1"
31+
if [ -z "$project_URL" ]; then
32+
return 0
33+
fi
34+
local latest_ver
35+
latest_ver=$(curl -s "${project_URL}/maven-metadata.xml" 2>/dev/null | tr -d '\n' |
36+
grep -o '<snapshotVersion>.*<extension>jar</extension>.*<value>[^<]*</value>' |
37+
sed -n 's/.*<value>\([^<]*\)<\/value>.*/\1/p' |
38+
head -1) || latest_ver=""
39+
echo "$latest_ver"
40+
}
41+
42+
2943
if [[ $jni_ver == *SNAPSHOT* ]]; then
30-
jni_sha1=$(curl -s -H "Accept: application/json" \
31-
"${base_URL}?r=snapshots&g=com.nvidia&a=${project_jni}&v=${jni_ver}&c=&e=jar&wt=json" \
32-
| jq .data.sha1) || $(date +'%Y-%m-%d')
44+
jni_URL="${base_URL}/${project_jni}/${jni_ver}"
45+
jni_latest_ver=$(get_latest_snapshot_version "${jni_URL}")
46+
jni_sha1=$(curl -sf "${jni_URL}/${project_jni}-${jni_latest_ver}.jar.sha1" 2>/dev/null) \
47+
|| jni_sha1=$(date +'%Y-%m-%d')
3348
else
3449
jni_sha1=$jni_ver
3550
fi
3651

3752
if [[ $private_ver == *SNAPSHOT* ]]; then
38-
private_sha1=$(curl -s -H "Accept: application/json" \
39-
"${base_URL}?r=snapshots&g=com.nvidia&a=${project_private}&v=${private_ver}&c=&e=jar&wt=json" \
40-
| jq .data.sha1) || $(date +'%Y-%m-%d')
53+
private_URL="${base_URL}/${project_private}/${private_ver}"
54+
private_latest_ver=$(get_latest_snapshot_version "${private_URL}")
55+
private_sha1=$(curl -sf "${private_URL}/${project_private}-${private_latest_ver}.jar.sha1" 2>/dev/null) \
56+
|| private_sha1=$(date +'%Y-%m-%d')
4157
else
4258
private_sha1=$private_ver
4359
fi
4460

4561
if [[ $hybrid_ver == *SNAPSHOT* ]]; then
46-
hybrid_sha1=$(curl -s -H "Accept: application/json" \
47-
"${base_URL}?r=snapshots&g=com.nvidia&a=${project_hybrid}&v=${hybrid_ver}&c=&e=jar&wt=json" \
48-
| jq .data.sha1) || $(date +'%Y-%m-%d')
62+
hybrid_URL="${base_URL}/${project_hybrid}/${hybrid_ver}"
63+
hybrid_latest_ver=$(get_latest_snapshot_version "${hybrid_URL}")
64+
hybrid_sha1=$(curl -sf "${hybrid_URL}/${project_hybrid}-${hybrid_latest_ver}.jar.sha1" 2>/dev/null) \
65+
|| hybrid_sha1=$(date +'%Y-%m-%d')
4966
else
5067
hybrid_sha1=$hybrid_ver
5168
fi
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 }}

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
.generated-mima*
1212
.idea_modules/
1313
.idea/
14+
.mvn/
1415
.metals/
1516
.project
1617
.pydevproject

0 commit comments

Comments
 (0)