Skip to content

Commit e73bfa8

Browse files
authored
Update pytorch branch for Terraform setup. (#4889)
* Change PyTorch default to main * Fix file paths after moving config to a new dir * Use 'HEAD' for PyTorch and XLA versions in nightly builds * Checkout at origin/<branch> for the git_checkout step
1 parent 28456ff commit e73bfa8

File tree

4 files changed

+8
-8
lines changed

4 files changed

+8
-8
lines changed

infra/terraform_modules/xla_docker_build/variables.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ variable "dockerfile" {
6565
}
6666

6767
variable "docker_context_dir" {
68-
default = "docker/experimental/ansible"
68+
default = "infra/ansible"
6969
}
7070

7171
variable "docker_repo_url" {

infra/terraform_modules/xla_docker_build/xla_docker_build.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,13 @@ locals {
2424
{
2525
id = "git_fetch"
2626
name = "gcr.io/cloud-builders/git"
27-
args = ["fetch", "origin", var.ansible_branch]
27+
args = ["fetch", "--unshallow"]
2828
},
2929
{
3030
id = "git_checkout"
3131
name = "gcr.io/cloud-builders/git"
32-
args = ["checkout", var.ansible_branch]
33-
}
32+
args = ["checkout", "origin/${var.ansible_branch}"]
33+
},
3434
]
3535

3636
build_and_push_docker_image_steps = [

infra/tpu-pytorch-releases/cloud_builds.tf

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@ module "nightly_builds" {
5656
ansible_vars = merge(each.value, {
5757
package_version = var.nightly_package_version
5858
nightly_release = true
59-
pytorch_git_rev = "master"
60-
xla_git_rev = "master"
59+
pytorch_git_rev = "HEAD"
60+
xla_git_rev = "HEAD"
6161
})
6262

6363
ansible_branch = "master"
@@ -78,7 +78,7 @@ module "nightly_builds" {
7878
: format("CUDA %s", each.value.cuda_version)
7979
} docker image and corresponding wheels for PyTorch/XLA.",
8080
"Trigger managed by Terraform setup in",
81-
"docker/experimental/tpu-pytorch-releases/cloud_builds.tf."
81+
"infra/tpu-pytorch-releases/cloud_builds.tf."
8282
])
8383

8484
wheels_dest = "${module.releases_storage_bucket.url}/wheels/${

infra/tpu-pytorch/cloud_builds.tf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ module "dev_image" {
1919
description = join(" ", [
2020
"Build development image with TPU support.",
2121
"Trigger managed by Terraform setup in",
22-
"docker/experimental/tpu-pytorch/cloud_builds.tf.",
22+
"infra/tpu-pytorch/cloud_builds.tf.",
2323
])
2424

2525
build_args = {

0 commit comments

Comments
 (0)