Skip to content

Internal change #11116

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Internal change #11116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 4 additions & 6 deletions tensorflow_datasets/core/load.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
from tensorflow_datasets.core.utils import version as version_lib
from tensorflow_datasets.core.utils.lazy_imports_utils import tensorflow as tf


# pylint: disable=logging-format-interpolation

Tree = type_utils.Tree
Expand Down Expand Up @@ -183,6 +184,7 @@ def get_dataset_repr() -> str:
f' explicitly set. Wrong arguments for {get_dataset_repr()}'
)
builder_kwargs['data_dir'] = gcs_utils.gcs_path('datasets')

if name.namespace:
if name.namespace == 'huggingface':
return huggingface_dataset_builder.builder(
Expand Down Expand Up @@ -827,12 +829,8 @@ def data_source(
""" # fmt:skip
builder_kwargs = _set_file_format_for_data_source(data_dir, builder_kwargs)
_validate_file_format_for_data_source(builder_kwargs)
dbuilder = _fetch_builder(
name,
data_dir,
builder_kwargs,
try_gcs,
)

dbuilder = _fetch_builder(name, data_dir, builder_kwargs, try_gcs)
_download_and_prepare_builder(dbuilder, download, download_and_prepare_kwargs)
return dbuilder.as_data_source(
split=split, decoders=decoders, deserialize_method=deserialize_method
Expand Down
8 changes: 8 additions & 0 deletions tensorflow_datasets/core/utils/file_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,14 @@ def get_dataset_dir(
version: version_lib.Version | str | None = None,
) -> epath.Path:
"""Returns the data directory for the given dataset."""
# If the data dir is a TF Hub path, use the TF Hub dataset directory.
if tfhub_path.is_tfhub_filepath(str(data_dir)):
return tfhub_file_utils.get_tfhub_dataset_dir(
dataset_name=builder_name,
config_name=config_name,
version=version,
tfhub_env=tfhub_file_utils.TfHubEnv.PROD,
)
dataset_dir = epath.Path(data_dir) / builder_name
if config_name:
dataset_dir /= config_name
Expand Down
Loading