From 10c47102d6133b86e4c39df96fd25a91010a9864 Mon Sep 17 00:00:00 2001 From: Dante Niewenhuis Date: Wed, 14 Feb 2024 11:52:32 +0100 Subject: Updated metrics and parquet output (#195) * Updated metrics and parquet output * fixed typos --- .../src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt | 2 +- .../src/main/kotlin/org/opendc/experiments/tf20/core/TFDeviceStats.kt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) (limited to 'opendc-experiments/opendc-experiments-tf20/src') diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt index 23d5001b..a1fc3fba 100644 --- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt +++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/SimTFDevice.kt @@ -168,7 +168,7 @@ public class SimTFDevice( } override fun getDeviceStats(): TFDeviceStats { - return TFDeviceStats(machine.cpuUsage, machine.psu.powerUsage, machine.psu.energyUsage) + return TFDeviceStats(machine.cpuUsage, machine.psu.powerDraw, machine.psu.energyUsage) } override fun close() { diff --git a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/TFDeviceStats.kt b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/TFDeviceStats.kt index 016d2a8b..3fea44da 100644 --- a/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/TFDeviceStats.kt +++ b/opendc-experiments/opendc-experiments-tf20/src/main/kotlin/org/opendc/experiments/tf20/core/TFDeviceStats.kt @@ -26,11 +26,11 @@ package org.opendc.experiments.tf20.core * Statistics about a TensorFlow [TFDevice]. * * @property resourceUsage The resource usage of the device (in MHz). - * @property powerUsage The instantaneous power draw of the device (in W). + * @property powerDraw The instantaneous power draw of the device (in W). * @property energyUsage Cumulative energy usage of the device since boot (in J). */ data class TFDeviceStats( val resourceUsage: Double, - val powerUsage: Double, + val powerDraw: Double, val energyUsage: Double ) -- cgit v1.2.3