fix merge

d4a932e40518ff6c9ebb4f1fe97aaab7ce156660 · 2024-08-29 12:25:24 +0100 · Alex Cheema

Files touched

M exo/download/hf/hf_helpers.py

Diff

commit d4a932e40518ff6c9ebb4f1fe97aaab7ce156660
Author: Alex Cheema <alexcheema123@gmail.com>
Date:   Thu Aug 29 12:25:24 2024 +0100

    fix merge
---
 exo/download/hf/hf_helpers.py | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/exo/download/hf/hf_helpers.py b/exo/download/hf/hf_helpers.py
index d26a6a15..14bed136 100644
--- a/exo/download/hf/hf_helpers.py
+++ b/exo/download/hf/hf_helpers.py
@@ -234,19 +234,9 @@ async def download_repo_files(
           raise Exception(f"Failed to fetch revision info from {api_url}: {response.status}")
         revision_info = await response.json()
         commit_hash = revision_info['sha']
-
-<<<<<<< HEAD
-        filtered_file_list = list(filter_repo_objects(file_list, allow_patterns=allow_patterns, ignore_patterns=ignore_patterns, key=lambda x: x["path"]))
-        if DEBUG >= 2: print(f"Filtered file list {allow_patterns=} {ignore_patterns=}\noriginal: {file_list}\nfiltered: {filtered_file_list}")
-        total_files = len(filtered_file_list)
-        total_bytes = sum(file["size"] for file in filtered_file_list)
-        file_progress: Dict[str, RepoFileProgressEvent] = {file["path"]: RepoFileProgressEvent(repo_id, revision, file["path"], 0, 0, file["size"], 0, timedelta(0), "not_started") for file in filtered_file_list}
-        start_time = datetime.now()
-=======
-      # Cache the commit hash
-      async with aiofiles.open(refs_file, 'w') as f:
-        await f.write(commit_hash)
->>>>>>> main
+        # Cache the commit hash
+        async with aiofiles.open(refs_file, 'w') as f:
+          await f.write(commit_hash)
 
   # Set up the snapshot directory
   snapshot_dir = snapshots_dir/commit_hash

← 5a9f4ba5 update examples: remove old llama3_distributed, add chatgpt_ · back to Exo · generalise UDPDiscovery to any kind of PeerHandle that accep f93f811d →