From 62e4c01f0ef13ebab12affbdc40a0c74552bb4ab Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Tue, 10 Jan 2023 10:34:51 -0800 Subject: [PATCH 1/2] [Doc] Update AWS cluster cfg yaml to use default AMI. Signed-off-by: Jun Gong --- python/ray/autoscaler/aws/example-full.yaml | 6 ++++-- python/ray/autoscaler/aws/example-gpu-docker.yaml | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/python/ray/autoscaler/aws/example-full.yaml b/python/ray/autoscaler/aws/example-full.yaml index 0fb7e0ca598d0..da5e431ee00a7 100644 --- a/python/ray/autoscaler/aws/example-full.yaml +++ b/python/ray/autoscaler/aws/example-full.yaml @@ -71,7 +71,8 @@ available_node_types: # http://boto3.readthedocs.io/en/latest/reference/services/ec2.html#EC2.ServiceResource.create_instances node_config: InstanceType: m5.large - ImageId: ami-0a2363a9cff180a64 # Deep Learning AMI (Ubuntu) Version 30 + # Default AMI. Uncomment to use a different AMI. + # ImageId: # You can provision additional disk space with a conf as follows BlockDeviceMappings: - DeviceName: /dev/sda1 @@ -97,7 +98,8 @@ available_node_types: # http://boto3.readthedocs.io/en/latest/reference/services/ec2.html#EC2.ServiceResource.create_instances node_config: InstanceType: m5.large - ImageId: ami-0a2363a9cff180a64 # Deep Learning AMI (Ubuntu) Version 30 + # Default AMI. Uncomment to use a different AMI. + # ImageId: # Run workers on spot by default. Comment this out to use on-demand. # NOTE: If relying on spot instances, it is best to specify multiple different instance # types to avoid interruption when one instance type is experiencing heightened demand. diff --git a/python/ray/autoscaler/aws/example-gpu-docker.yaml b/python/ray/autoscaler/aws/example-gpu-docker.yaml index 16de43779046b..4eb0ab7f52275 100644 --- a/python/ray/autoscaler/aws/example-gpu-docker.yaml +++ b/python/ray/autoscaler/aws/example-gpu-docker.yaml @@ -59,7 +59,8 @@ available_node_types: # http://boto3.readthedocs.io/en/latest/reference/services/ec2.html#EC2.ServiceResource.create_instances node_config: InstanceType: p2.xlarge - ImageId: ami-0a2363a9cff180a64 # Deep Learning AMI (Ubuntu) Version 30 + # Default AMI. Uncomment to use a different AMI. + # ImageId: # You can provision additional disk space with a conf as follows BlockDeviceMappings: - DeviceName: /dev/sda1 @@ -91,7 +92,8 @@ available_node_types: # http://boto3.readthedocs.io/en/latest/reference/services/ec2.html#EC2.ServiceResource.create_instances node_config: InstanceType: m5.large - ImageId: ami-0a2363a9cff180a64 # Deep Learning AMI (Ubuntu) Version 30 + # Default AMI. Uncomment to use a different AMI. + # ImageId: # Run workers on spot by default. Comment this out to use on-demand. InstanceMarketOptions: MarketType: spot From c3035bf3d77a3c9ef5570e601706b1d0f06db42d Mon Sep 17 00:00:00 2001 From: Jun Gong Date: Tue, 10 Jan 2023 13:54:05 -0800 Subject: [PATCH 2/2] example-full.yaml has the actual AMI Signed-off-by: Jun Gong --- python/ray/autoscaler/_private/aws/config.py | 2 ++ python/ray/autoscaler/aws/example-full.yaml | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/python/ray/autoscaler/_private/aws/config.py b/python/ray/autoscaler/_private/aws/config.py index 53b7007125e72..76a03b99daa8c 100644 --- a/python/ray/autoscaler/_private/aws/config.py +++ b/python/ray/autoscaler/_private/aws/config.py @@ -36,6 +36,8 @@ DEFAULT_AMI_NAME = "AWS Deep Learning AMI (Ubuntu 18.04) V61.0" # Obtained from https://aws.amazon.com/marketplace/pp/B07Y43P7X5 on 6/10/2022. +# TODO(alex) : write a unit test to make sure we update AMI version used in +# ray/autoscaler/aws/example-full.yaml whenever we update this dict. DEFAULT_AMI = { "us-east-1": "ami-0dd6adfad4ad37eec", # US East (N. Virginia) "us-east-2": "ami-0c77cd5ca05bf1281", # US East (Ohio) diff --git a/python/ray/autoscaler/aws/example-full.yaml b/python/ray/autoscaler/aws/example-full.yaml index da5e431ee00a7..c254a04008159 100644 --- a/python/ray/autoscaler/aws/example-full.yaml +++ b/python/ray/autoscaler/aws/example-full.yaml @@ -71,8 +71,10 @@ available_node_types: # http://boto3.readthedocs.io/en/latest/reference/services/ec2.html#EC2.ServiceResource.create_instances node_config: InstanceType: m5.large - # Default AMI. Uncomment to use a different AMI. - # ImageId: + # Default AMI for us-west-2. + # Check https://github.com/ray-project/ray/blob/master/python/ray/autoscaler/_private/aws/config.py + # for default images for other zones. + ImageId: ami-0387d929287ab193e # You can provision additional disk space with a conf as follows BlockDeviceMappings: - DeviceName: /dev/sda1 @@ -98,8 +100,10 @@ available_node_types: # http://boto3.readthedocs.io/en/latest/reference/services/ec2.html#EC2.ServiceResource.create_instances node_config: InstanceType: m5.large - # Default AMI. Uncomment to use a different AMI. - # ImageId: + # Default AMI for us-west-2. + # Check https://github.com/ray-project/ray/blob/master/python/ray/autoscaler/_private/aws/config.py + # for default images for other zones. + ImageId: ami-0387d929287ab193e # Run workers on spot by default. Comment this out to use on-demand. # NOTE: If relying on spot instances, it is best to specify multiple different instance # types to avoid interruption when one instance type is experiencing heightened demand.