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

chore: experiment config slots to comply with constraint max slots #10054

Merged
merged 3 commits into from
Oct 15, 2024
+69 −15
Merged

chore: experiment config slots to comply with constraint max slots #10054

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
655f635
fix: experiment config slots to comply with constraint max slots
amandavialva01 Oct 15, 2024
e2bc744
check slots per trial adheres to slots constriant
amandavialva01 Oct 15, 2024
3dce288
fix tests
amandavialva01 Oct 15, 2024
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
13 changes: 9 additions & 4 deletions master/internal/configpolicy/task_config_policy.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,10 +88,15 @@ func CheckExperimentConstraints(

if constraints.ResourceConstraints != nil && constraints.ResourceConstraints.MaxSlots != nil {
// users cannot specify number of slots for an experiment
slotsRequest := *constraints.ResourceConstraints.MaxSlots
if err = checkSlotsConstraint(*constraints.ResourceConstraints.MaxSlots, slotsRequest,
workloadConfig.Resources().MaxSlots()); err != nil {
return err
if workloadConfig.RawResources != nil {
slotsRequest := workloadConfig.RawResources.RawSlotsPerTrial
if slotsRequest != nil {
if err = checkSlotsConstraint(*constraints.ResourceConstraints.MaxSlots,
*slotsRequest,
workloadConfig.Resources().MaxSlots()); err != nil {
return err
}
}
}
}

Expand Down
6 changes: 3 additions & 3 deletions master/internal/configpolicy/utils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,9 +159,9 @@ func checkConstraintConflicts(constraints *model.Constraints, maxSlots, slots, p
if maxSlots != nil && *constraints.ResourceConstraints.MaxSlots != *maxSlots {
return fmt.Errorf("invariant config & constraints are trying to set the max slots")
}
if slots != nil && *constraints.ResourceConstraints.MaxSlots > *slots {
return fmt.Errorf("invariant config & constraints are attempting to set an invalid max slot123: %v vs %v",
*constraints.ResourceConstraints.MaxSlots, *slots)
if slots != nil && *constraints.ResourceConstraints.MaxSlots < *slots {
return fmt.Errorf("invariant config has %v slots per trial. violates constraints max slots of %v",
*slots, *constraints.ResourceConstraints.MaxSlots)
}

return nil
Expand Down
43 changes: 43 additions & 0 deletions master/internal/configpolicy/utils_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import (
"gotest.tools/assert"

"github.com/determined-ai/determined/master/pkg/model"
"github.com/determined-ai/determined/master/pkg/ptrs"
"github.com/determined-ai/determined/master/pkg/schemas/expconf"
)

Expand Down Expand Up @@ -309,3 +310,45 @@ func TestUnmarshalJSONNTSC(t *testing.T) {
})
}
}

func TestCheckConstraintsConflicts(t *testing.T) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice tests!

constraints := &model.Constraints{
ResourceConstraints: &model.ResourceConstraints{
MaxSlots: ptrs.Ptr(10),
},
PriorityLimit: ptrs.Ptr(50),
}
t.Run("max_slots differs to high", func(t *testing.T) {
err := checkConstraintConflicts(constraints, ptrs.Ptr(11), ptrs.Ptr(5), nil)
require.Error(t, err)
})
t.Run("max_slots differs to low", func(t *testing.T) {
err := checkConstraintConflicts(constraints, ptrs.Ptr(9), ptrs.Ptr(5), nil)
require.Error(t, err)
})

t.Run("slots_per_trial too high", func(t *testing.T) {
err := checkConstraintConflicts(constraints, ptrs.Ptr(5), ptrs.Ptr(11), nil)
require.Error(t, err)
})

t.Run("slots_per_trial within range", func(t *testing.T) {
err := checkConstraintConflicts(constraints, ptrs.Ptr(10), ptrs.Ptr(8), nil)
require.NoError(t, err)
})

t.Run("priority differs too high", func(t *testing.T) {
err := checkConstraintConflicts(constraints, nil, nil, ptrs.Ptr(100))
require.Error(t, err)
})

t.Run("priority differs too low", func(t *testing.T) {
err := checkConstraintConflicts(constraints, nil, nil, ptrs.Ptr(10))
require.Error(t, err)
})

t.Run("all comply", func(t *testing.T) {
err := checkConstraintConflicts(constraints, ptrs.Ptr(10), ptrs.Ptr(10), ptrs.Ptr(50))
require.NoError(t, err)
})
}
Loading