Skip to content

Commit

Permalink
cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@asaiacai
asaiacai committed Sep 3, 2024
1 parent e50126c commit 8532fcf
Show file tree
Hide file tree
Showing 2 changed files with 17 additions and 1 deletion.
1 change: 0 additions & 1 deletion sky/clouds/cloud_registry.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ def from_str(self, name: Optional[str]) -> Optional['cloud.Cloud']:

def register(self, cloud_cls: Type['cloud.Cloud']) -> Type['cloud.Cloud']:
name = cloud_cls.__name__.lower()
# import pdb; pdb.set_trace()
assert name not in self, f'{name} already registered'
self[name] = cloud_cls()
return cloud_cls
Expand Down
17 changes: 17 additions & 0 deletions tests/test_smoke.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1682,6 +1682,7 @@ def test_docker_preinstalled_package(generic_cloud: str):
@pytest.mark.no_ibm # IBM Cloud does not have T4 gpus
@pytest.mark.no_scp # SCP does not support num_nodes > 1 yet
@pytest.mark.no_oci # OCI Cloud does not have T4 gpus
@pytest.mark.no_do # DO does not have T4 gpus
def test_multi_echo(generic_cloud: str):
name = _get_cluster_name()
test = Test(
Expand All @@ -1706,6 +1707,7 @@ def test_multi_echo(generic_cloud: str):
@pytest.mark.no_lambda_cloud # Lambda Cloud does not have V100 gpus
@pytest.mark.no_ibm # IBM cloud currently doesn't provide public image with CUDA
@pytest.mark.no_scp # SCP does not have V100 (16GB) GPUs. Run test_scp_huggingface instead.
@pytest.mark.no_do # DO has no GPUs in GA
def test_huggingface(generic_cloud: str):
name = _get_cluster_name()
test = Test(
Expand Down Expand Up @@ -2154,6 +2156,7 @@ def test_container_logs_two_simultaneous_jobs_kubernetes():
@pytest.mark.no_lambda_cloud # Lambda Cloud does not have V100 gpus
@pytest.mark.no_ibm # IBM cloud currently doesn't provide public image with CUDA
@pytest.mark.no_scp # SCP does not support num_nodes > 1 yet
@pytest.mark.no_do # DO has not GPU images in GA
@pytest.mark.skip(
reason=
'The resnet_distributed_tf_app is flaky, due to it failing to detect GPUs.')
Expand Down Expand Up @@ -2419,6 +2422,7 @@ def test_cancel_azure():
@pytest.mark.no_ibm # IBM cloud currently doesn't provide public image with CUDA
@pytest.mark.no_paperspace # Paperspace has `gnome-shell` on nvidia-smi
@pytest.mark.no_scp # SCP does not support num_nodes > 1 yet
@pytest.mark.no_do # DO has no GPUs in GA
def test_cancel_pytorch(generic_cloud: str):
name = _get_cluster_name()
test = Test(
Expand Down Expand Up @@ -2474,6 +2478,7 @@ def test_cancel_ibm():
@pytest.mark.no_ibm # IBM Cloud does not support spot instances
@pytest.mark.no_scp # SCP does not support spot instances
@pytest.mark.no_kubernetes # Kubernetes does not have a notion of spot instances
@pytest.mark.no_do # DO does not support spot instances
def test_use_spot(generic_cloud: str):
"""Test use-spot and sky exec."""
name = _get_cluster_name()
Expand Down Expand Up @@ -2558,6 +2563,7 @@ def test_managed_jobs(generic_cloud: str):
@pytest.mark.no_scp # SCP does not support spot instances
@pytest.mark.no_paperspace # Paperspace does not support spot instances
@pytest.mark.no_kubernetes # Kubernetes does not have a notion of spot instances
@pytest.mark.no_do # DO does not support spot instances
@pytest.mark.managed_jobs
def test_job_pipeline(generic_cloud: str):
"""Test a job pipeline."""
Expand Down Expand Up @@ -2599,6 +2605,7 @@ def test_job_pipeline(generic_cloud: str):
@pytest.mark.no_scp # SCP does not support spot instances
@pytest.mark.no_paperspace # Paperspace does not support spot instances
@pytest.mark.no_kubernetes # Kubernetes does not have a notion of spot instances
@pytest.mark.no_do # DO does not support spot instances
@pytest.mark.managed_jobs
def test_managed_jobs_failed_setup(generic_cloud: str):
"""Test managed job with failed setup."""
Expand All @@ -2624,6 +2631,7 @@ def test_managed_jobs_failed_setup(generic_cloud: str):
@pytest.mark.no_scp # SCP does not support spot instances
@pytest.mark.no_paperspace # Paperspace does not support spot instances
@pytest.mark.no_kubernetes # Kubernetes does not have a notion of spot instances
@pytest.mark.no_do # DO does not support spot instances
@pytest.mark.managed_jobs
def test_managed_jobs_pipeline_failed_setup(generic_cloud: str):
"""Test managed job with failed setup for a pipeline."""
Expand Down Expand Up @@ -3041,6 +3049,7 @@ def test_managed_jobs_cancellation_gcp():
@pytest.mark.no_ibm # IBM Cloud does not support spot instances
@pytest.mark.no_paperspace # Paperspace does not support spot instances
@pytest.mark.no_scp # SCP does not support spot instances
@pytest.mark.no_do # DO does not support spot instances
@pytest.mark.managed_jobs
def test_managed_jobs_storage(generic_cloud: str):
"""Test storage with managed job"""
Expand Down Expand Up @@ -3591,6 +3600,7 @@ def test_skyserve_kubernetes_http():


@pytest.mark.no_fluidstack # Fluidstack does not support T4 gpus for now
@pytest.mark.no_do # DO does not support GPU instances in GA for now
@pytest.mark.serve
def test_skyserve_llm(generic_cloud: str):
"""Test skyserve with real LLM usecase"""
Expand Down Expand Up @@ -3650,6 +3660,7 @@ def test_skyserve_spot_recovery():

@pytest.mark.no_fluidstack # Fluidstack does not support spot instances
@pytest.mark.serve
@pytest.mark.no_do # DO does not support spot instances
@pytest.mark.no_kubernetes
def test_skyserve_base_ondemand_fallback(generic_cloud: str):
name = _get_service_name()
Expand Down Expand Up @@ -4048,6 +4059,7 @@ def test_skyserve_update_autoscale(generic_cloud: str):
@pytest.mark.no_fluidstack # Spot instances are note supported by Fluidstack
@pytest.mark.serve
@pytest.mark.no_kubernetes # Spot instances are not supported in Kubernetes
@pytest.mark.no_do # Spot instances are not support by DO
@pytest.mark.parametrize('mode', ['rolling', 'blue_green'])
def test_skyserve_new_autoscaler_update(mode: str, generic_cloud: str):
"""Test skyserve with update that changes autoscaler"""
Expand Down Expand Up @@ -5349,6 +5361,7 @@ def test_load_dump_yaml_config_equivalent(self):
# ---------- Testing Multiple Accelerators ----------
@pytest.mark.no_fluidstack # Fluidstack does not support K80 gpus for now
@pytest.mark.no_paperspace # Paperspace does not support K80 gpus
@pytest.mark.no_do # DO does not have K80 gpus
def test_multiple_accelerators_ordered():
name = _get_cluster_name()
test = Test(
Expand All @@ -5365,6 +5378,7 @@ def test_multiple_accelerators_ordered():

@pytest.mark.no_fluidstack # Fluidstack has low availability for T4 GPUs
@pytest.mark.no_paperspace # Paperspace does not support T4 GPUs
@pytest.mark.no_do # DO does not support T4 GPUs
def test_multiple_accelerators_ordered_with_default():
name = _get_cluster_name()
test = Test(
Expand All @@ -5381,6 +5395,7 @@ def test_multiple_accelerators_ordered_with_default():

@pytest.mark.no_fluidstack # Fluidstack has low availability for T4 GPUs
@pytest.mark.no_paperspace # Paperspace does not support T4 GPUs
@pytest.mark.no_do # DO does not support T4 GPUs
def test_multiple_accelerators_unordered():
name = _get_cluster_name()
test = Test(
Expand All @@ -5396,6 +5411,7 @@ def test_multiple_accelerators_unordered():

@pytest.mark.no_fluidstack # Fluidstack has low availability for T4 GPUs
@pytest.mark.no_paperspace # Paperspace does not support T4 GPUs
@pytest.mark.no_do # DO does not support T4 GPUs
def test_multiple_accelerators_unordered_with_default():
name = _get_cluster_name()
test = Test(
Expand Down Expand Up @@ -5427,6 +5443,7 @@ def test_multiple_resources():
# ---------- Sky Benchmark ----------
@pytest.mark.no_fluidstack # Requires other clouds to be enabled
@pytest.mark.no_paperspace # Requires other clouds to be enabled
@pytest.mark.no_do # Requires other clouds to be enabled
@pytest.mark.no_kubernetes
@pytest.mark.aws # SkyBenchmark requires S3 access
def test_sky_bench(generic_cloud: str):
Expand Down

0 comments on commit 8532fcf

Please sign in to comment.