Skip to content

cleanup #457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Jun 30, 2025
Merged

cleanup #457

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
998f4c4
cleanup
misrasaurabh1 Jun 28, 2025
1fc4614
fix
misrasaurabh1 Jun 28, 2025
7418770
Merge branch 'main' into cleanup-the-right-files
misrasaurabh1 Jun 28, 2025
dc2a19e
fix
misrasaurabh1 Jun 28, 2025
81f912a
don't cleanup concolic test path with each function
misrasaurabh1 Jun 30, 2025
2c0674b
Merge branch 'main' into cleanup-the-right-files
misrasaurabh1 Jun 30, 2025
e4640e9
Merge branch 'main' into cleanup-the-right-files
misrasaurabh1 Jun 30, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions codeflash/optimization/function_optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1457,11 +1457,9 @@ def submit_test_generation_tasks(
]

def cleanup_generated_files(self) -> None:
paths_to_cleanup = [self.test_cfg.concolic_test_root_dir]
paths_to_cleanup = []
for test_file in self.test_files:
paths_to_cleanup.append(test_file.instrumented_behavior_file_path)
paths_to_cleanup.append(test_file.benchmarking_file_path)

cleanup_paths(paths_to_cleanup)
if hasattr(get_run_tmp_file, "tmpdir"):
get_run_tmp_file.tmpdir.cleanup()
56 changes: 32 additions & 24 deletions codeflash/optimization/optimizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
from codeflash.api.aiservice import AiServiceClient, LocalAiServiceClient
from codeflash.cli_cmds.console import console, logger, progress_bar
from codeflash.code_utils import env_utils
from codeflash.code_utils.code_utils import cleanup_paths
from codeflash.code_utils.code_utils import cleanup_paths, get_run_tmp_file
from codeflash.code_utils.env_utils import get_pr_number
from codeflash.either import is_successful
from codeflash.models.models import ValidCode
Expand Down Expand Up @@ -289,31 +289,36 @@ def run(self) -> None:
f"{function_to_optimize.qualified_name}"
)
console.rule()
function_optimizer = None
try:
function_optimizer = self.create_function_optimizer(
function_to_optimize,
function_to_tests=function_to_tests,
function_to_optimize_source_code=validated_original_code[original_module_path].source_code,
function_benchmark_timings=function_benchmark_timings,
total_benchmark_timings=total_benchmark_timings,
original_module_ast=original_module_ast,
original_module_path=original_module_path,
)

function_optimizer = self.create_function_optimizer(
function_to_optimize,
function_to_tests=function_to_tests,
function_to_optimize_source_code=validated_original_code[original_module_path].source_code,
function_benchmark_timings=function_benchmark_timings,
total_benchmark_timings=total_benchmark_timings,
original_module_ast=original_module_ast,
original_module_path=original_module_path,
)

self.current_function_optimizer = (
function_optimizer # needed to clean up from the outside of this function
)
best_optimization = function_optimizer.optimize_function()
if self.functions_checkpoint:
self.functions_checkpoint.add_function_to_checkpoint(
function_to_optimize.qualified_name_with_modules_from_root(self.args.project_root)
self.current_function_optimizer = (
function_optimizer # needed to clean up from the outside of this function
)
if is_successful(best_optimization):
optimizations_found += 1
else:
logger.warning(best_optimization.failure())
console.rule()
continue
best_optimization = function_optimizer.optimize_function()
if self.functions_checkpoint:
self.functions_checkpoint.add_function_to_checkpoint(
function_to_optimize.qualified_name_with_modules_from_root(self.args.project_root)
)
if is_successful(best_optimization):
optimizations_found += 1
else:
logger.warning(best_optimization.failure())
console.rule()
continue
finally:
if function_optimizer is not None:
function_optimizer.cleanup_generated_files()

ph("cli-optimize-run-finished", {"optimizations_found": optimizations_found})
if self.functions_checkpoint:
self.functions_checkpoint.cleanup()
Expand Down Expand Up @@ -351,6 +356,9 @@ def cleanup_temporary_paths(self) -> None:
if self.current_function_optimizer:
self.current_function_optimizer.cleanup_generated_files()

if hasattr(get_run_tmp_file, "tmpdir"):
get_run_tmp_file.tmpdir.cleanup()
del get_run_tmp_file.tmpdir
cleanup_paths([self.test_cfg.concolic_test_root_dir, self.replay_tests_dir])


Expand Down
Loading