Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 8 additions & 8 deletions .yarn/releases/yarn-3.7.0.cjs
100755 → 100644

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions changes.d/2100.feat.md
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Adding CPU time and Max RSS to Analysis Tools
Binary file added public/img/redline.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
120 changes: 75 additions & 45 deletions src/components/cylc/analysis/AnalysisTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,11 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.

<script>
import { upperFirst } from 'lodash'
import { formatDuration } from '@/utils/tasks'
import {
formatDuration,
formatHeader,
formatChartLabels,
} from '@/utils/tasks'
import {
initialOptions,
updateInitialOptionsEvent,
Expand Down Expand Up @@ -128,50 +132,76 @@ export default {
computed: {
shownHeaders () {
const times = upperFirst(this.timingOption)
const timingHeaders = [
{
title: `Mean T-${times}`,
key: `mean${times}Time`,
formatter: formatDuration,
allowZeros: false
},
{
title: `Std Dev T-${times}`,
key: `stdDev${times}Time`,
formatter: formatDuration,
allowZeros: true
},
{
title: `Min T-${times}`,
key: `min${times}Time`,
formatter: formatDuration,
allowZeros: false
},
{
title: `Q1 T-${times}`,
key: `${times.toLowerCase()}Quartiles.0`,
formatter: formatDuration,
allowZeros: false
},
{
title: `Median T-${times}`,
key: `${times.toLowerCase()}Quartiles.1`,
formatter: formatDuration,
allowZeros: false
},
{
title: `Q3 T-${times}`,
key: `${times.toLowerCase()}Quartiles.2`,
formatter: formatDuration,
allowZeros: false
},
{
title: `Max T-${times}`,
key: `max${times}Time`,
const timingHeaders = []
// Check if there are any stats to show
const stats = this.tasks.some((task) => task.count > 1)
if (stats) {
timingHeaders.push(
{
title: `Mean ${formatChartLabels(times)}`,
key: `${formatHeader('mean', times)}`,
formatter: formatDuration,
allowZeros: true,
timingOption: this.timingOption
},
{
title: `Min ${formatChartLabels(times)}`,
key: `${formatHeader('min', times)}`,
formatter: formatDuration,
allowZeros: true,
timingOption: this.timingOption
},
{
title: `Q1 ${formatChartLabels(times)}`,
key: `${formatHeader('quartiles', times)}Quartiles.0`,
formatter: formatDuration,
allowZeros: true,
timingOption: this.timingOption
},
{
title: `Median ${formatChartLabels(times)}`,
key: `${formatHeader('quartiles', times)}Quartiles.1`,
formatter: formatDuration,
allowZeros: true,
timingOption: this.timingOption
},
{
title: `Q3 ${formatChartLabels(times)}`,
key: `${formatHeader('quartiles', times)}Quartiles.2`,
formatter: formatDuration,
allowZeros: true,
timingOption: this.timingOption
},
{
title: `Max ${formatChartLabels(times)}`,
key: `${formatHeader('max', times)}`,
formatter: formatDuration,
allowZeros: true,
timingOption: this.timingOption
}
)
} else {
timingHeaders.push(
{
title: `${formatChartLabels(times)}`,
key: `${formatHeader('mean', times)}`,
formatter: formatDuration,
allowZeros: true,
timingOption: this.timingOption
}
)
}

// Don't show std dev for cpuTime or maxRss
if (this.timingOption !== 'cpuTime' && this.timingOption !== 'maxRss' && stats) {
timingHeaders.push({
title: `Std Dev ${times}`,
key: `${formatHeader('stdDev', times)}`,
formatter: formatDuration,
allowZeros: false
}
]
allowZeros: true,
timingOption: this.timingOption
})
}
return this.headers.concat(timingHeaders)
}
},
Expand All @@ -186,7 +216,7 @@ export default {
value = value[index]
}
if (header.formatter) {
return header.formatter(value, header)
return header.formatter(value, header.allowZeros, this.timingOption)
}
return value
}
Expand Down
Loading