diff --git a/pyproject.toml b/pyproject.toml index 221c02c..a860762 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -133,6 +133,7 @@ lint.ignore = [ "N802", "N812", "PD901", + "PLR0911", "PLR0912", "PLR0913", "PLR0915", diff --git a/tools/compare_results.py b/tools/compare_results.py index f4e1f25..a28ad65 100755 --- a/tools/compare_results.py +++ b/tools/compare_results.py @@ -120,58 +120,6 @@ def get_system_summary(results_dir: Path) -> str: "", ] - # Extract GPU information from each library's results - gpu_info = {} - for file_path in result_files: - with file_path.open() as f: - lib_data = json.load(f) - - library = file_path.stem.replace("_results", "") - lib_metadata = lib_data.get("metadata", {}) - - # Check for GPU info in thread_settings - if "thread_settings" in lib_metadata: - thread_settings = lib_metadata["thread_settings"] - - # For GPU-based libraries (Kornia, TorchVision) - if "pytorch" in thread_settings: - pytorch_settings = thread_settings["pytorch"] - - # Handle string representation - if isinstance(pytorch_settings, str): - import re - - # Check if GPU is available - if "gpu_available': True" in pytorch_settings: - # Try to extract GPU name - gpu_name_match = re.search(r"gpu_name': '([^']+)'", pytorch_settings) - if gpu_name_match: - gpu_info[library] = gpu_name_match.group(1) - else: - # Try to extract GPU device - gpu_device_match = re.search(r"gpu_device': ([^,}]+)", pytorch_settings) - if gpu_device_match: - gpu_info[library] = f"GPU {gpu_device_match.group(1)}" - else: - gpu_info[library] = "GPU (details unknown)" - # Handle dictionary representation - elif isinstance(pytorch_settings, dict): - if pytorch_settings.get("gpu_available", False): - gpu_name = pytorch_settings.get("gpu_name") - if gpu_name: - gpu_info[library] = gpu_name - else: - gpu_device = pytorch_settings.get("gpu_device", "Unknown") - gpu_info[library] = f"GPU {gpu_device}" - - # Add GPU information if available - if gpu_info: - summary.append("### GPU Information") - summary.append("") - for library, gpu in sorted(gpu_info.items()): - summary.append(f"- {library.capitalize()}: {gpu}") - summary.append("") - summary.extend( [ "### Benchmark Parameters", diff --git a/tools/compare_video_results.py b/tools/compare_video_results.py index 5667428..9f2da9d 100755 --- a/tools/compare_video_results.py +++ b/tools/compare_video_results.py @@ -31,10 +31,7 @@ def format_throughput(throughput: float, std: float | None = None, is_max: bool if std is not None: formatted = f"{formatted} ± {std:.2f}" - if is_max: - return f"**{formatted}**" - - return formatted + return f"**{formatted}**" if is_max else formatted def format_time(time_ms: float, std: float | None = None) -> str: @@ -42,6 +39,41 @@ def format_time(time_ms: float, std: float | None = None) -> str: return f"{time_ms:.2f} ± {std:.2f}" if std is not None else f"{time_ms:.2f}" +def extract_gpu_info(thread_settings: dict[str, Any]) -> str: + """Extract GPU information from thread settings.""" + if "pytorch" not in thread_settings: + return "Unknown hardware" + + pytorch_settings = thread_settings["pytorch"] + + # Handle the case where pytorch settings are stored as a string + if isinstance(pytorch_settings, str): + # Try to extract GPU info from the string + if "gpu_available': True" in pytorch_settings: + # Extract GPU name if available + if "gpu_name':" in pytorch_settings: + import re + + gpu_name_match = re.search(r"gpu_name': '([^']+)'", pytorch_settings) + if gpu_name_match: + return gpu_name_match.group(1) + # Extract GPU device if name not available + gpu_device_match = re.search(r"gpu_device': ([^,}]+)", pytorch_settings) + if gpu_device_match: + return f"GPU {gpu_device_match.group(1)}" + return "GPU (details unknown)" + return "GPU (details unknown)" + return "CPU (GPU not available)" + # Handle the case where pytorch settings are a dictionary + if pytorch_settings.get("gpu_available", False): + gpu_name = pytorch_settings.get("gpu_name", None) + if gpu_name: + return gpu_name + gpu_device = pytorch_settings.get("gpu_device", "Unknown") + return f"GPU {gpu_device}" + return "CPU (GPU not available)" + + def get_hardware_info(results: dict[str, dict[str, Any]]) -> dict[str, str]: """Extract hardware information from metadata.""" hardware_info = {} @@ -59,41 +91,7 @@ def get_hardware_info(results: dict[str, dict[str, Any]]) -> dict[str, str]: # For GPU-based libraries (Kornia, TorchVision, etc.) elif "pytorch" in thread_settings: - # Handle the case where pytorch settings are stored as a string - pytorch_settings = thread_settings["pytorch"] - if isinstance(pytorch_settings, str): - # Try to extract GPU info from the string - if "gpu_available': True" in pytorch_settings: - # Extract GPU name if available - if "gpu_name':" in pytorch_settings: - import re - - gpu_name_match = re.search(r"gpu_name': '([^']+)'", pytorch_settings) - if gpu_name_match: - gpu_name = gpu_name_match.group(1) - hardware_info[library] = gpu_name - else: - # Extract GPU device if name not available - gpu_device_match = re.search(r"gpu_device': ([^,}]+)", pytorch_settings) - if gpu_device_match: - gpu_device = gpu_device_match.group(1) - hardware_info[library] = f"GPU {gpu_device}" - else: - hardware_info[library] = "GPU (details unknown)" - else: - hardware_info[library] = "GPU (details unknown)" - else: - hardware_info[library] = "CPU (GPU not available)" - # Handle the case where pytorch settings are a dictionary - elif pytorch_settings.get("gpu_available", False): - gpu_name = pytorch_settings.get("gpu_name", None) - if gpu_name: - hardware_info[library] = gpu_name - else: - gpu_device = pytorch_settings.get("gpu_device", "Unknown") - hardware_info[library] = f"GPU {gpu_device}" - else: - hardware_info[library] = "CPU (GPU not available)" + hardware_info[library] = extract_gpu_info(thread_settings) else: hardware_info[library] = "Unknown hardware" # Default hardware info if thread_settings not found diff --git a/tools/generate_speedup_plots.py b/tools/generate_speedup_plots.py index fe0b346..8493d3c 100755 --- a/tools/generate_speedup_plots.py +++ b/tools/generate_speedup_plots.py @@ -347,9 +347,9 @@ def main() -> None: "std_speedup": speedups[args.reference_library].std() if not speedups.empty else 0, "faster_transforms": len(speedups[speedups[args.reference_library] > 1.0]) if not speedups.empty else 0, "max_speedup": speedups[args.reference_library].max() if not speedups.empty else 0, - "max_speedup_transform": speedups[args.reference_library].idxmax() if not speedups.empty else "N/A", + "max_speedup_transform": "N/A" if speedups.empty else speedups[args.reference_library].idxmax(), "min_speedup": speedups[args.reference_library].min() if not speedups.empty else 0, - "min_speedup_transform": speedups[args.reference_library].idxmin() if not speedups.empty else "N/A", + "min_speedup_transform": "N/A" if speedups.empty else speedups[args.reference_library].idxmin(), } # Log summary