Skip to content

Commit 79e7507

Browse files
authored
Merge branch 'GoogleCloudPlatform:master' into sav01-save-local
2 parents 50c20e1 + 6216305 commit 79e7507

39 files changed

Lines changed: 700 additions & 156 deletions

.github/CODEOWNERS

Lines changed: 14 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
# Default owners for everything in the repo, unless a later match takes precedence.
2-
* @richardsliu @yixinshi @RissyRan @hyeygit
2+
* @richardsliu @yixinshi @RissyRan @hyeygit @jiangjy1982
33

4-
dags/common @richardsliu @yixinshi @RissyRan @hyeygit @zpcore @ManfeiBai @gobbleturk @shralex @jiangjy1982 @ortibazar @parambole @vipannalla @crankshaw-google @polydier1
4+
dags/common @richardsliu @yixinshi @RissyRan @hyeygit @bhavya01 @pgmoka @qihqi @zhanyong-wan @gobbleturk @shralex @jiangjy1982 @ortibazar @parambole @vipannalla @crankshaw-google @polydier1
55

66
dags/solutions_team/configs/tensorflow @chandrasekhard2 @ZhaoyueCheng @richardsliu
77
dags/solutions_team/solutionsteam_tf* @chandrasekhard2 @ZhaoyueCheng @richardsliu
88

9-
dags/pytorch_xla @vanbasten23 @zpcore @ManfeiBai
10-
dags/legacy_test/tests/pytorch @vanbasten23 @zpcore @ManfeiBai
9+
dags/pytorch_xla @bhavya01 @pgmoka @qihqi @zhanyong-wan
10+
dags/legacy_test/tests/pytorch @bhavya01 @pgmoka @qihqi @zhanyong-wan
1111

12-
dags/mantaray @ManfeiBai @tengyifei @zpcore
12+
dags/mantaray @qihqi @bhavya01 @pgmoka @zhanyong-wan
1313

14-
dags/multipod @tonyjohnchen @raymondzouu @gobbleturk @shralex @RissyRan @jiangjy1982
14+
dags/multipod @tonyjohnchen @raymondzouu @gobbleturk @shralex @RissyRan @jiangjy1982 @notabee @xibinliu
1515

1616
dags/mlcompass @ortibazar @sganeshb @brajiang @wlzhg
1717

18-
dags/sparsity_diffusion_devx @RissyRan @parambole @jiangjy1982 @aireenmei @michelle-yooh
19-
dags/sparsity_diffusion_devx/project_bite* @RissyRan @parambole @jiangjy1982 @aireenmei @michelle-yooh @jiya-zhang
20-
dags/sparsity_diffusion_devx/configs/project_bite* @RissyRan @parambole @jiangjy1982 @aireenmei @michelle-yooh @jiya-zhang
18+
dags/sparsity_diffusion_devx @RissyRan @parambole @jiangjy1982 @aireenmei @michelle-yooh @entrpn @coolkp @rohan-bierneni @shuningjin
19+
dags/sparsity_diffusion_devx/project_bite* @RissyRan @parambole @jiangjy1982 @aireenmei @michelle-yooh @entrpn @coolkp @rohan-bierneni @shuningjin @jiya-zhang
20+
dags/sparsity_diffusion_devx/configs/project_bite* @RissyRan @parambole @jiangjy1982 @aireenmei @michelle-yooh @entrpn @coolkp @rohan-bierneni @shuningjin @jiya-zhang
2121

22-
dags/inference @vipannalla @mailvijayasingh @sixiang-google @joezijunzhou @singh-mitali
22+
dags/inference @vipannalla @mailvijayasingh @sixiang-google @joezijunzhou
2323

2424
dags/map_reproducibility @crankshaw-google @polydier1 @gunjanj007 @stingram @utkarshsharma1 @cneel8986 @Doris26 @wang2yn84 @zshu188
25+
26+
dags/orbax @abhinavclemson @xuefgu @xibinliu @andrewyct @severus-ho
27+
28+
dags/tpu_observability @xibinliu @andrewyct @severus-ho

