Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add NVIDIA NGC image aliases #384

Merged
merged 3 commits into from
Feb 22, 2022
Merged

Add NVIDIA NGC image aliases #384

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
27f4ee8
Add NVIDIA NGC image alias
0x2b3bfa0 Feb 7, 2022
8b60825
Apply suggestions from code review
0x2b3bfa0 Feb 7, 2022
9526cae
Restyled by gofmt
restyled-commits Feb 7, 2022
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
1 change: 1 addition & 0 deletions task/aws/resources/data_source_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ func (i *Image) Read(ctx context.Context) error {
image := i.Identifier
images := map[string]string{
"ubuntu": "ubuntu@099720109477:x86_64:*ubuntu/images/hvm-ssd/ubuntu-focal-20.04*",
"nvidia": "ubuntu@679593333241:x86_64:NVIDIA Deep Learning AMI v21.02.2-*",
DavidGOrtega marked this conversation as resolved.
Show resolved Hide resolved
}
if val, ok := images[image]; ok {
image = val
Expand Down
12 changes: 11 additions & 1 deletion task/az/resources/resource_virtual_machine_scale_set.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,12 +82,13 @@ func (v *VirtualMachineScaleSet) Create(ctx context.Context) error {
image := v.Attributes.Environment.Image
images := map[string]string{
"ubuntu": "ubuntu@Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest",
"nvidia": "ubuntu@nvidia:ngc_base_image_version_b:gen2_21-11-0:latest#plan",
}
if val, ok := images[image]; ok {
image = val
}

imageParts := regexp.MustCompile(`^([^@]+)@([^:]+):([^:]+):([^:]+):([^:]+)$`).FindStringSubmatch(image)
imageParts := regexp.MustCompile(`^([^@]+)@([^:]+):([^:]+):([^:]+):([^:]+)(:?(#plan)?)$`).FindStringSubmatch(image)
if imageParts == nil {
return errors.New("invalid machine image format: use publisher:offer:sku:version")
}
Expand All @@ -97,6 +98,7 @@ func (v *VirtualMachineScaleSet) Create(ctx context.Context) error {
offer := imageParts[3]
sku := imageParts[4]
version := imageParts[5]
plan := imageParts[6]

size := v.Attributes.Size.Machine
sizes := map[string]string{
Expand Down Expand Up @@ -185,6 +187,14 @@ func (v *VirtualMachineScaleSet) Create(ctx context.Context) error {
},
}

if plan == "#plan" {
settings.Plan = &compute.Plan{
Publisher: to.StringPtr(publisher),
Product: to.StringPtr(offer),
Name: to.StringPtr(sku),
}
}

spot := v.Attributes.Spot
if spot >= 0 {
if spot == 0 {
Expand Down
18 changes: 14 additions & 4 deletions task/gcp/resources/data_source_image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,25 +32,35 @@ func (i *Image) Read(ctx context.Context) error {
image := i.Identifier
images := map[string]string{
"ubuntu": "ubuntu@ubuntu-os-cloud/ubuntu-2004-lts",
"nvidia": "ubuntu@nvidia-ngc-public/nvidia-gpu-cloud-image-20211105",
}
if val, ok := images[image]; ok {
image = val
}

match := regexp.MustCompile(`^([^@]+)@([^/]+)/([^/]+)$`).FindStringSubmatch(image)
if match == nil {
return common.NotFoundError
return errors.New("wrong image name")
}

i.Attributes.SSHUser = match[1]
project := match[2]
family := match[3]
imageOrFamily := match[3]

resource, err := i.Client.Services.Compute.Images.GetFromFamily(project, family).Do()
resource, err := i.Client.Services.Compute.Images.Get(project, imageOrFamily).Do()
if err != nil {
var e *googleapi.Error
if errors.As(err, &e) && e.Code == 404 {
return common.NotFoundError
resource, err := i.Client.Services.Compute.Images.GetFromFamily(project, imageOrFamily).Do()
if err != nil {
var e *googleapi.Error
if errors.As(err, &e) && e.Code == 404 {
return common.NotFoundError
}
return err
}
i.Resource = resource
return nil
}
return err
}
Expand Down
12 changes: 10 additions & 2 deletions task/k8s/resources/resource_job.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,19 @@ func (j *Job) Create(ctx context.Context) error {
"l+v100": "32-256000+nvidia-tesla-v100*4",
"xl+v100": "64-512000+nvidia-tesla-v100*8",
}

if val, ok := sizes[size]; ok {
size = val
}

image := j.Attributes.Task.Environment.Image
images := map[string]string{
"ubuntu": "ubuntu",
"nvidia": "nvidia/cuda",
}
if val, ok := images[image]; ok {
image = val
}

match := regexp.MustCompile(`^(\d+)-(\d+)(?:\+([^*]+)\*([1-9]\d*))?$`).FindStringSubmatch(size)
if match == nil {
return common.NotFoundError
Expand Down Expand Up @@ -206,7 +214,7 @@ func (j *Job) Create(ctx context.Context) error {
Containers: []kubernetes_core.Container{
{
Name: j.Identifier,
Image: j.Attributes.Task.Environment.Image,
Image: image,
Resources: kubernetes_core.ResourceRequirements{
Limits: jobLimits,
Requests: kubernetes_core.ResourceList{
Expand Down