Skip to content

Modify tpu version regex to match new names #4557

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
steventk-g merged 2 commits into from
Feb 3, 2023
+44 −23
Merged

Modify tpu version regex to match new names #4557

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d1971e0
Match litepod and lite version names
Feb 3, 2023
b37b841
Formatting with yapf
Feb 3, 2023
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
65 changes: 43 additions & 22 deletions test/pjrt/test_experimental_tpu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,30 +46,51 @@ def test_task_id(self, task_id, expected):

self.assertEqual(i, expected)

def test_tpu_env_from_gce_metadata(self):
tpu_env_yaml = textwrap.dedent("""
ACCELERATOR_TYPE: 'v4-16'
CHIPS_PER_HOST_BOUNDS: '2,2,1'
HOST_BOUNDS: '1,1,2'
TPU_CHIPS_PER_PROCESS_BOUNDS: '2,2,1'
TPU_PROCESS_BOUNDS: '1,1,2'
ZONE: 'us-central2-b'
WORKER_ID: '0'
""")

@parameterized.named_parameters(
('v4',
textwrap.dedent("""
ACCELERATOR_TYPE: 'v4-16'
CHIPS_PER_HOST_BOUNDS: '2,2,1'
HOST_BOUNDS: '1,1,2'
TPU_CHIPS_PER_PROCESS_BOUNDS: '2,2,1'
TPU_PROCESS_BOUNDS: '1,1,2'
ZONE: 'us-central2-b'
WORKER_ID: '0'
"""), {
'ACCELERATOR_TYPE': 'v4-16',
'CHIPS_PER_HOST_BOUNDS': '2,2,1',
'HOST_BOUNDS': '1,1,2',
'TPU_CHIPS_PER_PROCESS_BOUNDS': '2,2,1',
'TPU_PROCESS_BOUNDS': '1,1,2',
'ZONE': 'us-central2-b',
'WORKER_ID': '0'
}, 4),
('v5',
textwrap.dedent("""
ACCELERATOR_TYPE: 'v5abcdefg-16'
CHIPS_PER_HOST_BOUNDS: '2,2,1'
HOST_BOUNDS: '1,1,2'
TPU_CHIPS_PER_PROCESS_BOUNDS: '2,2,1'
TPU_PROCESS_BOUNDS: '1,1,2'
ZONE: 'us-central2-b'
WORKER_ID: '0'
"""), {
'ACCELERATOR_TYPE': 'v5abcdefg-16',
'CHIPS_PER_HOST_BOUNDS': '2,2,1',
'HOST_BOUNDS': '1,1,2',
'TPU_CHIPS_PER_PROCESS_BOUNDS': '2,2,1',
'TPU_PROCESS_BOUNDS': '1,1,2',
'ZONE': 'us-central2-b',
'WORKER_ID': '0'
}, 5),
)
def test_tpu_env_from_gce_metadata(self, tpu_env_yaml, expected_env,
expected_version):
with mock.patch.object(tpu, '_get_metadata', return_value=tpu_env_yaml):
tpu_env = tpu.get_tpu_env()

self.assertDictEqual(
tpu_env, {
'ACCELERATOR_TYPE': 'v4-16',
'CHIPS_PER_HOST_BOUNDS': '2,2,1',
'HOST_BOUNDS': '1,1,2',
'TPU_CHIPS_PER_PROCESS_BOUNDS': '2,2,1',
'TPU_PROCESS_BOUNDS': '1,1,2',
'ZONE': 'us-central2-b',
'WORKER_ID': '0'
})
version = tpu.version()
self.assertDictEqual(tpu_env, expected_env)
self.assertEqual(version, expected_version)

@parameterized.named_parameters(
('all-vars-set', {
Expand Down
2 changes: 1 addition & 1 deletion torch_xla/experimental/tpu.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def version() -> int:
except requests.HTTPError as e:
raise EnvironmentError('Failed to get TPU metadata') from e

match = re.match(r'^v(\d)-(\d+)$', env[xenv.ACCELERATOR_TYPE])
match = re.match(r'^v(\d)([A-Za-z]?){7}-(\d+)$', env[xenv.ACCELERATOR_TYPE])
return int(match.groups()[0])


Expand Down