.github/requirements.txt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
1+
sqlalchemy-spanner==1.11.0
12
apache-airflow==2.10.2
23
apache-airflow-providers-sendgrid
34
fabric
4-
google-cloud-bigquery
5-
google-cloud-compute
6-
google-cloud-storage
7-
google-cloud-container
5+
google-cloud-bigquery>=3.29.0
6+
google-cloud-compute>=1.26.0
7+
google-cloud-storage>=2.18.2
8+
google-cloud-container>=2.54.0
89
google-cloud-tpu>=1.16.0
910
jsonlines
1011
tensorflow-cpu

dags/common/model_configs.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,18 @@ class MaxTextV5eModelConfigs(enum.Enum):
2525
DEFAULT_128B = "default_128b_v5e_256"
2626
GPT3_175B = "gpt_3_175b_v5e_256"
2727
LLAMA2_7B = "llama2_7b_v5e_256"
28+
LLAMA2_13B = "llama2_13b_v5e_256"
2829
LLAMA2_70B = "llama2_70b_v5e_256"
2930

3031

32+
class MaxTextV5pModelConfigs(enum.Enum):
33+
# Refers to model configs in https://github.com/AI-Hypercomputer/maxtext/blob/main/benchmarks/maxtext_v5p_model_configs.py
34+
GPT3_175B = "gpt_3_175b_v5p_128"
35+
GPT3_175B_SC = "gpt_3_175b_v5p_128_sc"
36+
LLAMA2_7B = "llama2_7b_v5p_128"
37+
LLAMA2_70B = "llama2_70b_v5p_128"
38+
39+
3140
class MaxTextTrilliumModelConfigs(enum.Enum):
3241
# Refers to model configs in https://github.com/AI-Hypercomputer/maxtext/blob/main/benchmarks/maxtext_trillium_model_configs.py
3342
GPT3_175B = "gpt_3_175b"

dags/common/test_owner.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ class Team(enum.Enum):
5050
MOHIT_K = "Mohit K."
5151
ANISHA_M = "Anisha M."
5252
YUWEI_Y = "Yuwei Y."
53+
RISHABH_B = "Rishabh B."
5354

5455
# Multi-tier Checkpointing
5556
ABHINAV_S = "ABHINAV S."

