From e6763b0ce1082c534e29e999efea016af7c83223 Mon Sep 17 00:00:00 2001 From: Cohen-J-Omer Date: Sun, 23 Apr 2023 19:56:10 +0300 Subject: [PATCH] disk_tier support --- sky/clouds/ibm.py | 13 +++++++++++-- sky/clouds/service_catalog/ibm_catalog.py | 4 +++- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/sky/clouds/ibm.py b/sky/clouds/ibm.py index df82ebdf811..f1733a4e158 100644 --- a/sky/clouds/ibm.py +++ b/sky/clouds/ibm.py @@ -235,9 +235,11 @@ def get_accelerators_from_instance_type( def get_default_instance_type( cls, cpus: Optional[str] = None, - memory: Optional[str] = None) -> Optional[str]: + memory: Optional[str] = None, + disk_tier: Optional[str] = None) -> Optional[str]: return service_catalog.get_default_instance_type(cpus=cpus, memory=memory, + disk_tier=disk_tier, clouds='ibm') def get_feasible_launchable_resources(self, @@ -275,7 +277,9 @@ def _make(instance_list): if accelerators is None: # Return a default instance type with the given number of vCPUs. default_instance_type = IBM.get_default_instance_type( - cpus=resources.cpus, memory=resources.memory) + cpus=resources.cpus, + memory=resources.memory, + disk_tier=resources.disk_tier) if default_instance_type is None: return ([], []) else: @@ -390,6 +394,11 @@ def check_credentials(cls) -> Tuple[bool, Optional[str]]: except Exception as e: return (False, f'{str(e)}' + help_str) + @classmethod + def check_disk_tier_enabled(cls, instance_type: str, + disk_tier: str) -> None: + del instance_type, disk_tier # unused + def get_credential_file_mounts(self) -> Dict[str, str]: """Returns a {remote:local} credential path mapping written to the cluster's file_mounts segment diff --git a/sky/clouds/service_catalog/ibm_catalog.py b/sky/clouds/service_catalog/ibm_catalog.py index 7a91c428943..cf5b47657d9 100644 --- a/sky/clouds/service_catalog/ibm_catalog.py +++ b/sky/clouds/service_catalog/ibm_catalog.py @@ -95,7 +95,9 @@ def list_accelerators( def get_default_instance_type(cpus: Optional[str] = None, - memory: Optional[str] = None) -> Optional[str]: + memory: Optional[str] = None, + disk_tier: Optional[str] = None) -> Optional[str]: + del disk_tier # unused if cpus is None and memory is None: cpus = f'{_DEFAULT_NUM_VCPUS}+'