Add s (CPU) & m+t4 (GPU) generic machine types (#525)

Co-authored-by: Casper da Costa-Luis <[email protected]>

Author: 0x2b3bfa0

docs/guides/generic-machine-types.md

@@ -7,17 +7,20 @@ subcategory: Development
 
 The table below is a more detailed version of the common choices summarised in [Task Machine Types](https://registry.terraform.io/providers/iterative/iterative/latest/docs/resources/task#machine-type).
 
-| Type      | [`aws`]       | [`az`]              | [`gcp`]                                         | [`k8s`]                                                |
-| :-------- | :------------ | :------------------ | :---------------------------------------------- | :----------------------------------------------------- |
-| `m`       | `m5.2xlarge`  | `Standard_F8s_v2`   | `e2-custom-8-32768`                             | `cpu: 8`<br>`memory: 32G`                              |
-| `l`       | `m5.8xlarge`  | `Standard_F32s_v2`  | `e2-custom-32-131072`                           | `cpu: 32`<br>`memory: 128G`                            |
-| `xl`      | `m5.16xlarge` | `Standard_F64s_v2`  | `n2-custom-64-262144`                           | `cpu: 64`<br>`memory: 256G`                            |
-| `m+k80`   | `p2.xlarge`   | `Standard_NC6`      | `custom-8-53248`<br>1 `nvidia-tesla-k80`        | `cpu: 4`<br>`memory: 64G`<br>1 `nvidia-tesla-k80`      |
-| `l+k80`   | `p2.8xlarge`  | `Standard_NC12`     | `custom-32-131072`<br>4 `nvidia-tesla-k80`      | `cpu: 32`<br>`memory: 512G`<br>8 `nvidia-tesla-k80`    |
-| `xl+k80`  | `p2.16xlarge` | `Standard_NC24`     | `custom-64-212992-ext`<br>8 `nvidia-tesla-k80`  | `cpu: 64`<br>`memory: 768G`<br>16 × `nvidia-tesla-k80` |
-| `m+v100`  | `p3.xlarge`   | `Standard_NC6s_v3`  | `custom-8-65536-ext`<br>1 `nvidia-tesla-v100`   | `cpu: 8`<br>`memory: 64G`<br>1 `nvidia-tesla-v100`     |
-| `l+v100`  | `p3.8xlarge`  | `Standard_NC12s_v3` | `custom-32-262144-ext`<br>4 `nvidia-tesla-v100` | `cpu: 32`<br>`memory: 256G`<br>4 `nvidia-tesla-v100`   |
-| `xl+v100` | `p3.16xlarge` | `Standard_NC24s_v3` | `custom-64-524288-ext`<br>8 `nvidia-tesla-v100` | `cpu: 64`<br>`memory: 512G`<br>8 `nvidia-tesla-v100`   |
+| Type      | [`aws`]       | [`az`]                 | [`gcp`]                                         | [`k8s`]                                              |
+| :-------- | :------------ | :--------------------- | :---------------------------------------------- | :--------------------------------------------------- |
+| `s`       | `t2.micro`    | `Standard_B1s`         | `g1-small`                                      | `cpu: 1`<br>`memory: 1G`                             |
+| `m`       | `m5.2xlarge`  | `Standard_F8s_v2`      | `e2-custom-8-32768`                             | `cpu: 8`<br>`memory: 32G`                            |
+| `l`       | `m5.8xlarge`  | `Standard_F32s_v2`     | `e2-custom-32-131072`                           | `cpu: 32`<br>`memory: 128G`                          |
+| `xl`      | `m5.16xlarge` | `Standard_F64s_v2`     | `n2-custom-64-262144`                           | `cpu: 64`<br>`memory: 256G`                          |
+| `s+k80`   | -             | -                      | `n1-highmem-2`<br>1 `nvidia-tesla-k80`          | `cpu: 2`<br>`memory: 12G`<br>1 `nvidia-tesla-k80`    |
+| `m+t4`    | `g4dn.xlarge` | `Standard_NC4as_T4_v3` | `n1-standard-4`<br>1 `nvidia-tesla-t4`          | `cpu: 4`<br>`memory: 16G`<br>1 `nvidia-tesla-t4`     |
+| `m+k80`   | `p2.xlarge`   | `Standard_NC6`         | `custom-8-53248`<br>1 `nvidia-tesla-k80`        | `cpu: 4`<br>`memory: 64G`<br>1 `nvidia-tesla-k80`    |
+| `l+k80`   | `p2.8xlarge`  | `Standard_NC12`        | `custom-32-131072`<br>4 `nvidia-tesla-k80`      | `cpu: 32`<br>`memory: 512G`<br>8 `nvidia-tesla-k80`  |
+| `xl+k80`  | `p2.16xlarge` | `Standard_NC24`        | `custom-64-212992-ext`<br>8 `nvidia-tesla-k80`  | `cpu: 64`<br>`memory: 768G`<br>16 `nvidia-tesla-k80` |
+| `m+v100`  | `p3.xlarge`   | `Standard_NC6s_v3`     | `custom-8-65536-ext`<br>1 `nvidia-tesla-v100`   | `cpu: 8`<br>`memory: 64G`<br>1 `nvidia-tesla-v100`   |
+| `l+v100`  | `p3.8xlarge`  | `Standard_NC12s_v3`    | `custom-32-262144-ext`<br>4 `nvidia-tesla-v100` | `cpu: 32`<br>`memory: 256G`<br>4 `nvidia-tesla-v100` |
+| `xl+v100` | `p3.16xlarge` | `Standard_NC24s_v3`    | `custom-64-524288-ext`<br>8 `nvidia-tesla-v100` | `cpu: 64`<br>`memory: 512G`<br>8 `nvidia-tesla-v100` |
 
 [`aws`]: https://aws.amazon.com/ec2/instance-explorer
 [`az`]: https://azure.microsoft.com/en-us/pricing/vm-selector

docs/resources/task.md

@@ -122,9 +122,11 @@ The Iterative Provider offers some common machine types (medium, large, and extr
 
 | Type      | Minimum CPU cores | Minimum RAM | GPU                 |
 | :-------- | ----------------: | ----------: | :------------------ |
+| `s`       |                 1 |        1 GB | -                   |
 | `m`       |                 8 |       16 GB | -                   |
 | `l`       |                32 |       64 GB | -                   |
 | `xl`      |                64 |      128 GB | -                   |
+| `m+t4`    |                 4 |       16 GB | 1 NVIDIA Tesla T4   |
 | `m+k80`   |                 4 |       53 GB | 1 NVIDIA Tesla K80  |
 | `l+k80`   |                12 |      112 GB | 2 NVIDIA Tesla K80  |
 | `xl+k80`  |                24 |      212 GB | 4 NVIDIA Tesla K80  |

task/aws/resources/resource_launch_template.go

@@ -55,9 +55,11 @@ func (l *LaunchTemplate) Create(ctx context.Context) error {
 
 	size := l.Attributes.Size.Machine
 	sizes := map[string]string{
+		"s":       "t2.micro",
 		"m":       "m5.2xlarge",
 		"l":       "m5.8xlarge",
 		"xl":      "m5.16xlarge",
+		"m+t4":    "g4dn.xlarge",
 		"m+k80":   "p2.xlarge",
 		"l+k80":   "p2.8xlarge",
 		"xl+k80":  "p2.16xlarge",

task/az/resources/resource_virtual_machine_scale_set.go

@@ -105,9 +105,11 @@ func (v *VirtualMachineScaleSet) Create(ctx context.Context) error {
 
 	size := v.Attributes.Size.Machine
 	sizes := map[string]string{
+		"s":       "Standard_B1s",
 		"m":       "Standard_F8s_v2",
 		"l":       "Standard_F32s_v2",
 		"xl":      "Standard_F64s_v2",
+		"m+t4":    "Standard_NC4as_T4_v3",
 		"m+k80":   "Standard_NC6",
 		"l+k80":   "Standard_NC12",
 		"xl+k80":  "Standard_NC24",

task/gcp/resources/resource_instance_template.go

@@ -67,9 +67,12 @@ func (i *InstanceTemplate) Create(ctx context.Context) error {
 
 	size := i.Attributes.Size.Machine
 	sizes := map[string]string{
+		"s":       "g1-small",
 		"m":       "e2-custom-8-32768",
 		"l":       "e2-custom-32-131072",
 		"xl":      "n2-custom-64-262144",
+		"s+k80":   "n1-highmem-2+nvidia-tesla-k80*1",
+		"m+t4":    "n1-standard-4+nvidia-tesla-t4*1",
 		"m+k80":   "custom-8-53248+nvidia-tesla-k80*1",
 		"l+k80":   "custom-32-131072+nvidia-tesla-k80*4",
 		"xl+k80":  "custom-64-212992-ext+nvidia-tesla-k80*8",

task/k8s/resources/resource_job.go

@@ -58,9 +58,12 @@ type Job struct {
 func (j *Job) Create(ctx context.Context) error {
 	size := j.Attributes.Task.Size.Machine
 	sizes := map[string]string{
+		"s":       "1-1000",
 		"m":       "8-32000",
 		"l":       "32-128000",
 		"xl":      "64-256000",
+		"s+k80":   "2-12000+nvidia-tesla-k80*1",
+		"m+t4":    "4-16000+nvidia-tesla-t4*1",
 		"m+k80":   "4-64000+nvidia-tesla-k80*1",
 		"l+k80":   "32-512000+nvidia-tesla-k80*8",
 		"xl+k80":  "64-768000+nvidia-tesla-k80*16",