dags/common/vm_resource.py

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,13 @@ class XpkClusters:
263263
project=Project.TPU_PROD_ENV_MULTIPOD.value,
264264
zone=Zone.EUROPE_WEST4_B.value,
265265
)
266+
TPU_V6E_8_CLUSTER = XpkClusterConfig(
267+
name="bodaborg-v6e-8-yucmhab-c",
268+
device_version=TpuVersion.TRILLIUM,
269+
core_count=8,
270+
project=Project.TPU_PROD_ENV_ONE_VM.value,
271+
zone=Zone.US_EAST5_B.value,
272+
)
266273
TPU_V6E_256_CLUSTER = XpkClusterConfig(
267274
name="bodaborg-v6e-256",
268275
device_version=TpuVersion.TRILLIUM,

dags/examples/always_fail.py

Lines changed: 57 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
import logging
2+
3+
from airflow import models
4+
5+
from airflow.decorators import task
6+
from airflow.exceptions import AirflowException
7+
from airflow.utils.task_group import TaskGroup
8+
9+
"""
10+
A DAG that always fails when triggered. This DAG is an example DAG used to
11+
trigger the on_failure_actions.py/DagRunListener plugin and post a Github
12+
Issue.
13+
"""
14+
15+
16+
@task
17+
def task_a():
18+
logging.info("task A")
19+
20+
21+
# Add or override the owner of the task, in order to assign issue assignees.
22+
@task(owner="airflow")
23+
def task_b():
24+
logging.info("task B")
25+
raise AirflowException("task B failed")
26+
27+
28+
@task
29+
def task_c():
30+
logging.info("task C")
31+
32+
33+
with models.DAG(
34+
dag_id="on_failure_actions_trigger",
35+
schedule=None,
36+
tags=[
37+
"test_dag",
38+
"on_failure_alert", # Add this to enable DagRunListener
39+
],
40+
catchup=False,
41+
default_args={
42+
"retries": 0, # Set to 0 for throwing exception immediately
43+
},
44+
) as dag:
45+
with TaskGroup(group_id="Test1") as group_a:
46+
with TaskGroup(group_id="Subgroup1") as group_b:
47+
taskA = task_a()
48+
49+
with TaskGroup(group_id="Test2") as group_c:
50+
with TaskGroup(group_id="Subgroup2") as group_d:
51+
taskB = task_b()
52+
53+
with TaskGroup(group_id="Test3") as group_e:
54+
with TaskGroup(group_id="Subgroup3") as group_f:
55+
taskC = task_c()
56+
57+
group_a >> group_c >> group_e

dags/legacy_test/tests/pytorch/nightly/common.libsonnet

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ local volumes = import 'templates/volumes.libsonnet';
105105
sudo apt install -y libsndfile-dev
106106
pip3 install --user --pre torch torchvision --index-url https://download.pytorch.org/whl/nightly/cpu
107107
pip install --user \
108-
'torch_xla[tpu] @ https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.8.0.dev-cp310-cp310-linux_x86_64.whl' \
108+
'torch_xla[tpu] @ https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.9.0.dev-cp310-cp310-linux_x86_64.whl' \
109109
-f https://storage.googleapis.com/libtpu-releases/index.html \
110110
-f https://storage.googleapis.com/libtpu-wheels/index.html
111111
pip3 install pillow

dags/legacy_test/tests/pytorch/r2.7/accelerate-smoke.libsonnet renamed to dags/legacy_test/tests/pytorch/r2.8/accelerate-smoke.libsonnet

File renamed without changes.
File renamed without changes.

dags/legacy_test/tests/pytorch/r2.7/common.libsonnet renamed to dags/legacy_test/tests/pytorch/r2.8/common.libsonnet

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -18,22 +18,22 @@ local mixins = import 'templates/mixins.libsonnet';
1818
local utils = import 'templates/utils.libsonnet';
1919
local volumes = import 'templates/volumes.libsonnet';
2020

21-
local rcVersion = 'rc5';
21+
local rcVersion = 'rc1';
2222

23-
// make sure the vision commit aligns with upstream. E.g., for 2.7 release:
24-
// https://github.com/pytorch/pytorch/blob/release/2.7/.github/ci_commit_pins/vision.txt.
23+
// make sure the vision commit aligns with upstream. E.g., for 2.8 release:
24+
// https://github.com/pytorch/pytorch/blob/release/2.8/.github/ci_commit_pins/vision.txt.
2525
local vision_commit = 'd23a6e1664d20707c11781299611436e1f0c104f';
2626

2727

2828
{
29-
local r2_7 = {
30-
frameworkPrefix: 'pt-2-7',
29+
local r2_8 = {
30+
frameworkPrefix: 'pt-2-8',
3131
tpuSettings+: {
3232
softwareVersion: 'tpu-ubuntu2204-base',
3333
},
34-
imageTag: 'r2.7.0-%(rc)s_3.10' % {rc: rcVersion},
34+
imageTag: 'r2.8.0-%(rc)s_3.12' % {rc: rcVersion},
3535
},
36-
PyTorchTest:: common.PyTorchTest + r2_7 {
36+
PyTorchTest:: common.PyTorchTest + r2_8 {
3737
local config = self,
3838

3939
podTemplate+:: {
@@ -74,7 +74,7 @@ local vision_commit = 'd23a6e1664d20707c11781299611436e1f0c104f';
7474
7575
ctc = cloud_tpu_client.Client(tpu=os.path.basename('$(TPU_NAME)'), zone=os.path.dirname('$(TPU_NAME)'))
7676
ctc.wait_for_healthy()
77-
ctc.configure_tpu_version(f'pytorch-2.7-dev{libtpu_date}', restart_type='always')
77+
ctc.configure_tpu_version(f'pytorch-2.8-dev{libtpu_date}', restart_type='always')
7878
ctc.wait_for_healthy()
7979
|||,
8080
],
@@ -110,16 +110,16 @@ local vision_commit = 'd23a6e1664d20707c11781299611436e1f0c104f';
110110
sudo apt install -y libopenblas-base
111111
# for huggingface tests
112112
sudo apt install -y libsndfile-dev
113-
# Install torchvision by pinned commit in PyTorch 2.7 release branch.
114-
pip install torch==2.7.0 --index-url https://download.pytorch.org/whl/test/cpu
115-
# torchvision commit reference: https://github.com/pytorch/pytorch/blob/release/2.7/.github/ci_commit_pins/vision.txt
113+
# Install torchvision by pinned commit in PyTorch 2.8 release branch.
114+
pip install torch==2.8.0 --index-url https://download.pytorch.org/whl/test/cpu
115+
# torchvision commit reference: https://github.com/pytorch/pytorch/blob/release/2.8/.github/ci_commit_pins/vision.txt
116116
pip install --user --no-use-pep517 "git+https://github.com/pytorch/vision.git@%(vision_commit)s"
117-
pip install https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.7.0%(rc)s-cp310-cp310-linux_x86_64.whl
117+
pip install https://storage.googleapis.com/pytorch-xla-releases/wheels/tpuvm/torch_xla-2.8.0%(rc)s-cp310-cp310-linux_x86_64.whl
118118
pip install torch_xla[tpu] -f https://storage.googleapis.com/libtpu-releases/index.html -f https://storage.googleapis.com/libtpu-wheels/index.html
119119
pip install pillow
120120
git clone --depth=1 https://github.com/pytorch/pytorch.git
121121
cd pytorch
122-
git clone -b v2.7.0-%(rc)s https://github.com/pytorch/xla.git
122+
git clone -b v2.8.0-%(rc)s https://github.com/pytorch/xla.git
123123
||| % {rc: rcVersion, vision_commit: vision_commit},
124124
},
125125
podTemplate+:: {
@@ -155,12 +155,12 @@ local vision_commit = 'd23a6e1664d20707c11781299611436e1f0c104f';
155155
156156
nvidia-smi
157157
pip uninstall -y torch torchvision
158-
pip install torch==2.7.0 --index-url https://download.pytorch.org/whl/test/cpu
158+
pip install torch==2.8.0 --index-url https://download.pytorch.org/whl/test/cpu
159159
pip install --user --no-use-pep517 "git+https://github.com/pytorch/vision.git@%(vision_commit)s"
160-
pip install https://storage.googleapis.com/pytorch-xla-releases/wheels/cuda/12.6/torch_xla-2.7.0%(rc)s-cp310-cp310-linux_x86_64.whl
160+
pip install https://storage.googleapis.com/pytorch-xla-releases/wheels/cuda/12.6/torch_xla-2.8.0%(rc)s-cp310-cp310-linux_x86_64.whl
161161
162162
mkdir -p pytorch/xla
163-
git clone -b v2.7.0-%(rc)s https://github.com/pytorch/xla.git pytorch/xla
163+
git clone -b v2.8.0-%(rc)s https://github.com/pytorch/xla.git pytorch/xla
164164
165165
%(cmd)s
166166
@@ -238,5 +238,5 @@ local vision_commit = 'd23a6e1664d20707c11781299611436e1f0c104f';
238238
HuggingfacePipVersionConstraints:: common.HuggingfacePipVersionConstraints,
239239

240240
// DEPRECATED: Use PyTorchTpuVmMixin instead
241-
tpu_vm_r2_7_install: self.PyTorchTpuVmMixin.tpuSettings.tpuVmPytorchSetup,
241+
tpu_vm_r2_8_install: self.PyTorchTpuVmMixin.tpuSettings.tpuVmPytorchSetup,
242242
}

0 commit comments

Comments
 (0)