Fixing file names to match tags

triton-inference-server · Nov 26, 2024 · 79389c0 · 79389c0
1 parent 6f4a126
commit 79389c0
Show file tree

Hide file tree

Showing 14 changed files with 45 additions and 12 deletions.
diff --git a/genai-perf/genai_perf/record/types/energy_consumption_avg.py 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/...cord/types/gpu_energy_consumption_base.py → ...f/record/types/energy_consumption_base.py b/...cord/types/gpu_energy_consumption_base.py → ...f/record/types/energy_consumption_base.py
diff --git a/...ecord/types/gpu_energy_consumption_max.py → ...rf/record/types/energy_consumption_max.py b/...ecord/types/gpu_energy_consumption_max.py → ...rf/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/...ecord/types/gpu_energy_consumption_min.py → ...rf/record/types/energy_consumption_min.py b/...ecord/types/gpu_energy_consumption_min.py → ...rf/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/...ecord/types/gpu_energy_consumption_p25.py → ...rf/record/types/energy_consumption_p25.py b/...ecord/types/gpu_energy_consumption_p25.py → ...rf/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/...ecord/types/gpu_energy_consumption_p50.py → ...rf/record/types/energy_consumption_p50.py b/...ecord/types/gpu_energy_consumption_p50.py → ...rf/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/...ecord/types/gpu_energy_consumption_p75.py → ...rf/record/types/energy_consumption_p75.py b/...ecord/types/gpu_energy_consumption_p75.py → ...rf/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/...ecord/types/gpu_energy_consumption_p90.py → ...rf/record/types/energy_consumption_p90.py b/...ecord/types/gpu_energy_consumption_p90.py → ...rf/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/...ecord/types/gpu_energy_consumption_p95.py → ...rf/record/types/energy_consumption_p95.py b/...ecord/types/gpu_energy_consumption_p95.py → ...rf/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/...ecord/types/gpu_energy_consumption_p99.py → ...rf/record/types/energy_consumption_p99.py b/...ecord/types/gpu_energy_consumption_p99.py → ...rf/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/...ecord/types/gpu_energy_consumption_std.py → ...rf/record/types/energy_consumption_std.py b/...ecord/types/gpu_energy_consumption_std.py → ...rf/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
@@ -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/...perf/record/types/gpu_total_memory_avg.py → ...perf/record/types/total_gpu_memory_avg.py b/...perf/record/types/gpu_total_memory_avg.py → ...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/...erf/record/types/gpu_total_memory_base.py → ...erf/record/types/total_gpu_memory_base.py b/...erf/record/types/gpu_total_memory_base.py → ...erf/record/types/total_gpu_memory_base.py