Skip to content

Commit e0f644d

Browse files
authored
Merge pull request #593 from NVIDIA/branch-24.02
release 24.02 [skip ci]
2 parents e8d138b + 4030ccb commit e0f644d

Some content is hidden

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

63 files changed

+1706
-193
lines changed

.github/workflows/auto-merge.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (c) 2022-2023, NVIDIA CORPORATION.
1+
# Copyright (c) 2022-2024, NVIDIA CORPORATION.
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -18,7 +18,7 @@ name: auto-merge HEAD to BASE
1818
on:
1919
pull_request_target:
2020
branches:
21-
- branch-23.12
21+
- branch-24.02
2222
types: [closed]
2323

2424
jobs:
@@ -29,14 +29,14 @@ jobs:
2929
steps:
3030
- uses: actions/checkout@v3
3131
with:
32-
ref: branch-23.12 # force to fetch from latest upstream instead of PR ref
32+
ref: branch-24.02 # force to fetch from latest upstream instead of PR ref
3333

3434
- name: auto-merge job
3535
uses: ./.github/workflows/auto-merge
3636
env:
3737
OWNER: NVIDIA
3838
REPO_NAME: spark-rapids-ml
39-
HEAD: branch-23.12
40-
BASE: branch-24.02
39+
HEAD: branch-24.02
40+
BASE: branch-24.04
4141
AUTOMERGE_TOKEN: ${{ secrets.AUTOMERGE_TOKEN }} # use to merge PR
4242

.github/workflows/blossom-ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,10 @@ jobs:
4242
rongou,\
4343
wjxiz1992,\
4444
GaryShen2008,\
45-
pxLi,\
4645
NvTimLiu,\
4746
YanxuanLiu,\
4847
zhanga5,\
49-
rishic3,\
48+
Er1cCheng,\
5049
', format('{0},', github.actor)) && github.event.comment.body == 'build'
5150
steps:
5251
- name: Check if comment is issued by authorized person

ci/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86
3737
&& conda config --set solver libmamba
3838

3939
# install cuML
40-
ARG CUML_VER=23.12
40+
ARG CUML_VER=24.02
4141
RUN conda install -y -c rapidsai -c conda-forge -c nvidia cuml=$CUML_VER python=3.9 cuda-version=11.8 \
4242
&& conda clean --all -f -y

ci/deploy.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.
3+
# Copyright (c) 2024, 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.

ci/docs.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.
3+
# Copyright (c) 2024, 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.

ci/test.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/bash
22
#
3-
# Copyright (c) 2023, NVIDIA CORPORATION. All rights reserved.
3+
# Copyright (c) 2024, 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.

docker/Dockerfile.pip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ ARG CUDA_VERSION=11.8.0
1818
FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu22.04
1919

2020
ARG PYSPARK_VERSION=3.3.1
21-
ARG RAPIDS_VERSION=23.12.0
21+
ARG RAPIDS_VERSION=24.2.0
2222
ARG ARCH=amd64
2323
#ARG ARCH=arm64
2424
# Install packages to build spark-rapids-ml

docker/Dockerfile.python

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
ARG CUDA_VERSION=11.8.0
1818
FROM nvidia/cuda:${CUDA_VERSION}-devel-ubuntu20.04
1919

20-
ARG CUML_VERSION=23.12
20+
ARG CUML_VERSION=24.02
2121

2222
# Install packages to build spark-rapids-ml
2323
RUN apt update -y \

docs/source/conf.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
# https://www.sphinx-doc.org/en/master/usage/configuration.html#project-information
88

99
project = 'spark-rapids-ml'
10-
copyright = '2023, NVIDIA'
10+
copyright = '2024, NVIDIA'
1111
author = 'NVIDIA'
12-
release = '23.12.0'
12+
release = '24.02.0'
1313

1414
# -- General configuration ---------------------------------------------------
1515
# https://www.sphinx-doc.org/en/master/usage/configuration.html#general-configuration

jvm/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ the _project root path_ with:
7474
cd jvm
7575
mvn clean package
7676
```
77-
Then `rapids-4-spark-ml_2.12-23.12.0-SNAPSHOT.jar` will be generated under `target` folder.
77+
Then `rapids-4-spark-ml_2.12-24.02.0-SNAPSHOT.jar` will be generated under `target` folder.
7878
7979
Users can also use the _release_ version spark-rapids plugin as the dependency if it's already been
8080
released in public maven repositories, see [rapids-4-spark maven repository](https://mvnrepository.com/artifact/com.nvidia/rapids-4-spark)
@@ -94,8 +94,8 @@ repository, usually in your `~/.m2/repository`.
9494
9595
Add the artifact jar to the Spark, for example:
9696
```bash
97-
ML_JAR="target/rapids-4-spark-ml_2.12-23.12.0-SNAPSHOT.jar"
98-
PLUGIN_JAR="~/.m2/repository/com/nvidia/rapids-4-spark_2.12/23.12.0/rapids-4-spark_2.12-23.12.1.jar"
97+
ML_JAR="target/rapids-4-spark-ml_2.12-24.02.0-SNAPSHOT.jar"
98+
PLUGIN_JAR="~/.m2/repository/com/nvidia/rapids-4-spark_2.12/24.02.0/rapids-4-spark_2.12-24.02.0.jar"
9999
100100
$SPARK_HOME/bin/spark-shell --master $SPARK_MASTER \
101101
--driver-memory 20G \

0 commit comments

Comments
 (0)