Skip to content

[Storage cleaner] Minor bug fixes and improvements #404

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
2015aroras merged 2 commits into from
Dec 18, 2023
Merged

[Storage cleaner] Minor bug fixes and improvements #404

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c86e0f5
Treat a folder with config.yaml and train_data/ as a run
2015aroras Dec 18, 2023
bbf79f9
Fix key name in S3 download folder
2015aroras Dec 18, 2023
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
11 changes: 8 additions & 3 deletions scripts/storage_cleaner.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -575,7 +575,7 @@ def download_folder(self, directory_path: str, local_dest_folder: PathOrStr):
object_key: str = object_metadata["Key"]
object_local_dest = object_key.replace(key.rstrip("/"), str(local_dest_folder).rstrip("/"))

self._s3_client.download_file(bucket_name, key, object_local_dest)
self._s3_client.download_file(bucket_name, object_key, object_local_dest)
else:
raise ValueError(f"Path {directory_path} is not a valid directory")

Expand Down Expand Up @@ -655,9 +655,14 @@ def _is_run(directory: str, run_entries: Optional[List[str]] = None) -> bool:
if run_entries is None:
run_entries = storage.list_entries(directory)

if CONFIG_YAML in run_entries and storage.is_dir(os.path.join(directory, "wandb")):
if CONFIG_YAML in run_entries:
# A directory with both config.yaml and a wandb subdirectory is most likely a run
return True
if storage.is_dir(os.path.join(directory, "wandb")):
return True

# A directory with both config.yaml and a train_data subdirectory is most likely a run
if storage.is_dir(os.path.join(directory, "train_data")):
return True

return _contains_checkpoint_dir(run_entries)

Expand Down