diff --git a/genai-perf/genai_perf/record/types/energy_consumption_avg.py b/genai-perf/genai_perf/record/types/energy_consumption_avg.py new file mode 100644 index 00000000..d1218340 --- /dev/null +++ b/genai-perf/genai_perf/record/types/energy_consumption_avg.py @@ -0,0 +1,33 @@ +# Copyright 2024, NVIDIA CORPORATION & AFFILIATES. All rights reserved. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +from functools import total_ordering + +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase + + +@total_ordering +class GpuEnergyConsumptionAvg(GPUEnergyConsumptionBase): + """ + A record for avg GPU Energy Consumption metric + """ + + tag = GPUEnergyConsumptionBase.base_tag + "_avg" + + def __init__(self, value, device_uuid=None, timestamp=0): + super().__init__(value, device_uuid, timestamp) + + @classmethod + def header(cls, aggregation_tag=False) -> str: + return "Avg. GPU Energy Consumption (MJ)" diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_base.py b/genai-perf/genai_perf/record/types/energy_consumption_base.py similarity index 100% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_base.py rename to genai-perf/genai_perf/record/types/energy_consumption_base.py diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_max.py b/genai-perf/genai_perf/record/types/energy_consumption_max.py similarity index 92% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_max.py rename to genai-perf/genai_perf/record/types/energy_consumption_max.py index e9dd08df..1af20300 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_max.py +++ b/genai-perf/genai_perf/record/types/energy_consumption_max.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_min.py b/genai-perf/genai_perf/record/types/energy_consumption_min.py similarity index 92% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_min.py rename to genai-perf/genai_perf/record/types/energy_consumption_min.py index e8879e49..f0d261a5 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_min.py +++ b/genai-perf/genai_perf/record/types/energy_consumption_min.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p25.py b/genai-perf/genai_perf/record/types/energy_consumption_p25.py similarity index 92% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_p25.py rename to genai-perf/genai_perf/record/types/energy_consumption_p25.py index 9fd5447a..535d30df 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p25.py +++ b/genai-perf/genai_perf/record/types/energy_consumption_p25.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p50.py b/genai-perf/genai_perf/record/types/energy_consumption_p50.py similarity index 92% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_p50.py rename to genai-perf/genai_perf/record/types/energy_consumption_p50.py index 1f531b03..d5cf8eac 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p50.py +++ b/genai-perf/genai_perf/record/types/energy_consumption_p50.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p75.py b/genai-perf/genai_perf/record/types/energy_consumption_p75.py similarity index 92% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_p75.py rename to genai-perf/genai_perf/record/types/energy_consumption_p75.py index d00c7b7e..99990ce3 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p75.py +++ b/genai-perf/genai_perf/record/types/energy_consumption_p75.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p90.py b/genai-perf/genai_perf/record/types/energy_consumption_p90.py similarity index 92% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_p90.py rename to genai-perf/genai_perf/record/types/energy_consumption_p90.py index 068b2aad..960faadf 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p90.py +++ b/genai-perf/genai_perf/record/types/energy_consumption_p90.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p95.py b/genai-perf/genai_perf/record/types/energy_consumption_p95.py similarity index 92% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_p95.py rename to genai-perf/genai_perf/record/types/energy_consumption_p95.py index 8be6def4..ea45c4e2 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p95.py +++ b/genai-perf/genai_perf/record/types/energy_consumption_p95.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p99.py b/genai-perf/genai_perf/record/types/energy_consumption_p99.py similarity index 92% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_p99.py rename to genai-perf/genai_perf/record/types/energy_consumption_p99.py index 9bcaeb7a..3b686d51 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_p99.py +++ b/genai-perf/genai_perf/record/types/energy_consumption_p99.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_std.py b/genai-perf/genai_perf/record/types/energy_consumption_std.py similarity index 92% rename from genai-perf/genai_perf/record/types/gpu_energy_consumption_std.py rename to genai-perf/genai_perf/record/types/energy_consumption_std.py index 92cdbe16..f4821c50 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_std.py +++ b/genai-perf/genai_perf/record/types/energy_consumption_std.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_energy_consumption_avg.py b/genai-perf/genai_perf/record/types/gpu_energy_consumption_avg.py index 298c0775..d1218340 100644 --- a/genai-perf/genai_perf/record/types/gpu_energy_consumption_avg.py +++ b/genai-perf/genai_perf/record/types/gpu_energy_consumption_avg.py @@ -14,7 +14,7 @@ from functools import total_ordering -from genai_perf.record.types.gpu_energy_consumption_base import GPUEnergyConsumptionBase +from genai_perf.record.types.energy_consumption_base import GPUEnergyConsumptionBase @total_ordering diff --git a/genai-perf/genai_perf/record/types/gpu_total_memory_avg.py b/genai-perf/genai_perf/record/types/total_gpu_memory_avg.py similarity index 90% rename from genai-perf/genai_perf/record/types/gpu_total_memory_avg.py rename to genai-perf/genai_perf/record/types/total_gpu_memory_avg.py index b7a37671..cfb5f6c2 100644 --- a/genai-perf/genai_perf/record/types/gpu_total_memory_avg.py +++ b/genai-perf/genai_perf/record/types/total_gpu_memory_avg.py @@ -14,11 +14,11 @@ from functools import total_ordering -from genai_perf.record.types.gpu_total_memory_base import GPUTotalMemoryBase +from genai_perf.record.types.total_gpu_memory_base import GPUTotalMemoryBase @total_ordering -class GpuTotalMemoryAvg(GPUTotalMemoryBase): +class GPUTotalMemoryAvg(GPUTotalMemoryBase): """ A record for avg GPU Total Memory metric """ diff --git a/genai-perf/genai_perf/record/types/gpu_total_memory_base.py b/genai-perf/genai_perf/record/types/total_gpu_memory_base.py similarity index 100% rename from genai-perf/genai_perf/record/types/gpu_total_memory_base.py rename to genai-perf/genai_perf/record/types/total_gpu_memory_base.py