Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
41 changes: 33 additions & 8 deletions _includes/selector.html
Original file line number Diff line number Diff line change
Expand Up @@ -291,7 +291,7 @@
</div>
<div class="options-section-specific" x-show="active_packages != 'Standard'">
<div class="option-label"><!-- Second row of packages --></div>
<template x-for="package in additional_rapids_packages">
<template x-for="package in getAdditionalRapidsPackagesForRelease()">
<div x-on:click="(e) => packagesClickHandler(e, package)"
x-bind:class="{'active': active_packages.includes(package), 'disabled': disableUnsupportedPackage(package)}"
class="option" x-text="package"></div>
Expand All @@ -318,7 +318,7 @@
</div>
<div class="options-section-specific" x-show="active_packages != 'Standard'">
<div class="option-label"><!-- Second row of packages --></div>
<template x-for="package in additional_pip_packages">
<template x-for="package in getAdditionalPipPackagesForRelease()">
<div x-on:click="(e) => packagesClickHandler(e, package)"
x-bind:class="{'active': active_packages.includes(package), 'disabled': disableUnsupportedPackage(package)}" class="option"
x-text="package"></div>
Expand Down Expand Up @@ -395,8 +395,8 @@
img_loc: ["NGC", "Docker Hub"],
img_types: ["Base", "Notebooks"],
packages: ["Standard", "Choose Specific Packages"],
additional_pip_packages: ["cuDF", "dask-cuDF", "cuML", "cuGraph/nx-cugraph", "cuxfilter", "cuCIM", "RAFT", "cuVS"],
additional_rapids_packages: ["cuDF", "cuML", "cuGraph", "cuxfilter", "cuCIM", "RAFT", "cuVS"],
additional_pip_packages: ["cuDF", "dask-cuDF", "cuML", "cuGraph/nx-cugraph", "cuxfilter", "cuCIM", "RAFT", "cuVS", "nvForest"],
additional_rapids_packages: ["cuDF", "cuML", "cuGraph", "cuxfilter", "cuCIM", "RAFT", "cuVS", "nvForest"],
additional_packages: ["Graphistry", "JupyterLab", "NetworkX + nx-cugraph", "Plotly Dash", "PyTorch", "TensorFlow", "Xarray-Spatial"],
note_prefix: "<i class='fas fa-info-circle text-blue'></i>",
rapids_meta_pkgs: ["cuDF", "cuML", "cuGraph", "nx-cugraph", "cuxfilter", "cuCIM", "RAFT", "cuVS"],
Expand All @@ -406,6 +406,15 @@
getNightlyVersion() {
return "{{ site.data.releases.nightly.version }}";
},
// nvForest is nightly-only until the 26.04 release; exclude from package lists when Stable is selected
getAdditionalRapidsPackagesForRelease() {
if (this.active_release === "Nightly") return this.additional_rapids_packages;
return this.additional_rapids_packages.filter(p => p !== "nvForest");
},
getAdditionalPipPackagesForRelease() {
if (this.active_release === "Nightly") return this.additional_pip_packages;
return this.additional_pip_packages.filter(p => p !== "nvForest");
},
getMethodHTML(method) {
var icon_class = "box-open fas";
if (method.includes("Docker")) icon_class = "regular fa-container-storage";
Expand Down Expand Up @@ -500,6 +509,12 @@
if (this.active_packages.length === 1 && this.active_packages[0] === "Standard") {
pkgs = ["rapids"];
}
if (this.active_release === "Stable") {
pkgs = pkgs.filter(pkg => pkg !== "nvForest");
}
if (this.active_packages[0] === "Choose Specific Packages" && pkgs.length === 0) {
return "Select at least one package.";
}

if (pkgs.includes("RAFT")) {
pkgs = pkgs.filter(pkg => pkg !== "RAFT");
Expand Down Expand Up @@ -582,7 +597,7 @@
if (this.active_packages.length === 1 && this.active_packages[0] === "Choose Specific Packages") {
return "Select at least one package.";
} else if (this.active_packages[0] === 'Standard') {
var pkgs_to_show = this.additional_pip_packages;
var pkgs_to_show = this.getAdditionalPipPackagesForRelease();

var pkgs = pkgs_to_show.flatMap(libraryToPkg);

Expand All @@ -591,9 +606,14 @@
} else {
// sort active_packages to appear in the same order as the additional_pip_packages list
this.active_packages.sort((a, b) => this.additional_pip_packages.indexOf(a) - this.additional_pip_packages.indexOf(b));
var pkgs = this.active_packages
.filter(pkg => pkg !== "Choose Specific Packages")
.flatMap(libraryToPkg);
var selected_pkgs = this.active_packages.filter(pkg => pkg !== "Choose Specific Packages");
if (this.active_release === "Stable") {
selected_pkgs = selected_pkgs.filter(pkg => pkg !== "nvForest");
}
var pkgs = selected_pkgs.flatMap(libraryToPkg);
if (pkgs.length === 0) {
return "Select at least one package.";
}
}

// pkgs.length == 2 because it includes the "Choose Specific Packages" option
Expand Down Expand Up @@ -838,6 +858,11 @@
if (!supported_pip_cuda_versions.includes(this.active_pip_cuda_ver)) {
this.active_pip_cuda_ver = supported_pip_cuda_versions[supported_pip_cuda_versions.length - 1];
}

// nvForest is nightly-only; deselect it when switching to Stable
if (release === "Stable" && this.active_packages.includes("nvForest")) {
this.active_packages = this.active_packages.filter(p => p !== "nvForest");
}
},
imgTypeClickHandler(e, type) {
if (this.isDisabled(e.target)) return;
Expand Down