Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
160 changes: 155 additions & 5 deletions sample/sagemaker/2017-07-24/service-2.json
Original file line number Diff line number Diff line change
Expand Up @@ -8937,6 +8937,12 @@
"Disable"
]
},
"ClusterDnsName":{
"type":"string",
"max":275,
"min":16,
"pattern":"((fs|fc)i?-[0-9a-f]{8,}\\..{4,253})"
},
"ClusterEbsVolumeConfig":{
"type":"structure",
"members":{
Expand Down Expand Up @@ -9076,6 +9082,49 @@
},
"documentation":"<p>A summary of an event in a HyperPod cluster.</p>"
},
"ClusterFsxLustreConfig":{
"type":"structure",
"required":[
"DnsName",
"MountName"
],
"members":{
"DnsName":{
"shape":"ClusterDnsName",
"documentation":"<p>The DNS name of the Amazon FSx for Lustre file system.</p>"
},
"MountName":{
"shape":"ClusterMountName",
"documentation":"<p>The mount name of the Amazon FSx for Lustre file system.</p>"
},
"MountPath":{
"shape":"ClusterFsxMountPath",
"documentation":"<p>The local path where the Amazon FSx for Lustre file system is mounted on instances.</p>"
}
},
"documentation":"<p>Defines the configuration for attaching an Amazon FSx for Lustre file system to instances in a SageMaker HyperPod cluster instance group.</p>"
},
"ClusterFsxMountPath":{
"type":"string",
"max":1024,
"min":1,
"pattern":"/[a-zA-Z0-9._/-]+"
},
"ClusterFsxOpenZfsConfig":{
"type":"structure",
"required":["DnsName"],
"members":{
"DnsName":{
"shape":"ClusterDnsName",
"documentation":"<p>The DNS name of the Amazon FSx for OpenZFS file system.</p>"
},
"MountPath":{
"shape":"ClusterFsxMountPath",
"documentation":"<p>The local path where the Amazon FSx for OpenZFS file system is mounted on instances.</p>"
}
},
"documentation":"<p>Defines the configuration for attaching an Amazon FSx for OpenZFS file system to instances in a SageMaker HyperPod cluster instance group.</p>"
},
"ClusterInstanceCount":{
"type":"integer",
"box":true,
Expand Down Expand Up @@ -9173,7 +9222,11 @@
"shape":"SoftwareUpdateStatus",
"documentation":"<p>Status of the last software udpate request.</p> <p>Status transitions follow these possible sequences:</p> <ul> <li> <p>Pending -&gt; InProgress -&gt; Succeeded</p> </li> <li> <p>Pending -&gt; InProgress -&gt; RollbackInProgress -&gt; RollbackComplete</p> </li> <li> <p>Pending -&gt; InProgress -&gt; RollbackInProgress -&gt; Failed</p> </li> </ul>"
},
"ActiveSoftwareUpdateConfig":{"shape":"DeploymentConfiguration"}
"ActiveSoftwareUpdateConfig":{"shape":"DeploymentConfiguration"},
"SlurmConfig":{
"shape":"ClusterSlurmConfigDetails",
"documentation":"<p>The Slurm configuration for the instance group.</p>"
}
},
"documentation":"<p>Details of an instance group in a SageMaker HyperPod cluster.</p>"
},
Expand Down Expand Up @@ -9253,6 +9306,10 @@
"shape":"ClusterKubernetesConfig",
"documentation":"<p>Specifies the Kubernetes configuration for the instance group. You describe what you want the labels and taints to look like, and the cluster works to reconcile the actual state with the declared state for nodes in this instance group. </p>"
},
"SlurmConfig":{
"shape":"ClusterSlurmConfig",
"documentation":"<p>Specifies the Slurm configuration for the instance group.</p>"
},
"CapacityRequirements":{
"shape":"ClusterCapacityRequirements",
"documentation":"<p>Specifies the capacity requirements for the instance group.</p>"
Expand Down Expand Up @@ -9325,6 +9382,14 @@
"EbsVolumeConfig":{
"shape":"ClusterEbsVolumeConfig",
"documentation":"<p>Defines the configuration for attaching additional Amazon Elastic Block Store (EBS) volumes to the instances in the SageMaker HyperPod cluster instance group. The additional EBS volume is attached to each instance within the SageMaker HyperPod cluster instance group and mounted to <code>/opt/sagemaker</code>.</p>"
},
"FsxLustreConfig":{
"shape":"ClusterFsxLustreConfig",
"documentation":"<p>Defines the configuration for attaching an Amazon FSx for Lustre file system to the instances in the SageMaker HyperPod cluster instance group.</p>"
},
"FsxOpenZfsConfig":{
"shape":"ClusterFsxOpenZfsConfig",
"documentation":"<p>Defines the configuration for attaching an Amazon FSx for OpenZFS file system to the instances in the SageMaker HyperPod cluster instance group.</p>"
}
},
"documentation":"<p>Defines the configuration for attaching additional storage to the instances in the SageMaker HyperPod cluster instance group. To learn more, see <a href=\"https://docs.aws.amazon.com/sagemaker/latest/dg/sagemaker-hyperpod-release-notes.html#sagemaker-hyperpod-release-notes-20240620\">SageMaker HyperPod release notes: June 20, 2024</a>.</p>",
Expand All @@ -9333,7 +9398,7 @@
"ClusterInstanceStorageConfigs":{
"type":"list",
"member":{"shape":"ClusterInstanceStorageConfig"},
"max":2,
"max":4,
"min":0
},
"ClusterInstanceType":{
Expand Down Expand Up @@ -9624,6 +9689,12 @@
},
"documentation":"<p>Metadata information about a HyperPod cluster showing information about the cluster level operations, such as creating, updating, and deleting.</p>"
},
"ClusterMountName":{
"type":"string",
"max":8,
"min":1,
"pattern":"([A-Za-z0-9_-]{1,8})"
},
"ClusterName":{
"type":"string",
"max":63,
Expand Down Expand Up @@ -9826,6 +9897,10 @@
"Eks":{
"shape":"ClusterOrchestratorEksConfig",
"documentation":"<p>The Amazon EKS cluster used as the orchestrator for the SageMaker HyperPod cluster.</p>"
},
"Slurm":{
"shape":"ClusterOrchestratorSlurmConfig",
"documentation":"<p>The Slurm orchestrator configuration for the SageMaker HyperPod cluster.</p>"
}
},
"documentation":"<p>The type of orchestrator used for the SageMaker HyperPod cluster.</p>"
Expand All @@ -9841,6 +9916,28 @@
},
"documentation":"<p>The configuration settings for the Amazon EKS cluster used as the orchestrator for the SageMaker HyperPod cluster.</p>"
},
"ClusterOrchestratorSlurmConfig":{
"type":"structure",
"members":{
"SlurmConfigStrategy":{
"shape":"ClusterSlurmConfigStrategy",
"documentation":"<p>The strategy for managing partitions for the Slurm configuration. Valid values are <code>Managed</code>, <code>Overwrite</code>, and <code>Merge</code>.</p>"
}
},
"documentation":"<p>The configuration settings for the Slurm orchestrator used with the SageMaker HyperPod cluster.</p>"
},
"ClusterPartitionName":{
"type":"string",
"max":1024,
"min":0,
"pattern":"[a-zA-Z0-9](-*[a-zA-Z0-9])*"
},
"ClusterPartitionNames":{
"type":"list",
"member":{"shape":"ClusterPartitionName"},
"max":1,
"min":0
},
"ClusterPrivateDnsHostname":{
"type":"string",
"pattern":"ip-((25[0-5]|(2[0-4]|1\\d|[1-9]|)\\d)-?\\b){4}\\..*"
Expand Down Expand Up @@ -10035,6 +10132,52 @@
"type":"string",
"pattern":"[a-z0-9]([-a-z0-9]*[a-z0-9]){0,39}?"
},
"ClusterSlurmConfig":{
"type":"structure",
"required":["NodeType"],
"members":{
"NodeType":{
"shape":"ClusterSlurmNodeType",
"documentation":"<p>The type of Slurm node for the instance group. Valid values are <code>Controller</code>, <code>Worker</code>, and <code>Login</code>.</p>"
},
"PartitionNames":{
"shape":"ClusterPartitionNames",
"documentation":"<p>The list of Slurm partition names that the instance group belongs to.</p>"
}
},
"documentation":"<p>The Slurm configuration for an instance group in a SageMaker HyperPod cluster.</p>"
},
"ClusterSlurmConfigDetails":{
"type":"structure",
"required":["NodeType"],
"members":{
"NodeType":{
"shape":"ClusterSlurmNodeType",
"documentation":"<p>The type of Slurm node for the instance group. Valid values are <code>Controller</code>, <code>Worker</code>, and <code>Login</code>.</p>"
},
"PartitionNames":{
"shape":"ClusterPartitionNames",
"documentation":"<p>The list of Slurm partition names that the instance group belongs to.</p>"
}
},
"documentation":"<p>The Slurm configuration details for an instance group in a SageMaker HyperPod cluster.</p>"
},
"ClusterSlurmConfigStrategy":{
"type":"string",
"enum":[
"Overwrite",
"Managed",
"Merge"
]
},
"ClusterSlurmNodeType":{
"type":"string",
"enum":[
"Controller",
"Login",
"Compute"
]
},
"ClusterSortBy":{
"type":"string",
"enum":[
Expand Down Expand Up @@ -11301,7 +11444,7 @@
},
"Orchestrator":{
"shape":"ClusterOrchestrator",
"documentation":"<p>The type of orchestrator to use for the SageMaker HyperPod cluster. Currently, the only supported value is <code>\"eks\"</code>, which is to use an Amazon Elastic Kubernetes Service cluster as the orchestrator.</p>"
"documentation":"<p>The type of orchestrator to use for the SageMaker HyperPod cluster. Currently, supported values are <code>\"Eks\"</code> and <code>\"Slurm\"</code>, which is to use an Amazon Elastic Kubernetes Service or Slurm cluster as the orchestrator.</p> <note> <p>If you specify the <code>Orchestrator</code> field, you must provide exactly one orchestrator configuration: either <code>Eks</code> or <code>Slurm</code>. Specifying both or providing an empty configuration returns a validation error.</p> </note>"
},
"NodeRecovery":{
"shape":"ClusterNodeRecovery",
Expand Down Expand Up @@ -37478,7 +37621,13 @@
"ml.r7i.16xlarge",
"ml.r7i.24xlarge",
"ml.r7i.48xlarge",
"ml.p5.4xlarge"
"ml.p5.4xlarge",
"ml.g7e.2xlarge",
"ml.g7e.4xlarge",
"ml.g7e.8xlarge",
"ml.g7e.12xlarge",
"ml.g7e.24xlarge",
"ml.g7e.48xlarge"
]
},
"ProcessingJob":{
Expand Down Expand Up @@ -45528,7 +45677,8 @@
"AutoScaling":{
"shape":"ClusterAutoScalingConfig",
"documentation":"<p>Updates the autoscaling configuration for the cluster. Use to enable or disable automatic node scaling.</p>"
}
},
"Orchestrator":{"shape":"ClusterOrchestrator"}
}
},
"UpdateClusterResponse":{
Expand Down
52 changes: 50 additions & 2 deletions src/sagemaker_core/main/code_injection/shape_dag.py
Original file line number Diff line number Diff line change
Expand Up @@ -1718,6 +1718,21 @@
],
"type": "structure",
},
"ClusterFsxLustreConfig": {
"members": [
{"name": "DnsName", "shape": "ClusterDnsName", "type": "string"},
{"name": "MountName", "shape": "ClusterMountName", "type": "string"},
{"name": "MountPath", "shape": "ClusterFsxMountPath", "type": "string"},
],
"type": "structure",
},
"ClusterFsxOpenZfsConfig": {
"members": [
{"name": "DnsName", "shape": "ClusterDnsName", "type": "string"},
{"name": "MountPath", "shape": "ClusterFsxMountPath", "type": "string"},
],
"type": "structure",
},
"ClusterInstanceGroupDetails": {
"members": [
{"name": "CurrentCount", "shape": "ClusterNonNegativeInstanceCount", "type": "integer"},
Expand Down Expand Up @@ -1767,6 +1782,7 @@
"shape": "DeploymentConfiguration",
"type": "structure",
},
{"name": "SlurmConfig", "shape": "ClusterSlurmConfigDetails", "type": "structure"},
],
"type": "structure",
},
Expand Down Expand Up @@ -1799,6 +1815,7 @@
},
{"name": "ImageId", "shape": "ImageId", "type": "string"},
{"name": "KubernetesConfig", "shape": "ClusterKubernetesConfig", "type": "structure"},
{"name": "SlurmConfig", "shape": "ClusterSlurmConfig", "type": "structure"},
{
"name": "CapacityRequirements",
"shape": "ClusterCapacityRequirements",
Expand Down Expand Up @@ -1833,7 +1850,9 @@
},
"ClusterInstanceStorageConfig": {
"members": [
{"name": "EbsVolumeConfig", "shape": "ClusterEbsVolumeConfig", "type": "structure"}
{"name": "EbsVolumeConfig", "shape": "ClusterEbsVolumeConfig", "type": "structure"},
{"name": "FsxLustreConfig", "shape": "ClusterFsxLustreConfig", "type": "structure"},
{"name": "FsxOpenZfsConfig", "shape": "ClusterFsxOpenZfsConfig", "type": "structure"},
],
"type": "structure",
},
Expand Down Expand Up @@ -1970,13 +1989,27 @@
},
"ClusterOnDemandOptions": {"members": [], "type": "structure"},
"ClusterOrchestrator": {
"members": [{"name": "Eks", "shape": "ClusterOrchestratorEksConfig", "type": "structure"}],
"members": [
{"name": "Eks", "shape": "ClusterOrchestratorEksConfig", "type": "structure"},
{"name": "Slurm", "shape": "ClusterOrchestratorSlurmConfig", "type": "structure"},
],
"type": "structure",
},
"ClusterOrchestratorEksConfig": {
"members": [{"name": "ClusterArn", "shape": "EksClusterArn", "type": "string"}],
"type": "structure",
},
"ClusterOrchestratorSlurmConfig": {
"members": [
{"name": "SlurmConfigStrategy", "shape": "ClusterSlurmConfigStrategy", "type": "string"}
],
"type": "structure",
},
"ClusterPartitionNames": {
"member_shape": "ClusterPartitionName",
"member_type": "string",
"type": "list",
},
"ClusterRestrictedInstanceGroupDetails": {
"members": [
{"name": "CurrentCount", "shape": "ClusterNonNegativeInstanceCount", "type": "integer"},
Expand Down Expand Up @@ -2068,6 +2101,20 @@
"member_type": "structure",
"type": "list",
},
"ClusterSlurmConfig": {
"members": [
{"name": "NodeType", "shape": "ClusterSlurmNodeType", "type": "string"},
{"name": "PartitionNames", "shape": "ClusterPartitionNames", "type": "list"},
],
"type": "structure",
},
"ClusterSlurmConfigDetails": {
"members": [
{"name": "NodeType", "shape": "ClusterSlurmNodeType", "type": "string"},
{"name": "PartitionNames", "shape": "ClusterPartitionNames", "type": "list"},
],
"type": "structure",
},
"ClusterSpotOptions": {"members": [], "type": "structure"},
"ClusterSummaries": {
"member_shape": "ClusterSummary",
Expand Down Expand Up @@ -16574,6 +16621,7 @@
},
{"name": "ClusterRole", "shape": "RoleArn", "type": "string"},
{"name": "AutoScaling", "shape": "ClusterAutoScalingConfig", "type": "structure"},
{"name": "Orchestrator", "shape": "ClusterOrchestrator", "type": "structure"},
],
"type": "structure",
},
Expand Down
4 changes: 3 additions & 1 deletion src/sagemaker_core/main/resources.py
Original file line number Diff line number Diff line change
Expand Up @@ -3314,7 +3314,7 @@ def create(
restricted_instance_groups: The specialized instance groups for training models like Amazon Nova to be created in the SageMaker HyperPod cluster.
vpc_config: Specifies the Amazon Virtual Private Cloud (VPC) that is associated with the Amazon SageMaker HyperPod cluster. You can control access to and from your resources by configuring your VPC. For more information, see Give SageMaker access to resources in your Amazon VPC. When your Amazon VPC and subnets support IPv6, network communications differ based on the cluster orchestration platform: Slurm-orchestrated clusters automatically configure nodes with dual IPv6 and IPv4 addresses, allowing immediate IPv6 network communications. In Amazon EKS-orchestrated clusters, nodes receive dual-stack addressing, but pods can only use IPv6 when the Amazon EKS cluster is explicitly IPv6-enabled. For information about deploying an IPv6 Amazon EKS cluster, see Amazon EKS IPv6 Cluster Deployment. Additional resources for IPv6 configuration: For information about adding IPv6 support to your VPC, see to IPv6 Support for VPC. For information about creating a new IPv6-compatible VPC, see Amazon VPC Creation Guide. To configure SageMaker HyperPod with a custom Amazon VPC, see Custom Amazon VPC Setup for SageMaker HyperPod.
tags: Custom tags for managing the SageMaker HyperPod cluster as an Amazon Web Services resource. You can add tags to your cluster in the same way you add them in other Amazon Web Services services that support tagging. To learn more about tagging Amazon Web Services resources in general, see Tagging Amazon Web Services Resources User Guide.
orchestrator: The type of orchestrator to use for the SageMaker HyperPod cluster. Currently, the only supported value is "eks", which is to use an Amazon Elastic Kubernetes Service cluster as the orchestrator.
orchestrator: The type of orchestrator to use for the SageMaker HyperPod cluster. Currently, supported values are "Eks" and "Slurm", which is to use an Amazon Elastic Kubernetes Service or Slurm cluster as the orchestrator. If you specify the Orchestrator field, you must provide exactly one orchestrator configuration: either Eks or Slurm. Specifying both or providing an empty configuration returns a validation error.
node_recovery: The node recovery mode for the SageMaker HyperPod cluster. When set to Automatic, SageMaker HyperPod will automatically reboot or replace faulty nodes when issues are detected. When set to None, cluster administrators will need to manually manage any faulty cluster instances.
tiered_storage_config: The configuration for managed tier checkpointing on the HyperPod cluster. When enabled, this feature uses a multi-tier storage approach for storing model checkpoints, providing faster checkpoint operations and improved fault tolerance across cluster nodes.
node_provisioning_mode: The mode for provisioning nodes in the cluster. You can specify the following modes: Continuous: Scaling behavior that enables 1) concurrent operation execution within instance groups, 2) continuous retry mechanisms for failed operations, 3) enhanced customer visibility into cluster events through detailed event streams, 4) partial provisioning capabilities. Your clusters and instance groups remain InService while scaling. This mode is only supported for EKS orchestrated clusters.
Expand Down Expand Up @@ -3479,6 +3479,7 @@ def update(
node_provisioning_mode: Optional[str] = Unassigned(),
cluster_role: Optional[str] = Unassigned(),
auto_scaling: Optional[shapes.ClusterAutoScalingConfig] = Unassigned(),
orchestrator: Optional[shapes.ClusterOrchestrator] = Unassigned(),
) -> Optional["Cluster"]:
"""
Update a Cluster resource
Expand Down Expand Up @@ -3517,6 +3518,7 @@ def update(
"NodeProvisioningMode": node_provisioning_mode,
"ClusterRole": cluster_role,
"AutoScaling": auto_scaling,
"Orchestrator": orchestrator,
}
logger.debug(f"Input request: {operation_input_args}")
# serialize the input request
Expand Down
Loading
Loading