Skip to content

Faster webdataset streaming #6578

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
Jan 30, 2024
Merged

Faster webdataset streaming #6578

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
d1a3804
faster webdataset streaming
lhoestq Jan 10, 2024
0d1e704
fix test
lhoestq Jan 10, 2024
16ee3b3
use block_size
lhoestq Jan 11, 2024
1cbd766
Merge branch 'main' into faster-webdataset-streaming
lhoestq Jan 11, 2024
d15b284
Merge branch 'main' into faster-webdataset-streaming
lhoestq Jan 30, 2024
44780d3
don't use block_size=0 with older versions of hfh
lhoestq Jan 30, 2024
989f2d6
Update src/datasets/download/streaming_download_manager.py
lhoestq Jan 30, 2024
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
10 changes: 9 additions & 1 deletion src/datasets/download/streaming_download_manager.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
import fsspec
from aiohttp.client_exceptions import ClientError
from huggingface_hub.utils import EntryNotFoundError
from packaging import version

from .. import config
from ..filesystems import COMPRESSION_FILESYSTEMS
Expand Down Expand Up @@ -475,6 +476,9 @@ def _prepare_single_hop_path_and_storage_options(
"endpoint": config.HF_ENDPOINT,
**storage_options.get(protocol, {}),
}
# streaming with block_size=0 is only implemented in 0.21 (see https://github.com/huggingface/huggingface_hub/pull/1967)
if config.HF_HUB_VERSION < version.parse("0.21.0"):
storage_options[protocol]["block_size"] = "default"
return urlpath, storage_options


Expand All @@ -498,6 +502,8 @@ def xopen(file: str, mode="r", *args, download_config: Optional[DownloadConfig]
file_str = _as_str(file)
main_hop, *rest_hops = file_str.split("::")
if is_local_path(main_hop):
# ignore fsspec-specific kwargs
kwargs.pop("block_size", None)
return open(main_hop, mode, *args, **kwargs)
# add headers and cookies for authentication on the HF Hub and for Google Drive
file, storage_options = _prepare_path_and_storage_options(file_str, download_config=download_config)
Expand Down Expand Up @@ -911,7 +917,9 @@ def _iter_from_urlpath(
cls, urlpath: str, download_config: Optional[DownloadConfig] = None
) -> Generator[Tuple, None, None]:
compression = _get_extraction_protocol(urlpath, download_config=download_config)
with xopen(urlpath, "rb", download_config=download_config) as f:
# Set block_size=0 to get faster streaming
# (e.g. for hf:// and https:// it uses streaming Requests file-like instances)
with xopen(urlpath, "rb", download_config=download_config, block_size=0) as f:
if compression == "zip":
yield from cls._iter_zip(f)
else:
Expand Down