Skip to content

Commit 3240166

Browse files
authored
Fix Terraform usage of cuda_version. (#9655)
This PR removes `cuda_version` usage inside `artifacts_build.tf` remaining from #9618. This might be the cause of errors in nightly (see [comment](#9589 (comment))).
1 parent a511691 commit 3240166

File tree

1 file changed

+8
-22
lines changed

1 file changed

+8
-22
lines changed

infra/tpu-pytorch-releases/artifacts_builds.tf

Lines changed: 8 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ locals {
9494
for b in local.nightly_builds :
9595
format("%s_%s%s%s",
9696
b.python_version,
97-
b.accelerator == "tpu" ? "tpuvm" : format("cuda_%s", b.cuda_version),
97+
"tpuvm",
9898
try(b.cxx11_abi == "0", false) ? "_precxx11" : "",
9999
try(b.bundle_libtpu == "1", false) ? "_libtpu" : ""
100100
) => b
@@ -106,7 +106,7 @@ locals {
106106
format("r%s_%s_%s%s%s",
107107
replace(b.package_version, "+", "_"),
108108
b.python_version,
109-
b.accelerator == "tpu" ? "tpuvm" : format("cuda_%s", b.cuda_version),
109+
"tpuvm",
110110
try(b.cxx11_abi == "0", false) ? "_precxx11" : "",
111111
try(b.bundle_libtpu == "1", false) ? "_libtpu" : ""
112112
) => b
@@ -136,20 +136,13 @@ module "nightly_builds" {
136136
]
137137

138138
description = join(" ", [
139-
"Builds nightly xla:nightly_${each.key}' ${
140-
each.value.accelerator == "tpu"
141-
? "TPU"
142-
: format("CUDA %s", each.value.cuda_version)
143-
} docker image and corresponding wheels for PyTorch/XLA.",
139+
"Builds nightly xla:nightly_${each.key}' TPU docker image and ",
140+
"corresponding wheels for PyTorch/XLA.",
144141
"Trigger managed by Terraform setup in",
145142
"infra/tpu-pytorch-releases/artifacts_builds.tf."
146143
])
147144

148-
wheels_dest = "${module.releases_storage_bucket.url}/wheels/${
149-
each.value.accelerator == "tpu"
150-
? "tpuvm"
151-
: "cuda/${each.value.cuda_version}"
152-
}"
145+
wheels_dest = "${module.releases_storage_bucket.url}/wheels/tpuvm"
153146
wheels_srcs = ["/dist/*.whl"]
154147
build_args = {
155148
python_version = each.value.python_version
@@ -183,20 +176,13 @@ module "versioned_builds" {
183176
image_tags = [each.key]
184177

185178
description = join(" ", [
186-
"Builds official xla:${each.key}' ${
187-
each.value.accelerator == "tpu"
188-
? "TPU"
189-
: format("CUDA %s", each.value.cuda_version)
190-
} docker image and corresponding wheels for PyTorch/XLA.",
179+
"Builds official xla:${each.key}' TPU docker image and ",
180+
"corresponding wheels for PyTorch/XLA.",
191181
"Trigger managed by Terraform setup in",
192182
"infra/tpu-pytorch-releases/artifacts_builds.tf."
193183
])
194184

195-
wheels_dest = "${module.releases_storage_bucket.url}/wheels/${
196-
each.value.accelerator == "tpu"
197-
? "tpuvm"
198-
: "cuda/${each.value.cuda_version}"
199-
}"
185+
wheels_dest = "${module.releases_storage_bucket.url}/wheels/tpuvm"
200186
wheels_srcs = ["/dist/*.whl"]
201187
# Pass docker build args to infra/ansible/Dockerfile, other than `ansible_vars`.
202188
build_args = {

0 commit comments

Comments
 (0)