Skip to content

Revert 2.1 terraform changes #5537

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 1 commit into from
Sep 5, 2023
Merged

Revert 2.1 terraform changes #5537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion infra/ansible/roles/fetch_srcs/defaults/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# See https://docs.ansible.com/ansible/latest/collections/ansible/builtin/git_module.html#parameter-version
pytorch_git_rev: v2.1.0-rc2
pytorch_git_rev: HEAD
xla_git_rev: HEAD
5 changes: 0 additions & 5 deletions infra/tpu-pytorch-releases/artifacts.auto.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,13 +37,11 @@ xrt_nightly_builds = [
versioned_builds = [
{
git_tag = "v2.1.0"
pytorch_git_tag = "v2.1.0-rc2"
package_version = "2.1"
accelerator = "tpu"
},
{
git_tag = "v2.1.0"
pytorch_git_tag = "v2.1.0-rc2"
package_version = "2.1"
accelerator = "tpu"
python_version = "3.10"
Expand All @@ -60,21 +58,18 @@ versioned_builds = [
},
{
git_tag = "v2.1.0"
pytorch_git_tag = "v2.1.0-rc2"
package_version = "2.1",
accelerator = "cuda"
cuda_version = "12.0"
},
{
git_tag = "v2.1.0"
pytorch_git_tag = "v2.1.0-rc2"
package_version = "2.1"
accelerator = "cuda"
cuda_version = "11.8"
},
{
git_tag = "v2.1.0"
pytorch_git_tag = "v2.1.0-rc2"
package_version = "2.1"
accelerator = "cuda"
cuda_version = "11.8"
Expand Down
7 changes: 3 additions & 4 deletions infra/tpu-pytorch-releases/artifacts_builds.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ variable "versioned_builds" {
type = list(
object({
git_tag = string
pytorch_git_tag = string
package_version = string
accelerator = string
python_version = optional(string, "3.8")
Expand Down Expand Up @@ -80,7 +79,7 @@ module "nightly_builds" {
ansible_vars = merge(each.value, {
package_version = var.nightly_package_version
nightly_release = true
pytorch_git_rev = "v2.1.0-rc2"
pytorch_git_rev = "main"
xla_git_rev = "$COMMIT_SHA"
})

Expand Down Expand Up @@ -127,7 +126,7 @@ module "xrt_nightly_builds" {
ansible_vars = merge(each.value, {
package_version = var.nightly_package_version
nightly_release = true
pytorch_git_rev = "v2.1.0-rc2"
pytorch_git_rev = "main"
xla_git_rev = "$COMMIT_SHA"
})

Expand Down Expand Up @@ -171,7 +170,7 @@ module "versioned_builds" {
for_each = local.versioned_builds_dict

ansible_vars = merge(each.value, {
pytorch_git_rev = each.value.pytorch_git_tag
pytorch_git_rev = each.value.git_tag
xla_git_rev = each.value.git_tag
})

Expand Down
2 changes: 1 addition & 1 deletion infra/tpu-pytorch-releases/dev_images.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ module "dev_images" {

ansible_vars = {
xla_git_rev = "$COMMIT_SHA"
pytorch_git_rev = "v2.1.0-rc2"
pytorch_git_rev = "main"

accelerator = each.value.accelerator
arch = each.value.arch
Expand Down
2 changes: 1 addition & 1 deletion infra/tpu-pytorch/test_triggers.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ module "tpu_e2e_tests" {
arch = "amd64"
accelerator = "tpu"
disable_xrt = "1"
pytorch_git_rev = "v2.1.0-rc2"
pytorch_git_rev = "main"
# The commit ID associated with the triggered build. Substituted when
# Cloud Build is triggered.
xla_git_rev = "$COMMIT_SHA"
Expand Down