Skip to content

Commit 95be50f

Browse files
authored
Support new Azure CPU series (#2668)
1 parent d484e9f commit 95be50f

5 files changed

Lines changed: 13 additions & 10 deletions

File tree

scripts/packer/azure-image-cuda.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"azure_tenant_id": "{{env `AZURE_TENANT_ID`}}",
77
"azure_subscription_id": "{{env `AZURE_SUBSCRIPTION_ID`}}",
88
"azure_location": "westeurope",
9-
"azure_vm_size": "Standard_DS1_v2",
9+
"azure_vm_size": "Standard_D2s_v6",
1010
"build_prefix": "",
1111
"docker_version": "",
1212
"cuda_drivers_version": "",

scripts/packer/azure-image-grid.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"azure_tenant_id": "{{env `AZURE_TENANT_ID`}}",
77
"azure_subscription_id": "{{env `AZURE_SUBSCRIPTION_ID`}}",
88
"azure_location": "westeurope",
9-
"azure_vm_size": "Standard_DS1_v2",
9+
"azure_vm_size": "Standard_D2s_v6",
1010
"build_prefix": "",
1111
"docker_version": "",
1212
"image_repo": "",

scripts/packer/azure-image.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
"azure_tenant_id": "{{env `AZURE_TENANT_ID`}}",
77
"azure_subscription_id": "{{env `AZURE_SUBSCRIPTION_ID`}}",
88
"azure_location": "westeurope",
9-
"azure_vm_size": "Standard_DS1_v2",
9+
"azure_vm_size": "Standard_D2s_v6",
1010
"build_prefix": "",
1111
"docker_version": "",
1212
"image_repo": "",

scripts/publish_azure_image.sh

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function get_image_definition {
2020
}
2121

2222
# We create a separate image definition for each dstack version since
23-
# gallery-image-version can't be in one-to-one correspondance with dstack versions
23+
# gallery-image-version can't be in one-to-one correspondence with dstack versions
2424
# (it has to follow semver, e.g. no rc)
2525
function create_image_definition() {
2626
echo Creating image definition...
@@ -33,7 +33,8 @@ function create_image_definition() {
3333
--sku $image_definition \
3434
--os-type Linux \
3535
--os-state generalized \
36-
--hyper-v-generation V2
36+
--hyper-v-generation V2 \
37+
--features DiskControllerTypes=SCSI,NVMe
3738
}
3839

3940
function create_image_version() {

src/dstack/_internal/core/backends/azure/compute.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -391,11 +391,8 @@ def get_image_name(self) -> str:
391391

392392

393393
_SUPPORTED_VM_SERIES_PATTERNS = [
394-
# TODO: Support newer CPU series (Dsv6, Esv6).
395-
# They are NVMe-only and require marking the VM image as NVMe.
396-
r"D(\d+)s_v3", # Dsv3-series (general purpose)
397-
r"E(\d+)i?s_v4", # Esv4-series (memory optimized)
398-
r"E(\d+)-(\d+)s_v4", # Esv4-series (constrained vCPU)
394+
r"D(\d+)s_v6", # Dsv6-series (general purpose)
395+
r"E(\d+)i?s_v6", # Esv6-series (memory optimized)
399396
r"F(\d+)s_v2", # Fsv2-series (compute optimized)
400397
r"NC(\d+)s_v3", # NCv3-series [V100 16GB]
401398
r"NC(\d+)as_T4_v3", # NCasT4_v3-series [T4]
@@ -404,6 +401,11 @@ def get_image_name(self) -> str:
404401
r"NC(\d+)ads_A100_v4", # NC A100 v4-series [A100 80GB]
405402
r"ND(\d+)asr_v4", # ND A100 v4-series [8xA100 40GB]
406403
r"ND(\d+)amsr_A100_v4", # NDm A100 v4-series [8xA100 80GB]
404+
# Deprecated series
405+
# TODO: Remove after several releases
406+
r"D(\d+)s_v3", # Dsv3-series (general purpose)
407+
r"E(\d+)i?s_v4", # Esv4-series (memory optimized)
408+
r"E(\d+)-(\d+)s_v4", # Esv4-series (constrained vCPU)
407409
]
408410
_SUPPORTED_VM_SERIES_PATTERN = (
409411
"^Standard_(" + "|".join(f"({s})" for s in _SUPPORTED_VM_SERIES_PATTERNS) + ")$"

0 commit comments

Comments
 (0)