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] remove redundant super class #13541

Merged
merged 3 commits into from
Sep 5, 2023
Merged

[batch] remove redundant super class #13541

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
93deeab
[batch] remove redundant super class
Sep 1, 2023
f4c3993
fix lints
Sep 1, 2023
546982f
Merge remote-tracking branch 'hi/main' into remove-unnecessary-multip…
Sep 1, 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
3 changes: 1 addition & 2 deletions batch/batch/cloud/azure/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import abc
from typing import Any, Dict, Optional

from ...driver.billing_manager import ProductVersions
Expand All @@ -14,7 +13,7 @@
from .resource_utils import azure_disk_from_storage_in_gib, azure_disks_by_disk_type


class AzureResource(Resource, abc.ABC):
class AzureResource(Resource):
pass


Expand Down
3 changes: 1 addition & 2 deletions batch/batch/cloud/gcp/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import abc
from typing import Any, Dict, Optional

from ...driver.billing_manager import ProductVersions
Expand All @@ -14,7 +13,7 @@
)


class GCPResource(Resource, abc.ABC):
class GCPResource(Resource):
pass


Expand Down
14 changes: 7 additions & 7 deletions batch/batch/resources.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ def to_dict(self) -> dict:
raise NotImplementedError


class StaticSizedDiskResourceMixin(Resource, abc.ABC):
class StaticSizedDiskResourceMixin(Resource):
storage_in_gib: int

def to_quantified_resource(
Expand All @@ -44,47 +44,47 @@ def to_quantified_resource(
return {'name': self.name, 'quantity': self.storage_in_gib * worker_fraction_in_1024ths}


class DynamicSizedDiskResourceMixin(Resource, abc.ABC):
class DynamicSizedDiskResourceMixin(Resource):
@abc.abstractmethod
def to_quantified_resource(
self, cpu_in_mcpu: int, memory_in_bytes: int, worker_fraction_in_1024ths: int, external_storage_in_gib: int
) -> Optional[QuantifiedResource]: # pylint: disable=unused-argument
raise NotImplementedError


class ComputeResourceMixin(Resource, abc.ABC):
class ComputeResourceMixin(Resource):
def to_quantified_resource(
self, cpu_in_mcpu: int, memory_in_bytes: int, worker_fraction_in_1024ths: int, external_storage_in_gib: int
) -> Optional[QuantifiedResource]: # pylint: disable=unused-argument
del memory_in_bytes, worker_fraction_in_1024ths, external_storage_in_gib
return {'name': self.name, 'quantity': cpu_in_mcpu}


class VMResourceMixin(Resource, abc.ABC):
class VMResourceMixin(Resource):
def to_quantified_resource(
self, cpu_in_mcpu: int, memory_in_bytes: int, worker_fraction_in_1024ths: int, external_storage_in_gib: int
) -> Optional[QuantifiedResource]: # pylint: disable=unused-argument
del cpu_in_mcpu, memory_in_bytes, external_storage_in_gib
return {'name': self.name, 'quantity': worker_fraction_in_1024ths}


class MemoryResourceMixin(Resource, abc.ABC):
class MemoryResourceMixin(Resource):
def to_quantified_resource(
self, cpu_in_mcpu: int, memory_in_bytes: int, worker_fraction_in_1024ths: int, external_storage_in_gib: int
) -> Optional[QuantifiedResource]: # pylint: disable=unused-argument
del cpu_in_mcpu, worker_fraction_in_1024ths, external_storage_in_gib
return {'name': self.name, 'quantity': memory_in_bytes // 1024 // 1024}


class IPFeeResourceMixin(Resource, abc.ABC):
class IPFeeResourceMixin(Resource):
def to_quantified_resource(
self, cpu_in_mcpu: int, memory_in_bytes: int, worker_fraction_in_1024ths: int, external_storage_in_gib: int
) -> Optional[QuantifiedResource]: # pylint: disable=unused-argument
del cpu_in_mcpu, memory_in_bytes, external_storage_in_gib
return {'name': self.name, 'quantity': worker_fraction_in_1024ths}


class ServiceFeeResourceMixin(Resource, abc.ABC):
class ServiceFeeResourceMixin(Resource):
def to_quantified_resource(
self, cpu_in_mcpu: int, memory_in_bytes: int, worker_fraction_in_1024ths: int, external_storage_in_gib: int
) -> Optional[QuantifiedResource]: # pylint: disable=unused-argument
Expand Down