Fix gptq exllamav2 check (#152)

huggingface · Mar 13, 2024 · 5bf349d · 5bf349d
1 parent cafe343
commit 5bf349d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/optimum_benchmark/backends/pytorch/backend.py b/optimum_benchmark/backends/pytorch/backend.py
@@ -278,15 +278,13 @@ def is_awq_quantized(self) -> bool:
     def is_exllamav2(self) -> bool:
         return (self.is_gptq_quantized or self.is_awq_quantized) and (
             (
-                hasattr(self.pretrained_config, "quantization_config")
-                and hasattr(self.pretrained_config.quantization_config, "exllama_config")
-                and "exllama_version" in self.pretrained_config.quantization_config.exllama_config
-                and self.pretrained_config.quantization_config.exllama_config["exllama_version"] == 2
+                getattr(self.pretrained_config, "quantization_config", None) is not None
+                and getattr(self.pretrained_config.quantization_config, "exllama_config", None) is not None
+                and self.pretrained_config.quantization_config.exllama_config.get("exllama_version", None) == 2
             )
             or (
-                hasattr(self.quantization_config, "exllama_config")
-                and "exllama_version" in self.quantization_config.exllama_config
-                and self.quantization_config.exllama_config["exllama_version"] == 2
+                self.config.quantization_config.get("exllama_config", None) is not None
+                and self.config.quantization_config.exllama_config.get("exllama_version", None) == 2
             )
         )
 

diff --git a/optimum_benchmark/trackers/energy.py b/optimum_benchmark/trackers/energy.py
@@ -56,13 +56,13 @@ def __sub__(self, other: "Energy") -> "Energy":
         """Enables subtraction of two Energy instances using the '-' operator."""
         if self.unit != other.unit:
             raise ValueError("Energy units must match to perform subtraction")
-        
+
         return Energy(
             cpu=self.cpu - other.cpu,
             gpu=self.gpu - other.gpu,
             ram=self.ram - other.ram,
             total=self.total - other.total,
-            unit=self.unit
+            unit=self.unit,
         )