Skip to content

Add cuda.z version to the start page #1633

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
May 22, 2024
Merged

Add cuda.z version to the start page #1633

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b9aec01
Add cuda.z version to the start page
atalman May 21, 2024
2aa6ae6
test
atalman May 21, 2024
fdecf05
test
atalman May 21, 2024
b156d94
test
atalman May 21, 2024
6973d8a
test
atalman May 21, 2024
18a166e
add_cuda124
atalman May 21, 2024
bf28653
test
atalman May 21, 2024
3976feb
test
atalman May 21, 2024
26ad83f
Generate
atalman May 21, 2024
994787a
test
atalman May 21, 2024
7f3a9c9
test
atalman May 21, 2024
fd409d3
test
atalman May 22, 2024
95f7483
test
atalman May 22, 2024
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
19 changes: 18 additions & 1 deletion _includes/quick-start-module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,12 @@ function getPreferredCuda(os) {

// Disable compute platform not supported on OS
function disableUnsupportedPlatforms(os) {

if(opts.ptbuild == "preview")
archMap = version_map.nightly
else
archMap = version_map.release

for (const [arch_key, info] of archInfoMap) {
var elems = document.querySelectorAll('[id^="'+arch_key+'"]');
if (elems == null) {
Expand All @@ -114,6 +120,11 @@ function disableUnsupportedPlatforms(os) {
for (var i=0; i < elems.length;i++) {
var supported = info.platforms.has(os);
elems[i].style.textDecoration = supported ? "" : "line-through";

// Officially supported arch but not available
if(!archMap[elems[i].id]) {
elems[i].style.textDecoration = "line-through";
}
}
}
}
Expand All @@ -129,7 +140,13 @@ function changeVersion(ptbuild) {
for (const [arch_key, info] of archInfoMap) {
var elems = document.querySelectorAll('[id^="'+arch_key+'"]');
for (var i=0; i < elems.length;i++) {
elems[i].children[0].textContent = info.title + " " + archMap[elems[i].id][1]
if(archMap[elems[i].id]) {
elems[i].style.textDecoration = "";
elems[i].children[0].textContent = info.title + " " + archMap[elems[i].id][1]
}
else {
elems[i].style.textDecoration = "line-through";
}
}
}
var stable_element = document.getElementById("stable");
Expand Down
11 changes: 7 additions & 4 deletions _includes/quick_start_local.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,11 +87,14 @@
<div class="col-md-12 title-block mobile-heading">
<div class="option-text">Compute Platform</div>
</div>
<div class="col-md-3 option block version" id="cuda.x">
<div class="option-text">CUDA 11.6</div>
<div class="col-md-2 option block version" id="cuda.x">
<div class="option-text">CUDA 11.8</div>
</div>
<div class="col-md-3 option block version" id="cuda.y">
<div class="option-text">CUDA 11.7</div>
<div class="col-md-2 option block version" id="cuda.y">
<div class="option-text">CUDA 12.1</div>
</div>
<div class="col-md-2 option block version" id="cuda.z">
<div class="option-text">CUDA 12.4</div>
</div>
<div class="col-md-3 option block version" id="rocm5.x">
<div class="option-text">ROCm 5.2</div>
Expand Down
22 changes: 19 additions & 3 deletions assets/quick-start-module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ var archInfoMap = new Map([
['accnone', {title: "CPU", platforms: new Set(['linux', 'macos', 'windows'])}]
]);

let version_map={"nightly": {"accnone": ["cpu", ""], "cuda.x": ["cuda", "11.8"], "cuda.y": ["cuda", "12.1"], "rocm5.x": ["rocm", "6.0"]}, "release": {"accnone": ["cpu", ""], "cuda.x": ["cuda", "11.8"], "cuda.y": ["cuda", "12.1"], "rocm5.x": ["rocm", "6.0"]}}
let version_map={"nightly": {"accnone": ["cpu", ""], "cuda.x": ["cuda", "11.8"], "cuda.y": ["cuda", "12.1"], "cuda.z": ["cuda", "12.4"], "rocm5.x": ["rocm", "6.0"]}, "release": {"accnone": ["cpu", ""], "cuda.x": ["cuda", "11.8"], "cuda.y": ["cuda", "12.1"], "rocm5.x": ["rocm", "6.0"]}}
let stable_version="Stable (2.3.0)";

var default_selected_os = getAnchorSelectedOS() || getDefaultSelectedOS();
Expand Down Expand Up @@ -105,6 +105,12 @@ function getPreferredCuda(os) {

// Disable compute platform not supported on OS
function disableUnsupportedPlatforms(os) {

if(opts.ptbuild == "preview")
archMap = version_map.nightly
else
archMap = version_map.release

for (const [arch_key, info] of archInfoMap) {
var elems = document.querySelectorAll('[id^="'+arch_key+'"]');
if (elems == null) {
Expand All @@ -114,6 +120,11 @@ function disableUnsupportedPlatforms(os) {
for (var i=0; i < elems.length;i++) {
var supported = info.platforms.has(os);
elems[i].style.textDecoration = supported ? "" : "line-through";

// Officially supported arch but not available
if(!archMap[elems[i].id]) {
elems[i].style.textDecoration = "line-through";
}
}
}
}
Expand All @@ -129,7 +140,13 @@ function changeVersion(ptbuild) {
for (const [arch_key, info] of archInfoMap) {
var elems = document.querySelectorAll('[id^="'+arch_key+'"]');
for (var i=0; i < elems.length;i++) {
elems[i].children[0].textContent = info.title + " " + archMap[elems[i].id][1]
if(archMap[elems[i].id]) {
elems[i].style.textDecoration = "";
elems[i].children[0].textContent = info.title + " " + archMap[elems[i].id][1]
}
else {
elems[i].style.textDecoration = "line-through";
}
}
}
var stable_element = document.getElementById("stable");
Expand Down Expand Up @@ -263,4 +280,3 @@ function commandMessage(key) {

// Set cuda version right away
changeVersion("stable")

49 changes: 48 additions & 1 deletion published_versions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@
"note": null,
"command": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu121"
},
"cuda.z": {
"note": null,
"command": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu124"
},
"rocm5.x": {
"note": null,
"command": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/rocm6.0"
Expand All @@ -31,6 +35,10 @@
"note": null,
"command": "conda install pytorch torchvision torchaudio pytorch-cuda=12.1 -c pytorch-nightly -c nvidia"
},
"cuda.z": {
"note": null,
"command": "conda install pytorch torchvision torchaudio pytorch-cuda=12.4 -c pytorch-nightly -c nvidia"
},
"rocm5.x": {
"note": "<b>NOTE:</b> Conda packages are not currently available for ROCm, please use pip instead<br />",
"command": null
Expand Down Expand Up @@ -62,6 +70,13 @@
"Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu121/libtorch-cxx11-abi-shared-with-deps-latest.zip"
}
},
"cuda.z": {
"note": null,
"versions": {
"Download here (Pre-cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu124/libtorch-shared-with-deps-latest.zip",
"Download here (cxx11 ABI):": "https://download.pytorch.org/libtorch/nightly/cu124/libtorch-cxx11-abi-shared-with-deps-latest.zip"
}
},
"rocm5.x": {
"note": null,
"versions": {
Expand All @@ -83,6 +98,11 @@
"command": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cpu",
"default": true
},
"cuda.z": {
"note": "# CUDA is not available on MacOS, please use default package",
"command": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cpu",
"default": true
},
"rocm5.x": {
"note": "# ROCm is not available on MacOS, please use default package",
"command": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cpu",
Expand All @@ -104,6 +124,11 @@
"command": "conda install pytorch-nightly::pytorch torchvision torchaudio -c pytorch-nightly",
"default": true
},
"cuda.z": {
"note": "# CUDA is not available on MacOS, please use default package",
"command": "conda install pytorch-nightly::pytorch torchvision torchaudio -c pytorch-nightly",
"default": true
},
"rocm5.x": {
"note": "# ROCm is not available on MacOS, please use default package",
"command": "conda install pytorch-nightly::pytorch torchvision torchaudio -c pytorch-nightly",
Expand Down Expand Up @@ -135,6 +160,13 @@
"Download arm64 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-arm64-latest.zip"
}
},
"cuda.z": {
"note": null,
"default": true,
"versions": {
"Download arm64 libtorch here (ROCm and CUDA are not supported):": "https://download.pytorch.org/libtorch/nightly/cpu/libtorch-macos-arm64-latest.zip"
}
},
"rocm5.x": {
"note": null,
"default": true,
Expand All @@ -158,6 +190,10 @@
"note": null,
"command": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu121"
},
"cuda.z": {
"note": null,
"command": "pip3 install --pre torch torchvision torchaudio --index-url https://download.pytorch.org/whl/nightly/cu124"
},
"rocm5.x": {
"note": "<b>NOTE:</b> ROCm is not available on Windows",
"command": null
Expand All @@ -172,6 +208,10 @@
"note": null,
"command": "conda install pytorch torchvision torchaudio pytorch-cuda=12.1 -c pytorch-nightly -c nvidia"
},
"cuda.z": {
"note": null,
"command": "conda install pytorch torchvision torchaudio pytorch-cuda=12.4 -c pytorch-nightly -c nvidia"
},
"rocm5.x": {
"note": "<b>NOTE:</b> ROCm is not available on Windows",
"command": null
Expand Down Expand Up @@ -203,6 +243,13 @@
"Download here (Debug version):": "https://download.pytorch.org/libtorch/nightly/cu121/libtorch-win-shared-with-deps-debug-latest.zip"
}
},
"cuda.z": {
"note": null,
"versions": {
"Download here (Release version):": "https://download.pytorch.org/libtorch/nightly/cu124/libtorch-win-shared-with-deps-latest.zip",
"Download here (Debug version):": "https://download.pytorch.org/libtorch/nightly/cu124/libtorch-win-shared-with-deps-debug-latest.zip"
}
},
"rocm5.x": {
"note": "<b>NOTE:</b> ROCm is not available on Windows",
"versions": null
Expand Down Expand Up @@ -4335,4 +4382,4 @@
}
}
}
}
}
6 changes: 4 additions & 2 deletions scripts/gen_quick_start_module.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,14 @@ class OperatingSystem(Enum):
"accnone": ("cpu", ""),
"cuda.x": ("cuda", "11.8"),
"cuda.y": ("cuda", "12.1"),
"cuda.z": ("cuda", "12.4"),
"rocm5.x": ("rocm", "6.0")
},
"release": {
"accnone": ("cpu", ""),
"cuda.x": ("cuda", "11.8"),
"cuda.y": ("cuda", "12.1"),
"cuda.z": ("cuda", "12.4"),
"rocm5.x": ("rocm", "6.0")
}
}
Expand Down Expand Up @@ -184,9 +186,9 @@ def gen_ver_list(chan, gpu_arch_type):
for chan in ("nightly", "release"):
cuda_ver_list = gen_ver_list(chan, "cuda")
rocm_ver_list = gen_ver_list(chan, "rocm")
cuda_list = sorted(cuda_ver_list.values())[-2:]
cuda_list = sorted(cuda_ver_list.values())
acc_arch_ver_map[chan]["rocm5.x"] = ("rocm", max(rocm_ver_list.values()))
for cuda_ver, label in zip(cuda_list, ["cuda.x", "cuda.y"]):
for cuda_ver, label in zip(cuda_list, ["cuda.x", "cuda.y", "cuda.z"]):
acc_arch_ver_map[chan][label] = ("cuda", cuda_ver)


Expand Down
Loading