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

Fix #720 - JobAndMark computation + related tweaks #721

Merged
merged 1 commit into from
Jan 15, 2025
Merged

Fix #720 - JobAndMark computation + related tweaks #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 deletions code/generate-table/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,6 +176,10 @@ they must also be added to the table. This is flagged with a comment and is OK,
bit might be better. And so instead of the config / NeedsConfig attribute there may be a more
general flags attribute on fields: flag:"slurm", flag:"config|slurm".

We should check that every alias definition references fields or other aliases, and that there are
no circular aliases, and that no aliases are defined multiple times. For very wide tables such as
jobs there have been bugs where aliases point to nothing.

### DONTDO

While it's tempting to put all the output definitions together in some sort of struct, allowing them
Expand Down
2 changes: 1 addition & 1 deletion code/sonalyze/cmd/jobs/jobs-table.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -484,7 +484,7 @@ var jobsAliases = map[string][]string{
"Gpu": []string{"GpuAvgPct", "GpuPeakPct"},
"RelativeGpu": []string{"RelativeGpuAvgPct", "RelativeGpuPeakPct"},
"OccupiedRelativeGpu": []string{"OccupiedRelativeGpuAvgPct", "OccupiedRelativeGpuPeakPct"},
"GpuMem": []string{"GpuMemAvgPct", "GpuMemPeakPct"},
"GpuMem": []string{"GpuMemAvgGB", "GpuMemPeakGB"},
"RelativeGpuMem": []string{"RelativeGpuMemAvgPct", "RelativeGpuMemPeakPct"},
"OccupiedRelativeGpuMem": []string{"OccupiedRelativeGpuMemAvgPct", "OccupiedRelativeGpuMemPeakPct"},
"default": []string{"std", "cpu", "mem", "gpu", "gpumem", "cmd"},
Expand Down
2 changes: 1 addition & 1 deletion code/sonalyze/cmd/jobs/perform.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ func (jc *JobsCommand) aggregateAndFilterJobs(
needCmd = true
case "host", "Host":
needHost = true
case "jobm", "JobsAndMark":
case "jobm", "JobAndMark":
needJobAndMark = true
case "Submit", "JobName", "State", "Account", "Layout", "Reservation",
"Partition", "RequestedGpus", "DiskReadAvgGB", "DiskWriteAvgGB",
Expand Down
2 changes: 1 addition & 1 deletion code/sonalyze/cmd/jobs/print.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ ALIASES
RelativeGpu RelativeGpuAvgPct,RelativeGpuPeakPct
OccupiedRelativeGpu \
OccupiedRelativeGpuAvgPct,OccupiedRelativeGpuPeakPct
GpuMem GpuMemAvgPct,GpuMemPeakPct
GpuMem GpuMemAvgGB,GpuMemPeakGB
RelativeGpuMem \
RelativeGpuMemAvgPct,RelativeGpuMemPeakPct
OccupiedRelativeGpuMem \
Expand Down
Loading