From 6c4db9f31af46e733d907862536449e46bb1c683 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Aug 2024 12:27:05 -0500 Subject: [PATCH 1/4] drop Python 3.9 from install selector --- _includes/selector.html | 2 +- install/install.md | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/_includes/selector.html b/_includes/selector.html index 9873459c3f1..7113b77303d 100644 --- a/_includes/selector.html +++ b/_includes/selector.html @@ -379,7 +379,7 @@ active_additional_packages: [], // all possible values - python_vers: ["3.9", "3.10", "3.11"], + python_vers: ["3.10", "3.11"], conda_cuda_vers: ["11", "12"], pip_cuda_vers: ["11.4 - 11.8", "12"], docker_cuda_vers: ["11.8", "12.0", "12.2", "12.5"], diff --git a/install/install.md b/install/install.md index 9f872fcef58..3cdc9dff6e4 100644 --- a/install/install.md +++ b/install/install.md @@ -98,7 +98,7 @@ ERROR: No matching distribution found for cudf-cu12 ``` Check the suggestions below for possible resolutions: - The pip index has moved from the initial experimental release! Ensure the correct `--extra-index-url=https://pypi.nvidia.com` -- Only Python versions 3.9, 3.10, and 3.11 are supported +- Only Python versions 3.10 and 3.11 are supported - RAPIDS pip packages require a recent version of pip that [supports PEP600](https://peps.python.org/pep-0600/){: target="_blank"}. Some users may need to update pip: `pip install -U pip`
From d093dbe5e828ad2d4609c1ba48965abdad7062a6 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Aug 2024 13:39:46 -0500 Subject: [PATCH 2/4] change default CUDA version to 12.5, allow for different Python versions by release --- CONTRIBUTING.md | 2 +- _includes/selector.html | 11 +++++++++-- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a53afd3e128..e485208901e 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -22,7 +22,7 @@ docker run --rm \ --volume="$PWD:/srv/jekyll" \ --publish [::1]:4000:4000 \ jekyll/jekyll \ - jekyll serve + bash -c 'rm -rf ./_site && jekyll serve' ``` ## PR submissions diff --git a/_includes/selector.html b/_includes/selector.html index 7113b77303d..b67c39b6cf2 100644 --- a/_includes/selector.html +++ b/_includes/selector.html @@ -370,7 +370,7 @@ active_python_ver: "3.11", active_conda_cuda_ver: "12", active_pip_cuda_ver: "12", - active_docker_cuda_ver: "12.2", + active_docker_cuda_ver: "12.5", active_method: "Conda", active_release: "Stable", active_img_type: "Base", @@ -379,7 +379,9 @@ active_additional_packages: [], // all possible values - python_vers: ["3.10", "3.11"], + python_vers: ["3.9", "3.10", "3.11"], + python_vers_stable: ["3.9", "3.10", "3.11"], + python_vers_nightly: ["3.10", "3.11"], conda_cuda_vers: ["11", "12"], pip_cuda_vers: ["11.4 - 11.8", "12"], docker_cuda_vers: ["11.8", "12.0", "12.2", "12.5"], @@ -708,6 +710,11 @@ }, disableUnsupportedPython(python_version) { var isDisabled = false; + if (this.active_release === "Stable") { + isDisabled = !this.python_vers_stable.includes(python_version) + } else if (this.active_release === "Nightly") { + isDisabled = !this.python_vers_nightly.includes(python_version) + } return isDisabled; }, disableUnsupportedImgType(type) { From a088a12b202f658aa6d06fcc9c6f4c4df4dd90c0 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Aug 2024 13:49:11 -0500 Subject: [PATCH 3/4] drop CUDA 12.2 --- _includes/selector.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_includes/selector.html b/_includes/selector.html index b67c39b6cf2..c117e5d7f84 100644 --- a/_includes/selector.html +++ b/_includes/selector.html @@ -384,7 +384,7 @@ python_vers_nightly: ["3.10", "3.11"], conda_cuda_vers: ["11", "12"], pip_cuda_vers: ["11.4 - 11.8", "12"], - docker_cuda_vers: ["11.8", "12.0", "12.2", "12.5"], + docker_cuda_vers: ["11.8", "12.0", "12.5"], methods: ["Conda", "pip", "Docker"], releases: ["Stable", "Nightly"], img_loc: ["NGC", "Dockerhub"], From e6073f3169996ba1a67ee627dc7d6cf01a6aa3b3 Mon Sep 17 00:00:00 2001 From: James Lamb Date: Tue, 27 Aug 2024 14:25:53 -0500 Subject: [PATCH 4/4] handle switching Python version --- _includes/selector.html | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/_includes/selector.html b/_includes/selector.html index c117e5d7f84..5c4954daad9 100644 --- a/_includes/selector.html +++ b/_includes/selector.html @@ -740,6 +740,18 @@ releaseClickHandler(e, release) { if (this.isDisabled(e.target)) return; this.active_release = release; + + /* + It's possible that the active Python version prior to someone changing releases + isn't supported by whatever release was chosen in the selector. + + This handles that case, updating to the oldest Python version supported by the chosen release. + */ + if (this.active_release === "Stable" && !this.python_vers_stable.includes(this.active_python_ver)) { + this.active_python_ver = this.python_vers_stable[0]; + } else if (this.active_release === "Nightly" && !this.python_vers_nightly.includes(this.active_python_ver)) { + this.active_python_ver = this.python_vers_nightly[0]; + } }, imgTypeClickHandler(e, type) { if (this.isDisabled(e.target)) return;