-
Notifications
You must be signed in to change notification settings - Fork 3.3k
Add skip_origin_metadata flag to optimize streaming startup time
#8291
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.
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
base: main
Are you sure you want to change the base?
Changes from 4 commits
b1e7c43
c90991e
90b1fe7
68b12bf
5444112
00fcc29
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -406,6 +406,7 @@ def __init__( | |
| data_dir: Optional[str] = None, | ||
| data_files: Optional[Union[str, list, dict]] = None, | ||
| download_mode: Optional[Union[DownloadMode, str]] = None, | ||
|
yuxin00j marked this conversation as resolved.
|
||
| skip_origin_metadata: bool = False, | ||
| ): | ||
| if data_dir and os.path.isabs(data_dir): | ||
| raise ValueError(f"`data_dir` must be relative to a dataset directory's root: {path}") | ||
|
|
@@ -415,6 +416,7 @@ def __init__( | |
| self.data_files = data_files | ||
| self.data_dir = data_dir | ||
| self.download_mode = download_mode | ||
|
yuxin00j marked this conversation as resolved.
|
||
| self.skip_origin_metadata = skip_origin_metadata | ||
|
|
||
| def get_module(self) -> DatasetModule: | ||
| readme_path = os.path.join(self.path, config.REPOCARD_FILENAME) | ||
|
|
@@ -442,6 +444,7 @@ def get_module(self) -> DatasetModule: | |
| patterns, | ||
| base_path=base_path, | ||
| allowed_extensions=_ALL_ALLOWED_EXTENSIONS, | ||
|
yuxin00j marked this conversation as resolved.
|
||
| skip_origin_metadata=self.skip_origin_metadata, | ||
| ) | ||
| module_name, default_builder_kwargs = infer_module_for_data_files( | ||
| data_files=data_files, | ||
|
|
@@ -515,12 +518,14 @@ def __init__( | |
| data_files: Optional[Union[str, list, dict]] = None, | ||
| download_config: Optional[DownloadConfig] = None, | ||
| download_mode: Optional[Union[DownloadMode, str]] = None, | ||
| skip_origin_metadata: bool = False, | ||
| ): | ||
| self.name = name | ||
| self.data_files = data_files | ||
| self.data_dir = data_dir | ||
| self.download_config = download_config | ||
| self.download_mode = download_mode | ||
| self.skip_origin_metadata = skip_origin_metadata | ||
| increase_load_count(name) | ||
|
|
||
| def get_module(self) -> DatasetModule: | ||
|
|
@@ -534,6 +539,7 @@ def get_module(self) -> DatasetModule: | |
| patterns, | ||
| download_config=self.download_config, | ||
| base_path=base_path, | ||
| skip_origin_metadata=self.skip_origin_metadata, | ||
| ) | ||
|
|
||
| module_path, hash = _PACKAGED_DATASETS_MODULES[self.name] | ||
|
|
@@ -561,6 +567,7 @@ def __init__( | |
| download_config: Optional[DownloadConfig] = None, | ||
| download_mode: Optional[Union[DownloadMode, str]] = None, | ||
| use_exported_dataset_infos: bool = False, | ||
| skip_origin_metadata: bool = False, | ||
| ): | ||
| self.name = name | ||
| self.commit_hash = commit_hash | ||
|
|
@@ -569,6 +576,7 @@ def __init__( | |
| self.download_config = download_config or DownloadConfig() | ||
| self.download_mode = download_mode | ||
| self.use_exported_dataset_infos = use_exported_dataset_infos | ||
| self.skip_origin_metadata = skip_origin_metadata | ||
| increase_load_count(name) | ||
|
|
||
| def get_module(self) -> DatasetModule: | ||
|
|
@@ -641,6 +649,7 @@ def get_module(self) -> DatasetModule: | |
| base_path=base_path, | ||
| allowed_extensions=_ALL_ALLOWED_EXTENSIONS, | ||
| download_config=self.download_config, | ||
| skip_origin_metadata=self.skip_origin_metadata, | ||
| ) | ||
| module_name, default_builder_kwargs = infer_module_for_data_files( | ||
| data_files=data_files, | ||
|
|
@@ -844,13 +853,15 @@ def __init__( | |
| data_files: Optional[Union[str, list, dict]] = None, | ||
| download_config: Optional[DownloadConfig] = None, | ||
| download_mode: Optional[Union[DownloadMode, str]] = None, | ||
| skip_origin_metadata: bool = False, | ||
| ): | ||
| self.path = Path(path).as_posix() | ||
| self.name = Path(path).stem | ||
| self.data_files = data_files | ||
| self.data_dir = data_dir | ||
| self.download_config = download_config | ||
| self.download_mode = download_mode | ||
| self.skip_origin_metadata = skip_origin_metadata | ||
|
|
||
| def get_module(self) -> DatasetModule: | ||
| hffs = HfFileSystem( | ||
|
|
@@ -889,6 +900,7 @@ def get_module(self) -> DatasetModule: | |
| patterns, | ||
| base_path=base_path, | ||
| allowed_extensions=_ALL_ALLOWED_EXTENSIONS, | ||
| skip_origin_metadata=self.skip_origin_metadata, | ||
| ) | ||
| module_name, default_builder_kwargs = infer_module_for_data_files( | ||
| data_files=data_files, | ||
|
|
@@ -960,6 +972,7 @@ def dataset_module_factory( | |
| data_dir: Optional[str] = None, | ||
| data_files: Optional[Union[dict, list, str, DataFilesDict]] = None, | ||
| cache_dir: Optional[str] = None, | ||
|
yuxin00j marked this conversation as resolved.
|
||
| skip_origin_metadata: bool = False, | ||
| **download_kwargs, | ||
| ) -> DatasetModule: | ||
| """ | ||
|
|
@@ -1052,6 +1065,7 @@ def dataset_module_factory( | |
| data_files=data_files, | ||
| download_config=download_config, | ||
| download_mode=download_mode, | ||
| skip_origin_metadata=skip_origin_metadata, | ||
| ).get_module() | ||
| # Try locally | ||
| elif path.endswith(filename): | ||
|
|
@@ -1060,7 +1074,11 @@ def dataset_module_factory( | |
| raise RuntimeError(f"Dataset scripts are no longer supported, but found {filename}") | ||
| elif os.path.isdir(path) and not remote_only: | ||
| return LocalDatasetModuleFactory( | ||
| path, data_dir=data_dir, data_files=data_files, download_mode=download_mode | ||
| path, | ||
| data_dir=data_dir, | ||
| data_files=data_files, | ||
| download_mode=download_mode, | ||
| skip_origin_metadata=skip_origin_metadata, | ||
| ).get_module() | ||
| # Try remotely | ||
| elif path.startswith("buckets/"): | ||
|
|
@@ -1097,6 +1115,7 @@ def dataset_module_factory( | |
| data_files=data_files, | ||
| download_config=download_config, | ||
| download_mode=download_mode, | ||
| skip_origin_metadata=skip_origin_metadata, | ||
| ).get_module() | ||
| elif is_relative_path(path) and path.count("/") <= 1: | ||
| try: | ||
|
|
@@ -1179,6 +1198,7 @@ def dataset_module_factory( | |
| download_config=download_config, | ||
| download_mode=download_mode, | ||
| use_exported_dataset_infos=use_exported_dataset_infos, | ||
| skip_origin_metadata=skip_origin_metadata, | ||
| ).get_module() | ||
| except GatedRepoError as e: | ||
| message = f"Dataset '{path}' is a gated dataset on the Hub." | ||
|
|
@@ -1312,6 +1332,7 @@ def load_dataset_builder( | |
| download_config.storage_options.update(storage_options) | ||
| if features is not None: | ||
| features = _fix_for_backward_compatible_features(features) | ||
| skip_origin_metadata = config_kwargs.pop("skip_origin_metadata", False) | ||
| dataset_module = dataset_module_factory( | ||
| path, | ||
| revision=revision, | ||
|
|
@@ -1320,6 +1341,7 @@ def load_dataset_builder( | |
| data_dir=data_dir, | ||
| data_files=data_files, | ||
| cache_dir=cache_dir, | ||
|
yuxin00j marked this conversation as resolved.
|
||
| skip_origin_metadata=skip_origin_metadata, | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. nit: why not
Author
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Fixed in the latest commit! I've inlined the |
||
| ) | ||
| # Get dataset builder class | ||
| builder_kwargs = dataset_module.builder_kwargs | ||
|
|
@@ -1679,6 +1701,12 @@ def load_dataset( | |
| "To parallelize streaming, you can wrap the dataset with a PyTorch DataLoader using `num_workers` > 1 instead." | ||
| ) | ||
|
|
||
| if not streaming and config_kwargs.get("skip_origin_metadata", False): | ||
| logger.warning( | ||
| "`skip_origin_metadata` is only supported when `streaming=True`. Forcing `skip_origin_metadata=False`." | ||
| ) | ||
| config_kwargs["skip_origin_metadata"] = False | ||
|
|
||
| download_mode = DownloadMode(download_mode or DownloadMode.REUSE_DATASET_IF_EXISTS) | ||
| verification_mode = VerificationMode( | ||
| (verification_mode or VerificationMode.BASIC_CHECKS) if not save_infos else VerificationMode.ALL_CHECKS | ||
|
|
||
Uh oh!
There was an error while loading. Please reload this page.