From 5af3458b8f8a36afd0aadfa67e79b782fe81a265 Mon Sep 17 00:00:00 2001 From: Soumava Bera Date: Fri, 31 Jan 2025 13:41:04 -0500 Subject: [PATCH] merge from main --- .../aws-cpp-sdk-ec2/include/aws/ec2/EC2Client.h | 17 +++++++++++++---- .../InstanceBlockDeviceMappingSpecification.h | 2 +- .../aws/ec2/model/InstanceRequirements.h | 7 ++++--- .../aws/ec2/model/InstanceRequirementsRequest.h | 9 +++++---- .../smithy/api-descriptions/ec2.json | 12 ++++++------ 5 files changed, 29 insertions(+), 18 deletions(-) diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/EC2Client.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/EC2Client.h index 0ab437f5813..8b6e955be39 100644 --- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/EC2Client.h +++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/EC2Client.h @@ -1527,8 +1527,11 @@ namespace EC2 *

If a future-dated Capacity Reservation enters the - * delayed state, the commitment duration is waived, and you can + * duration.

You can't modify or cancel a Capacity Block. + * For more information, see Capacity + * Blocks for ML.

If a future-dated Capacity Reservation enters + * the delayed state, the commitment duration is waived, and you can * cancel it as soon as it enters the active state.

