Merge branch 'function_discovery_bug' into context-import-bug

Author: alvin-r

codeflash/benchmarking/trace_benchmarks.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import os
 import re
 import subprocess
 from pathlib import Path
@@ -9,6 +10,11 @@
 
 
 def trace_benchmarks_pytest(benchmarks_root: Path, tests_root:Path, project_root: Path, trace_file: Path, timeout:int = 300) -> None:
+    benchmark_env = os.environ.copy()
+    if "PYTHONPATH" not in benchmark_env:
+        benchmark_env["PYTHONPATH"] = str(project_root)
+    else:
+        benchmark_env["PYTHONPATH"] += os.pathsep + str(project_root)
     result = subprocess.run(
         [
             SAFE_SYS_EXECUTABLE,
@@ -21,7 +27,7 @@ def trace_benchmarks_pytest(benchmarks_root: Path, tests_root:Path, project_root
         check=False,
         capture_output=True,
         text=True,
-        env={"PYTHONPATH": str(project_root)},
+        env=benchmark_env,
         timeout=timeout,
     )
     if result.returncode != 0:

codeflash/cli_cmds/cli.py

@@ -167,6 +167,7 @@ def process_pyproject_config(args: Namespace) -> Namespace:
     # in this case, the ".." becomes outside project scope, causing issues with un-importable paths
     args.project_root = project_root_from_module_root(args.module_root, pyproject_file_path)
     args.tests_root = Path(args.tests_root).resolve()
+    args.benchmarks_root = Path(args.benchmarks_root).resolve()
     args.test_project_root = project_root_from_module_root(args.tests_root, pyproject_file_path)
     return handle_optimize_all_arg_parsing(args)
 

codeflash/discovery/functions_to_optimize.py

@@ -201,11 +201,13 @@ def get_functions_to_optimize(
             functions, test_cfg.tests_root, ignore_paths, project_root, module_root
         )
         logger.info(f"Found {functions_count} function{'s' if functions_count > 1 else ''} to optimize")
+        logger.info(f"{filtered_modified_functions}")
         return filtered_modified_functions, functions_count
 
 
 def get_functions_within_git_diff() -> dict[str, list[FunctionToOptimize]]:
     modified_lines: dict[str, list[int]] = get_git_diff(uncommitted_changes=False)
+    logger.info(f"modified lines: {modified_lines}")
     modified_functions: dict[str, list[FunctionToOptimize]] = {}
     for path_str in modified_lines:
         path = Path(path_str)
@@ -299,7 +301,7 @@ def get_all_replay_test_functions(
                     if valid_function.qualified_name == function_name
                 ]
             )
-        if len(filtered_list):
+        if filtered_list:
             filtered_valid_functions[file_path] = filtered_list
 
     return filtered_valid_functions

codeflash/optimization/optimizer.py

@@ -2,9 +2,9 @@
 
 import ast
 import os
-import time
 import shutil
 import tempfile
+import time
 from collections import defaultdict
 from pathlib import Path
 from typing import TYPE_CHECKING
@@ -83,7 +83,7 @@ def run(self) -> None:
         function_optimizer = None
         file_to_funcs_to_optimize: dict[Path, list[FunctionToOptimize]]
         num_optimizable_functions: int
-
+        logger.info(self.args)
         # discover functions
         (file_to_funcs_to_optimize, num_optimizable_functions) = get_functions_to_optimize(
             optimize_all=self.args.all,
@@ -97,7 +97,7 @@ def run(self) -> None:
         )
         function_benchmark_timings: dict[str, dict[BenchmarkKey, int]] = {}
         total_benchmark_timings: dict[BenchmarkKey, int] = {}
-        if self.args.benchmark:
+        if self.args.benchmark and num_optimizable_functions > 0:
             with progress_bar(
                     f"Running benchmarks in {self.args.benchmarks_root}",
                     transient=True,