Skip to content

Commit f76cf52

Browse files
jameslambjameslamb
authored
Merge branch 'main' into sdkm
2 parents a19bd45 + 7763ec8 commit f76cf52

File tree

12 files changed

+244
-87
lines changed

12 files changed

+244
-87
lines changed

‎.github/workflows/deploy-cudf-java-docs.yaml‎

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
name: Deploy cudf-java docs
2+
3+
on:
4+
workflow_dispatch:
5+
inputs:
6+
new_stable_value:
7+
description: "New stable value for cudf-java"
8+
required: true
9+
default: "1"
10+
version:
11+
description: "Version being released. Format: YY.MM or YY.MM.P e.g 24.08 or 24.08.1"
12+
required: true
13+
14+
concurrency:
15+
group: ${{ github.workflow }}-${{ github.ref }}
16+
cancel-in-progress: true
17+
18+
defaults:
19+
run:
20+
shell: bash
21+
22+
permissions:
23+
id-token: write
24+
contents: write
25+
pull-requests: write
26+
27+
jobs:
28+
deploy-cudf-java-docs:
29+
runs-on: ubuntu-latest
30+
31+
steps:
32+
- name: Checkout repository
33+
uses: actions/checkout@v4
34+
35+
- uses: aws-actions/configure-aws-credentials@v4
36+
with:
37+
role-to-assume: ${{ vars.AWS_ROLE_ARN }}
38+
aws-region: ${{ vars.AWS_REGION }}
39+
role-duration-seconds: 7200 # 2h
40+
41+
- name: Upload cudf-java docs to S3
42+
run: ci/upload_cudf_java_docs.sh ${{ inputs.version }}
43+
44+
- name: Run script to update stable value for cudf-java in docs.yml
45+
env :
46+
NEW_STABLE_VALUE: ${{ inputs.new_stable_value }}
47+
run: |
48+
if [ "$NEW_STABLE_VALUE" != "1" ]; then
49+
echo "Invalid value for new_stable_value: $NEW_STABLE_VALUE"
50+
exit 1
51+
fi
52+
53+
sed -i '/cudf-java:/,/stable:/s/stable: .*/stable: '"$NEW_STABLE_VALUE"'/' _data/docs.yml
54+
55+
echo "Updated stable value for cudf-java to $NEW_STABLE_VALUE in _data/docs.yml"
56+
57+
- name: Create Pull Request
58+
uses: peter-evans/create-pull-request@v7
59+
with:
60+
token: ${{ secrets.GITHUB_TOKEN }}
61+
commit-message: "Update stable value for cudf-java in docs.yml"
62+
branch: "update-stable-value-for-cudf-java"
63+
title: Enable cudf-java docs for version ${{ inputs.version }}
64+
author: "github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>"
65+
body: |
66+
This PR enables cudf-java docs for version ${{ inputs.version }}.

‎Gemfile.lock‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -247,7 +247,7 @@ GEM
247247
rb-fsevent (0.11.2)
248248
rb-inotify (0.11.1)
249249
ffi (~> 1.0)
250-
rexml (3.3.7)
250+
rexml (3.3.9)
251251
rouge (3.30.0)
252252
rubyzip (2.3.2)
253253
safe_yaml (1.0.5)
@@ -269,7 +269,7 @@ GEM
269269
concurrent-ruby (~> 1.0)
270270
unicode-display_width (1.8.0)
271271
uri (0.13.1)
272-
webrick (1.8.1)
272+
webrick (1.8.2)
273273

274274
PLATFORMS
275275
x86_64-linux

‎_data/previous_releases.json‎