Instances * running in the reserved capacity continue running until you stop them. Stopped * instances that target the Capacity Reservation can no longer launch. Modify @@ -7413,7 +7416,12 @@ namespace EC2 /** *

Describes Capacity Block offerings available for purchase in the Amazon Web * Services Region that you're currently using. With Capacity Blocks, you purchase - * a specific instance type for a period of time.

See Also:

To search for an available + * Capacity Block offering, you specify a reservation duration and instance count. + * You must select one of the following options.

See Also:

AWS * API Reference

*/ @@ -8794,7 +8802,8 @@ namespace EC2 * p4d.24xlarge | p4de.24xlarge | * p5.48xlarge | p5e.48xlarge | * p5en.48xlarge

  • trn1.2xlarge | - * trn1.32xlarge | trn1n.32xlarge

    • + * trn1.32xlarge | trn1n.32xlarge | + * trn2.48xlarge | trn2u.48xlarge

    *

    For more information, see Amazon * EC2 instance topology in the Amazon EC2 User Guide.

    See diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceBlockDeviceMappingSpecification.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceBlockDeviceMappingSpecification.h index 57f605e77d1..6889873407b 100644 --- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceBlockDeviceMappingSpecification.h +++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceBlockDeviceMappingSpecification.h @@ -84,7 +84,7 @@ namespace Model ///@{ /** - *

    suppress the specified device included in the block device mapping.

    + *

    Suppresses the specified device included in the block device mapping.

    */ inline const Aws::String& GetNoDevice() const{ return m_noDevice; } inline bool NoDeviceHasBeenSet() const { return m_noDeviceHasBeenSet; } diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirements.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirements.h index c9f1d88cbf9..445b0b89684 100644 --- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirements.h +++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirements.h @@ -386,9 +386,10 @@ namespace Model ///@{ /** *

    The accelerator types that must be on the instance type.

    Default: Any accelerator type

    + * instance types with FPGA accelerators, specify fpga.

  • + *

    For instance types with GPU accelerators, specify gpu.

    • + *

  • For instance types with Inference accelerators, specify + * inference.

    • Default: Any accelerator type

    */ inline const Aws::Vector& GetAcceleratorTypes() const{ return m_acceleratorTypes; } inline bool AcceleratorTypesHasBeenSet() const { return m_acceleratorTypesHasBeenSet; } diff --git a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirementsRequest.h b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirementsRequest.h index daeabb1aa1c..ceb2a0b85c6 100644 --- a/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirementsRequest.h +++ b/generated/src/aws-cpp-sdk-ec2/include/aws/ec2/model/InstanceRequirementsRequest.h @@ -384,10 +384,11 @@ namespace Model ///@{ /** - *

    The accelerator types that must be on the instance type.

    • To - * include instance types with GPU hardware, specify gpu.

      • - *

    • To include instance types with FPGA hardware, specify - * fpga.

    Default: Any accelerator type

    + *

    The accelerator types that must be on the instance type.

    • For + * instance types with FPGA accelerators, specify fpga.

    • + *

      For instance types with GPU accelerators, specify gpu.

      • + *

    • For instance types with Inference accelerators, specify + * inference.

    Default: Any accelerator type

    */ inline const Aws::Vector& GetAcceleratorTypes() const{ return m_acceleratorTypes; } inline bool AcceleratorTypesHasBeenSet() const { return m_acceleratorTypesHasBeenSet; } diff --git a/tools/code-generation/smithy/api-descriptions/ec2.json b/tools/code-generation/smithy/api-descriptions/ec2.json index cab6b869a8f..89ce75363a3 100644 --- a/tools/code-generation/smithy/api-descriptions/ec2.json +++ b/tools/code-generation/smithy/api-descriptions/ec2.json @@ -10254,7 +10254,7 @@ "target": "com.amazonaws.ec2#CancelCapacityReservationResult" }, "traits": { - "smithy.api#documentation": "

    Cancels the specified Capacity Reservation, releases the reserved capacity, and changes \n\t\t\tthe Capacity Reservation's state to cancelled.

    \n

    You can cancel a Capacity Reservation that is in the following states:

    \n
      \n
    • \n

      \n assessing\n

      \n
      • \n
    • \n

      \n active and there is no commitment duration or the commitment \n\t\t\t\t\tduration has elapsed. You can't cancel a future-dated Capacity Reservation during the commitment duration.

      \n
      • \n
    \n

    If a future-dated Capacity Reservation enters the delayed state, the commitment \n\t\t\tduration is waived, and you can cancel it as soon as it enters the active state.

    \n

    Instances running in the reserved capacity continue running until you stop them. Stopped\n\t\t\tinstances that target the Capacity Reservation can no longer launch. Modify these instances to either\n\t\t\ttarget a different Capacity Reservation, launch On-Demand Instance capacity, or run in any open Capacity Reservation\n\t\t\tthat has matching attributes and sufficient capacity.

    " + "smithy.api#documentation": "

    Cancels the specified Capacity Reservation, releases the reserved capacity, and changes \n\t\t\tthe Capacity Reservation's state to cancelled.

    \n

    You can cancel a Capacity Reservation that is in the following states:

    \n
      \n
    • \n

      \n assessing\n

      \n
      • \n
    • \n

      \n active and there is no commitment duration or the commitment \n\t\t\t\t\tduration has elapsed. You can't cancel a future-dated Capacity Reservation during the commitment duration.

      \n
      • \n
    \n \n

    You can't modify or cancel a Capacity Block. For more information, see Capacity Blocks for ML.

    \n     \n

    If a future-dated Capacity Reservation enters the delayed state, the commitment \n\t\t\tduration is waived, and you can cancel it as soon as it enters the active state.

    \n

    Instances running in the reserved capacity continue running until you stop them. Stopped\n\t\t\tinstances that target the Capacity Reservation can no longer launch. Modify these instances to either\n\t\t\ttarget a different Capacity Reservation, launch On-Demand Instance capacity, or run in any open Capacity Reservation\n\t\t\tthat has matching attributes and sufficient capacity.

    " } }, "com.amazonaws.ec2#CancelCapacityReservationFleetError": { @@ -29701,7 +29701,7 @@ "target": "com.amazonaws.ec2#DescribeCapacityBlockOfferingsResult" }, "traits": { - "smithy.api#documentation": "

    Describes Capacity Block offerings available for purchase in the Amazon Web Services Region that you're currently using. With Capacity Blocks, you purchase a\n\t\t\tspecific instance type for a period of time.

    ", + "smithy.api#documentation": "

    Describes Capacity Block offerings available for purchase in the Amazon Web Services Region that you're currently using. With Capacity Blocks, you purchase a\n\t\t\tspecific instance type for a period of time.

    \n

    To search for an available Capacity Block offering, you specify a reservation duration\n and instance count. You must select one of the following options.

    \n
      \n
    • \n

      For reservation durations 1-day increments\n up 14 days and 7-day increments up to 182 days total\n

      \n
      • \n
    • \n

      For instance count 1, 2, 4, 8, 16, 32, or\n 64 instances\n

      \n
      • \n
    ", "smithy.api#paginated": { "inputToken": "NextToken", "outputToken": "NextToken", @@ -34182,7 +34182,7 @@ "target": "com.amazonaws.ec2#DescribeInstanceTopologyResult" }, "traits": { - "smithy.api#documentation": "

    Describes a tree-based hierarchy that represents the physical host placement of your\n EC2 instances within an Availability Zone or Local Zone. You can use this information to\n determine the relative proximity of your EC2 instances within the Amazon Web Services network to\n support your tightly coupled workloads.

    \n

    \n Limitations\n

    \n
      \n
    • \n

      Supported zones

      \n
        \n
      • \n

        Availability Zone

        \n
        • \n
      • \n

        Local Zone

        \n
        • \n
      \n
      • \n
    • \n

      Supported instance types

      \n
        \n
      • \n

        \n hpc6a.48xlarge | hpc6id.32xlarge |\n hpc7a.12xlarge | hpc7a.24xlarge |\n hpc7a.48xlarge | hpc7a.96xlarge |\n hpc7g.4xlarge | hpc7g.8xlarge |\n hpc7g.16xlarge\n

        \n
        • \n
      • \n

        \n p3dn.24xlarge | p4d.24xlarge |\n p4de.24xlarge | p5.48xlarge |\n p5e.48xlarge | p5en.48xlarge\n

        \n
        • \n
      • \n

        \n trn1.2xlarge | trn1.32xlarge |\n trn1n.32xlarge\n

        \n
        • \n
      \n
      • \n
    \n

    For more information, see Amazon EC2 instance\n topology in the Amazon EC2 User Guide.

    ", + "smithy.api#documentation": "

    Describes a tree-based hierarchy that represents the physical host placement of your\n EC2 instances within an Availability Zone or Local Zone. You can use this information to\n determine the relative proximity of your EC2 instances within the Amazon Web Services network to\n support your tightly coupled workloads.

    \n

    \n Limitations\n

    \n
      \n
    • \n

      Supported zones

      \n
        \n
      • \n

        Availability Zone

        \n
        • \n
      • \n

        Local Zone

        \n
        • \n
      \n
      • \n
    • \n

      Supported instance types

      \n
        \n
      • \n

        \n hpc6a.48xlarge | hpc6id.32xlarge |\n hpc7a.12xlarge | hpc7a.24xlarge |\n hpc7a.48xlarge | hpc7a.96xlarge |\n hpc7g.4xlarge | hpc7g.8xlarge |\n hpc7g.16xlarge\n

        \n
        • \n
      • \n

        \n p3dn.24xlarge | p4d.24xlarge |\n p4de.24xlarge | p5.48xlarge |\n p5e.48xlarge | p5en.48xlarge\n

        \n
        • \n
      • \n

        \n trn1.2xlarge | trn1.32xlarge |\n trn1n.32xlarge | trn2.48xlarge |\n trn2u.48xlarge\n

        \n
        • \n
      \n
      • \n
    \n

    For more information, see Amazon EC2 instance\n topology in the Amazon EC2 User Guide.

    ", "smithy.api#paginated": { "inputToken": "NextToken", "outputToken": "NextToken", @@ -62418,7 +62418,7 @@ "target": "com.amazonaws.ec2#String", "traits": { "aws.protocols#ec2QueryName": "NoDevice", - "smithy.api#documentation": "

    suppress the specified device included in the block device mapping.

    ", + "smithy.api#documentation": "

    Suppresses the specified device included in the block device mapping.

    ", "smithy.api#xmlName": "noDevice" } } @@ -64330,7 +64330,7 @@ "target": "com.amazonaws.ec2#AcceleratorTypeSet", "traits": { "aws.protocols#ec2QueryName": "AcceleratorTypeSet", - "smithy.api#documentation": "

    The accelerator types that must be on the instance type.

    \n
      \n
    • \n

      For instance types with GPU accelerators, specify gpu.

      \n
      • \n
    • \n

      For instance types with FPGA accelerators, specify fpga.

      \n
      • \n
    \n

    Default: Any accelerator type

    ", + "smithy.api#documentation": "

    The accelerator types that must be on the instance type.

    \n
      \n
    • \n

      For instance types with FPGA accelerators, specify fpga.

      \n
      • \n
    • \n

      For instance types with GPU accelerators, specify gpu.

      \n
      • \n
    • \n

      For instance types with Inference accelerators, specify inference.

      \n
      • \n
    \n

    Default: Any accelerator type

    ", "smithy.api#xmlName": "acceleratorTypeSet" } }, @@ -64513,7 +64513,7 @@ "AcceleratorTypes": { "target": "com.amazonaws.ec2#AcceleratorTypeSet", "traits": { - "smithy.api#documentation": "

    The accelerator types that must be on the instance type.

    \n
      \n
    • \n

      To include instance types with GPU hardware, specify gpu.

      \n
      • \n
    • \n

      To include instance types with FPGA hardware, specify fpga.

      \n
      • \n
    \n

    Default: Any accelerator type

    ", + "smithy.api#documentation": "

    The accelerator types that must be on the instance type.

    \n
      \n
    • \n

      For instance types with FPGA accelerators, specify fpga.

      \n
      • \n
    • \n

      For instance types with GPU accelerators, specify gpu.

      \n
      • \n
    • \n

      For instance types with Inference accelerators, specify inference.

      \n
      • \n
    \n

    Default: Any accelerator type

    ", "smithy.api#xmlName": "AcceleratorType" } },