Skip to content
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

Jump to bottom

[batch] delete unnecessary backwards compatibility code #13543

Merged
merged 4 commits into from
Sep 7, 2023
Merged

[batch] delete unnecessary backwards compatibility code #13543

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d844fc5
[batch] delete unnecessary backwards compatibility code
Sep 1, 2023
f5f9a17
delete more things
Sep 1, 2023
4c21888
lint
Sep 1, 2023
a1bc36c
Merge remote-tracking branch 'hi/main' into remove-unnecessary-backwa…
Sep 5, 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
30 changes: 2 additions & 28 deletions batch/batch/cloud/gcp/instance_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,6 @@ def from_dict(data: dict) -> 'GCPSlimInstanceConfig':
data['instance']['type'],
data['instance']['cores'],
)
instance_family = data['instance']['family']
else:
machine_type = data['machine_type']
preemptible = data['preemptible']
Expand All @@ -127,33 +126,8 @@ def from_dict(data: dict) -> 'GCPSlimInstanceConfig':
boot_disk_size_gb = data['boot_disk_size_gb']
job_private = data['job_private']

machine_type_parts = gcp_machine_type_to_parts(machine_type)
assert machine_type_parts is not None, machine_type
instance_family = machine_type_parts.machine_family

resources = data.get('resources')
if resources is None:
assert data['version'] < 5, data

preemptible_str = 'preemptible' if preemptible else 'nonpreemptible'

if local_ssd_data_disk:
data_disk_resource = GCPStaticSizedDiskResource('disk/local-ssd/1', data_disk_size_gb)
else:
data_disk_resource = GCPStaticSizedDiskResource('disk/pd-ssd/1', data_disk_size_gb)

# hard coded product versions "/1" are for backwards compatibility
resources = [
GCPComputeResource(f'compute/{instance_family}-{preemptible_str}/1'),
GCPMemoryResource(f'memory/{instance_family}-{preemptible_str}/1'),
GCPStaticSizedDiskResource('disk/pd-ssd/1', boot_disk_size_gb),
data_disk_resource,
GCPDynamicSizedDiskResource('disk/pd-ssd/1'),
GCPIPFeeResource('service-fee/1'),
GCPServiceFeeResource('ip-fee/1024/1'),
]
else:
resources = [gcp_resource_from_dict(data) for data in resources]
assert 'resources' in data and data['resources'] is not None
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We might be able to delete the code under if data['version'] < 4: as well.

resources = [gcp_resource_from_dict(data) for data in data['resources']]

return GCPSlimInstanceConfig(
machine_type,
Expand Down