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

collapse packables indv gpu validation into one func #983

Merged
merged 2 commits into from
Dec 13, 2021
Merged

collapse packables indv gpu validation into one func #983

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca7dd6f
collapse packables indv gpu validation into one func
bwagner5 Dec 13, 2021
cd7f195
fix errors
bwagner5 Dec 13, 2021
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
38 changes: 12 additions & 26 deletions pkg/controllers/provisioning/binpacking/packable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ package binpacking

import (
"context"
"errors"
"fmt"
"sort"

Expand Down Expand Up @@ -58,9 +57,7 @@ func PackablesFor(ctx context.Context, instanceTypes []cloudprovider.InstanceTyp
packable.validateOperatingSystems(constraints),
packable.validateCapacityTypes(constraints),
packable.validateAWSPodENI(pods),
packable.validateNvidiaGpus(pods),
packable.validateAMDGpus(pods),
packable.validateAWSNeurons(pods),
packable.validateGPUs(pods),
); err != nil {
logging.FromContext(ctx).Debugf("Excluding instance type %s because %v", packable.Name(), err.Error())
continue
Expand Down Expand Up @@ -221,29 +218,18 @@ func (p *Packable) validateCapacityTypes(constraints *v1alpha5.Constraints) erro
return nil
}

func (p *Packable) validateNvidiaGpus(pods []*v1.Pod) error {
if p.requiresResource(pods, resources.NvidiaGPU) && p.InstanceType.NvidiaGPUs().IsZero() {
return errors.New("nvidia gpu is required")
} else if !p.requiresResource(pods, resources.NvidiaGPU) && !p.InstanceType.NvidiaGPUs().IsZero() {
return errors.New("nvidia gpu is not required")
func (p *Packable) validateGPUs(pods []*v1.Pod) error {
gpuResources := map[v1.ResourceName]*resource.Quantity{
resources.NvidiaGPU: p.InstanceType.NvidiaGPUs(),
resources.AMDGPU: p.InstanceType.AMDGPUs(),
resources.AWSNeuron: p.InstanceType.AWSNeurons(),
}
return nil
}

func (p *Packable) validateAMDGpus(pods []*v1.Pod) error {
if p.requiresResource(pods, resources.AMDGPU) && p.InstanceType.AMDGPUs().IsZero() {
return errors.New("amd gpu is required")
} else if !p.requiresResource(pods, resources.AMDGPU) && !p.InstanceType.AMDGPUs().IsZero() {
return errors.New("amd gpu is not required")
}
return nil
}

func (p *Packable) validateAWSNeurons(pods []*v1.Pod) error {
if p.requiresResource(pods, resources.AWSNeuron) && p.InstanceType.AWSNeurons().IsZero() {
return errors.New("aws neuron is required")
} else if !p.requiresResource(pods, resources.AWSNeuron) && !p.InstanceType.AWSNeurons().IsZero() {
return errors.New("aws neuron is not required")
for resourceName, instanceTypeResourceQuantity := range gpuResources {
if p.requiresResource(pods, resourceName) && instanceTypeResourceQuantity.IsZero() {
return fmt.Errorf("%s is required", resourceName)
} else if !p.requiresResource(pods, resourceName) && !instanceTypeResourceQuantity.IsZero() {
return fmt.Errorf("%s is not required", resourceName)
}
}
return nil
}
Expand Down