From e4134f0991e9c64585edb88828466d94d403bd6c Mon Sep 17 00:00:00 2001 From: John Yang Date: Wed, 15 Jan 2025 14:52:03 -0800 Subject: [PATCH 1/2] Replace `modal.Mount(` with suggested fix --- swebench/harness/modal_eval/run_evaluation_modal.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/swebench/harness/modal_eval/run_evaluation_modal.py b/swebench/harness/modal_eval/run_evaluation_modal.py index bc3f0b68..3c1a91d5 100644 --- a/swebench/harness/modal_eval/run_evaluation_modal.py +++ b/swebench/harness/modal_eval/run_evaluation_modal.py @@ -75,7 +75,7 @@ def _get_sandbox(self, timeout: int | None = None): timeout=timeout, cpu=4, mounts=[ - modal.Mount.from_local_file( + self.image.add_local_file( REMOTE_SANDBOX_ENTRYPOINT_PATH, REMOTE_SANDBOX_ENTRYPOINT_PATH, ) @@ -305,7 +305,7 @@ def get_log_dir(pred: dict, run_id: str, instance_id: str) -> Path: @app.function( image=swebench_image, mounts=[ - modal.Mount.from_local_file( + swebench_image.add_local_file( LOCAL_SANDBOX_ENTRYPOINT_PATH, REMOTE_SANDBOX_ENTRYPOINT_PATH, ) From 9624e73ff114c9c451ad10cf0a0ffe7b476b230e Mon Sep 17 00:00:00 2001 From: John Yang Date: Thu, 16 Jan 2025 17:39:57 +0000 Subject: [PATCH 2/2] Update --- .../modal_eval/run_evaluation_modal.py | 22 +++++++------------ 1 file changed, 8 insertions(+), 14 deletions(-) diff --git a/swebench/harness/modal_eval/run_evaluation_modal.py b/swebench/harness/modal_eval/run_evaluation_modal.py index 3c1a91d5..d99380f9 100644 --- a/swebench/harness/modal_eval/run_evaluation_modal.py +++ b/swebench/harness/modal_eval/run_evaluation_modal.py @@ -71,15 +71,12 @@ def _get_sandbox(self, timeout: int | None = None): timeout = 60 * 30 return modal.Sandbox.create( - image=self.image, + image=self.image.add_local_file( + REMOTE_SANDBOX_ENTRYPOINT_PATH, + REMOTE_SANDBOX_ENTRYPOINT_PATH, + ), timeout=timeout, cpu=4, - mounts=[ - self.image.add_local_file( - REMOTE_SANDBOX_ENTRYPOINT_PATH, - REMOTE_SANDBOX_ENTRYPOINT_PATH, - ) - ], ) async def _read_stream(self, stream: modal.io_streams.StreamReader, output_list: list[str]): @@ -303,13 +300,10 @@ def get_log_dir(pred: dict, run_id: str, instance_id: str) -> Path: return RUN_EVALUATION_LOG_DIR / run_id / model_name_or_path / instance_id @app.function( - image=swebench_image, - mounts=[ - swebench_image.add_local_file( - LOCAL_SANDBOX_ENTRYPOINT_PATH, - REMOTE_SANDBOX_ENTRYPOINT_PATH, - ) - ], + image=swebench_image.add_local_file( + LOCAL_SANDBOX_ENTRYPOINT_PATH, + REMOTE_SANDBOX_ENTRYPOINT_PATH, + ), timeout=120*60, # Much larger than default timeout to account for image build time ) def run_instance_modal(