Lines changed: 39 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,43 @@
11
[
2+
{
3+
"version": "24.10",
4+
"ucxx_version": "0.40",
5+
"cudf_dev": {
6+
"start": "Jul 18 2024",
7+
"end": "Sep 18 2024",
8+
"days": "42"
9+
},
10+
"other_dev": {
11+
"start": "Jul 25 2024",
12+
"end": "Sep 25 2024",
13+
"days": "42"
14+
},
15+
"cudf_burndown": {
16+
"start": "Sep 19 2024",
17+
"end": "Sep 25 2024",
18+
"days": "5"
19+
},
20+
"other_burndown": {
21+
"start": "Sep 26 2024",
22+
"end": "Oct 2 2024",
23+
"days": "5"
24+
},
25+
"cudf_codefreeze": {
26+
"start": "Sep 26 2024",
27+
"end": "Oct 8 2024",
28+
"days": "9"
29+
},
30+
"other_codefreeze": {
31+
"start": "Oct 3 2024",
32+
"end": "Oct 8 2024",
33+
"days": "4"
34+
},
35+
"release": {
36+
"start": "Oct 9 2024",
37+
"end": "Oct 10 2024",
38+
"days": "2"
39+
}
40+
},
241
{
342
"version": "24.08",
443
"ucxx_version": "0.39",

‎_data/releases.json‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,54 +1,15 @@
11
{
22
"legacy": {
3-
"version": "24.06",
4-
"ucxx_version": "0.38",
5-
"date": "Jun 6 2024"
6-
},
7-
"stable": {
83
"version": "24.08",
94
"ucxx_version": "0.39",
105
"date": "Aug 8 2024"
116
},
12-
"nightly": {
7+
"stable": {
138
"version": "24.10",
149
"ucxx_version": "0.40",
15-
"cudf_dev": {
16-
"start": "Jul 18 2024",
17-
"end": "Sep 18 2024",
18-
"days": "42"
19-
},
20-
"other_dev": {
21-
"start": "Jul 25 2024",
22-
"end": "Sep 25 2024",
23-
"days": "42"
24-
},
25-
"cudf_burndown": {
26-
"start": "Sep 19 2024",
27-
"end": "Sep 25 2024",
28-
"days": "5"
29-
},
30-
"other_burndown": {
31-
"start": "Sep 26 2024",
32-
"end": "Oct 2 2024",
33-
"days": "5"
34-
},
35-
"cudf_codefreeze": {
36-
"start": "Sep 26 2024",
37-
"end": "Oct 8 2024",
38-
"days": "9"
39-
},
40-
"other_codefreeze": {
41-
"start": "Oct 3 2024",
42-
"end": "Oct 8 2024",
43-
"days": "4"
44-
},
45-
"release": {
46-
"start": "Oct 9 2024",
47-
"end": "Oct 10 2024",
48-
"days": "2"
49-
}
10+
"date": "Oct 10 2024"
5011
},
51-
"next_nightly": {
12+
"nightly": {
5213
"version": "24.12",
5314
"ucxx_version": "0.41",
5415
"cudf_dev": {
@@ -86,5 +47,44 @@
8647
"end": "Dec 12 2024",
8748
"days": "2"
8849
}
50+
},
51+
"next_nightly": {
52+
"version": "25.02",
53+
"ucxx_version": "0.42",
54+
"cudf_dev": {
55+
"start": "Nov 14 2024",
56+
"end": "Jan 22 2025",
57+
"days": "43"
58+
},
59+
"other_dev": {
60+
"start": "Nov 21 2024",
61+
"end": "Jan 29 2025",
62+
"days": "43"
63+
},
64+
"cudf_burndown": {
65+
"start": "Jan 23 2025",
66+
"end": "Jan 29 2025",
67+
"days": "5"
68+
},
69+
"other_burndown": {
70+
"start": "Jan 30 2025",
71+
"end": "Feb 5 2025",
72+
"days": "5"
73+
},
74+
"cudf_codefreeze": {
75+
"start": "Jan 30 2025",
76+
"end": "Feb 11 2025",
77+
"days": "9"
78+
},
79+
"other_codefreeze": {
80+
"start": "Feb 6 2025",
81+
"end": "Feb 11 2025",
82+
"days": "4"
83+
},
84+
"release": {
85+
"start": "Feb 12 2025",
86+
"end": "Feb 13 2025",
87+
"days": "2"
88+
}
8989
}
9090
}

‎_includes/selector.html‎

Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -367,7 +367,7 @@
367367
document.addEventListener('alpine:init', () => {
368368
Alpine.data('rapids_selector', () => ({
369369
// default values
370-
active_python_ver: "3.11",
370+
active_python_ver: "3.12",
371371
active_conda_cuda_ver: "12",
372372
active_pip_cuda_ver: "12",
373373
active_docker_cuda_ver: "12.5",
@@ -379,8 +379,8 @@
379379
active_additional_packages: [],
380380

381381
// all possible values
382-
python_vers: ["3.9", "3.10", "3.11", "3.12"],
383-
python_vers_stable: ["3.9", "3.10", "3.11"],
382+
python_vers: ["3.10", "3.11", "3.12"],
383+
python_vers_stable: ["3.10", "3.11", "3.12"],
384384
python_vers_nightly: ["3.10", "3.11", "3.12"],
385385
conda_cuda_vers: ["11", "12"],
386386
pip_cuda_vers: ["11.4 - 11.8", "12"],
@@ -390,7 +390,7 @@
390390
img_loc: ["NGC", "Dockerhub"],
391391
img_types: ["Base", "Notebooks"],
392392
packages: ["Standard", "Choose Specific Packages"],
393-
additional_pip_packages: ["cuDF", "dask-cuDF", "cuML", "cuGraph", "cuSpatial/cuProj", "cuxfilter", "cuCIM", "RAFT", "cuVS"],
393+
additional_pip_packages: ["cuDF", "dask-cuDF", "cuML", "cuGraph/nx-cugraph", "cuSpatial/cuProj", "cuxfilter", "cuCIM", "RAFT", "cuVS"],
394394
additional_rapids_packages: ["cuDF", "cuML", "cuGraph", "cuSpatial/cuProj", "cuxfilter", "cuCIM", "RAFT", "cuVS"],
395395
additional_packages: ["Graphistry", "JupyterLab", "NetworkX + nx-cugraph", "Plotly Dash", "PyTorch", "TensorFlow", "Xarray-Spatial"],
396396
note_prefix: "<i class='fas fa-info-circle text-blue'></i>",
@@ -549,19 +549,21 @@
549549
if (pkg === "cuspatial/cuproj") return ["cuspatial" + cuda_suffix, "cuproj" + cuda_suffix];
550550
if (pkg === "raft") return ["pylibraft" + cuda_suffix, "raft-dask" + cuda_suffix];
551551
if (pkg === "cuvs") return ["cuvs" + cuda_suffix];
552+
if (pkg === "cugraph/nx-cugraph") return ["cugraph" + cuda_suffix, "nx-cugraph" + cuda_suffix];
552553
return [pkg + cuda_suffix];
553554
}
554555
}
555556
else {
556557
index_url = `--${this.highlightFlag("extra-index-url")}=https://pypi.anaconda.org/rapidsai-wheels-nightly/simple`;
557558
var version = this.removeLeadingZeros("{{ site.data.releases.nightly.version }}")
558-
cuda_suffix = cuda_suffix + `>=${version}.0a0,<=${version}"`;
559+
cuda_suffix = cuda_suffix + `>=${version}.0a0,<=${version}`;
559560
var libraryToPkg = (pkg) => {
560561
pkg = pkg.toLowerCase();
561-
if (pkg === "cuspatial/cuproj") return ["\"cuspatial" + cuda_suffix, "\"cuproj" + cuda_suffix];
562-
if (pkg === "raft") return ["\"pylibraft" + cuda_suffix, "\"raft-dask" + cuda_suffix];
563-
if (pkg === "cuvs") return ["\"cuvs" + cuda_suffix, "\"pylibraft" + cuda_suffix];
564-
return ["\"" + pkg + cuda_suffix];
562+
if (pkg === "cuspatial/cuproj") return ["cuspatial" + cuda_suffix, "cuproj" + cuda_suffix];
563+
if (pkg === "raft") return ["pylibraft" + cuda_suffix, "raft-dask" + cuda_suffix];
564+
if (pkg === "cuvs") return ["cuvs" + cuda_suffix, "pylibraft" + cuda_suffix];
565+
if (pkg === "cugraph/nx-cugraph") return ["cugraph" + cuda_suffix, "nx-cugraph" + cuda_suffix];
566+
return [pkg + cuda_suffix];
565567
}
566568
}
567569

@@ -581,9 +583,12 @@
581583

582584
// pkgs.length == 2 because it includes the "Choose Specific Packages" option
583585
if (this.active_release === "Nightly" && !(pkgs.length === 2 && pkgs[0] === "cucim")) {
584-
pkgs.push(["\"dask-cuda" + cuda_suffix.slice(5)])
586+
pkgs.push(["dask-cuda" + cuda_suffix.slice(5)])
585587
}
586588

589+
// Make sure all packages (and version selectors) are quoted
590+
pkgs = pkgs.flatMap(pkg => '"' + pkg + '"');
591+
587592
// For every n packages add a new line with a "\" character
588593
// We need i += n + 1 since the splice adds a new element to the array
589594
if (this.active_release === "Stable") {

‎_notices/rsn0036.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ notice_pin: true # set to true to pin to notice page
1010

1111
title: "Support for Pandas 2 in Release v24.04"
1212
notice_author: RAPIDS TPM
13-
notice_status: In Progress
14-
notice_status_color: Yellow
13+
notice_status: Completed
14+
notice_status_color: green
1515
# 'notice_status' and 'notice_status_color' combinations:
1616
# "Proposal" - "blue"
1717
# "Completed" - "green"
@@ -22,7 +22,7 @@ notice_topic: Platform Support Change
2222
notice_rapids_version: "v24.02+"
2323
notice_created: 2023-12-06
2424
# 'notice_updated' should match 'notice_created' until an update is made
25-
notice_updated: 2023-12-06
25+
notice_updated: 2024-10-17
2626
---
2727

2828
## Overview

‎_notices/rsn0037.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ notice_id: 37 # should match notice number
99
notice_pin: true # set to true to pin to notice page
1010
title: "Deprecation of `CentOS 7` in v24.04"
1111
notice_author: RAPIDS Ops
12-
notice_status: In Progress
13-
notice_status_color: yellow
12+
notice_status: Completed
13+
notice_status_color: green
1414
# 'notice_status' and 'notice_status_color' combinations:
1515
# "Proposal" - "blue"
1616
# "Completed" - "green"
@@ -21,7 +21,7 @@ notice_topic: Platform Support Change
2121
notice_rapids_version: "v24.04"
2222
notice_created: 2024-02-14
2323
# 'notice_updated' should match 'notice_created' until an update is made
24-
notice_updated: 2024-02-14
24+
notice_updated: 2024-10-17
2525
---
2626

2727
## Overview

‎_notices/rsn0038.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ notice_id: 38 # should match notice number
99
notice_pin: true # set to true to pin to notice page
1010
title: "Moving libcumlprims, libcugraphops, pylibcugraphops to the rapidsai channel"
1111
notice_author: RAPIDS Ops
12-
notice_status: In Progress
13-
notice_status_color: yellow
12+
notice_status: Completed
13+
notice_status_color: green
1414
# 'notice_status' and 'notice_status_color' combinations:
1515
# "Proposal" - "blue"
1616
# "Completed" - "green"
@@ -21,7 +21,7 @@ notice_topic: Platform Support Change
2121
notice_rapids_version: "v24.06"
2222
notice_created: 2024-06-03
2323
# 'notice_updated' should match 'notice_created' until an update is made
24-
notice_updated: 2024-06-03
24+
notice_updated: 2024-10-17
2525
---
2626

2727
## Overview

‎_notices/rsn0039.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ notice_id: 39 # should match notice number
99
notice_pin: true # set to true to pin to notice page
1010
title: "Deprecation Announcement Dropping CUDA 12.2 support in our Docker Images in Release v24.08"
1111
notice_author: RAPIDS Ops
12-
notice_status: In Progress
13-
notice_status_color: yellow
12+
notice_status: Completed
13+
notice_status_color: green
1414
# 'notice_status' and 'notice_status_color' combinations:
1515
# "Proposal" - "blue"
1616
# "Completed" - "green"
@@ -21,7 +21,7 @@ notice_topic: Platform Support Change
2121
notice_rapids_version: "v24.08"
2222
notice_created: 2024-07-23
2323
# 'notice_updated' should match 'notice_created' until an update is made
24-
notice_updated: 2024-07-23
24+
notice_updated: 2024-10-17
2525
---
2626

2727
## Overview

0 commit comments

Comments
 (0)