diff --git a/setup.py b/setup.py index 7d90c0548e2..6f39d837428 100644 --- a/setup.py +++ b/setup.py @@ -48,7 +48,7 @@ DOCLINES = __doc__.split('\n') REQUIRED_PKGS = [ - 'absl-py', + 'absl-py>=1.0.0', # Min version of 0.5.0 as old array_record wheel are bugged on all # platform except 'x86_64'. See # https://github.com/google/array_record/issues/71 @@ -105,8 +105,8 @@ 'datasets/ogbg_molpcba/tasks.txt', 'datasets/quickdraw/labels.txt', 'datasets/smartwatch_gestures/labels.txt', - 'image_classification/caltech101_labels.txt', - 'image_classification/categories_places365.txt', + 'datasets/caltech101/caltech101_labels.txt', + 'datasets/places365_small/categories_places365.txt', 'image_classification/cbis_ddsm_calc_distributions.txt', 'image_classification/cbis_ddsm_calc_types.txt', 'image_classification/cbis_ddsm_mass_margins.txt', @@ -118,17 +118,17 @@ 'image_classification/i_naturalist2018/inaturalist2018_supercategories.txt', 'image_classification/i_naturalist2021/i_naturalist2021_labels.txt', 'image_classification/i_naturalist2021/i_naturalist2021_supercategories.txt', - 'image_classification/imagenet_resized_labels.txt', - 'image_classification/imagenette_labels.txt', - 'image_classification/imagewang_labels.txt', + 'datasets/imagenet_resized/imagenet_resized_labels.txt', + 'datasets/imagenette/imagenette_labels.txt', + 'datasets/imagewang/imagewang_labels.txt', 'image_classification/inaturalist_labels.txt', 'image_classification/inaturalist_supercategories.txt', 'image_classification/placesfull/categories_placesfull.txt', - 'image_classification/plantae_k_urls.txt', - 'image_classification/sun397_labels.txt', - 'image_classification/sun397_tfds_te.txt', - 'image_classification/sun397_tfds_tr.txt', - 'image_classification/sun397_tfds_va.txt', + 'datasets/plantae_k/plantae_k_urls.txt', + 'datasets/sun397/sun397_labels.txt', + 'datasets/sun397/sun397_tfds_te.txt', + 'datasets/sun397/sun397_tfds_tr.txt', + 'datasets/sun397/sun397_tfds_va.txt', 'object_detection/open_images_classes_all.txt', 'object_detection/open_images_classes_boxable.txt', 'object_detection/open_images_classes_trainable.txt', diff --git a/tensorflow_datasets/datasets/caltech101/caltech101_dataset_builder.py b/tensorflow_datasets/datasets/caltech101/caltech101_dataset_builder.py index 0ab13327836..36b221e282d 100644 --- a/tensorflow_datasets/datasets/caltech101/caltech101_dataset_builder.py +++ b/tensorflow_datasets/datasets/caltech101/caltech101_dataset_builder.py @@ -21,7 +21,7 @@ from tensorflow_datasets.core.utils.lazy_imports_utils import tensorflow as tf import tensorflow_datasets.public_api as tfds -_LABELS_FNAME = "image_classification/caltech101_labels.txt" +_LABELS_FNAME = "datasets/caltech101/caltech101_labels.txt" _URL = "https://data.caltech.edu/records/mzrjq-6wc02/files/caltech-101.zip?download=1" _TRAIN_POINTS_PER_CLASS = 30 diff --git a/tensorflow_datasets/image_classification/caltech101_labels.txt b/tensorflow_datasets/datasets/caltech101/caltech101_labels.txt similarity index 100% rename from tensorflow_datasets/image_classification/caltech101_labels.txt rename to tensorflow_datasets/datasets/caltech101/caltech101_labels.txt diff --git a/tensorflow_datasets/datasets/imagenet_resized/imagenet_resized_dataset_builder.py b/tensorflow_datasets/datasets/imagenet_resized/imagenet_resized_dataset_builder.py index c97c83bfcd4..ae1fd8381c7 100644 --- a/tensorflow_datasets/datasets/imagenet_resized/imagenet_resized_dataset_builder.py +++ b/tensorflow_datasets/datasets/imagenet_resized/imagenet_resized_dataset_builder.py @@ -24,7 +24,7 @@ import numpy as np import tensorflow_datasets.public_api as tfds -_LABELS_FNAME = 'image_classification/imagenet_resized_labels.txt' +_LABELS_FNAME = 'datasets/imagenet_resized/imagenet_resized_labels.txt' _URL_PREFIX = 'http://www.image-net.org/data/downsample/' diff --git a/tensorflow_datasets/image_classification/imagenet_resized_labels.txt b/tensorflow_datasets/datasets/imagenet_resized/imagenet_resized_labels.txt similarity index 100% rename from tensorflow_datasets/image_classification/imagenet_resized_labels.txt rename to tensorflow_datasets/datasets/imagenet_resized/imagenet_resized_labels.txt diff --git a/tensorflow_datasets/datasets/imagenette/imagenette_dataset_builder.py b/tensorflow_datasets/datasets/imagenette/imagenette_dataset_builder.py index 40e09744d84..869eb8367b1 100644 --- a/tensorflow_datasets/datasets/imagenette/imagenette_dataset_builder.py +++ b/tensorflow_datasets/datasets/imagenette/imagenette_dataset_builder.py @@ -24,7 +24,7 @@ from tensorflow_datasets.core.utils.lazy_imports_utils import tensorflow as tf import tensorflow_datasets.public_api as tfds -_LABELS_FNAME = "image_classification/imagenette_labels.txt" +_LABELS_FNAME = "datasets/imagenette/imagenette_labels.txt" _URL_PREFIX = "https://s3.amazonaws.com/fast-ai-imageclas/" diff --git a/tensorflow_datasets/image_classification/imagenette_labels.txt b/tensorflow_datasets/datasets/imagenette/imagenette_labels.txt similarity index 100% rename from tensorflow_datasets/image_classification/imagenette_labels.txt rename to tensorflow_datasets/datasets/imagenette/imagenette_labels.txt diff --git a/tensorflow_datasets/datasets/imagewang/imagewang_dataset_builder.py b/tensorflow_datasets/datasets/imagewang/imagewang_dataset_builder.py index 3dc2ec17049..5fd26eb4ac1 100644 --- a/tensorflow_datasets/datasets/imagewang/imagewang_dataset_builder.py +++ b/tensorflow_datasets/datasets/imagewang/imagewang_dataset_builder.py @@ -25,7 +25,7 @@ Imagewang contains Imagenette and Imagewoof combined. """ -_LABELS_FNAME = "image_classification/imagewang_labels.txt" +_LABELS_FNAME = "datasets/imagewang/imagewang_labels.txt" _URL_PREFIX = "https://s3.amazonaws.com/fast-ai-imageclas" _SIZES = ["full-size", "320px", "160px"] diff --git a/tensorflow_datasets/image_classification/imagewang_labels.txt b/tensorflow_datasets/datasets/imagewang/imagewang_labels.txt similarity index 100% rename from tensorflow_datasets/image_classification/imagewang_labels.txt rename to tensorflow_datasets/datasets/imagewang/imagewang_labels.txt diff --git a/tensorflow_datasets/image_classification/categories_places365.txt b/tensorflow_datasets/datasets/places365_small/categories_places365.txt similarity index 100% rename from tensorflow_datasets/image_classification/categories_places365.txt rename to tensorflow_datasets/datasets/places365_small/categories_places365.txt diff --git a/tensorflow_datasets/datasets/places365_small/places365_small_dataset_builder.py b/tensorflow_datasets/datasets/places365_small/places365_small_dataset_builder.py index 530aa386e37..04d4326998c 100644 --- a/tensorflow_datasets/datasets/places365_small/places365_small_dataset_builder.py +++ b/tensorflow_datasets/datasets/places365_small/places365_small_dataset_builder.py @@ -29,7 +29,7 @@ _IMAGE_SHAPE = (256, 256, 3) -_LABELS_FNAME = "image_classification/categories_places365.txt" +_LABELS_FNAME = "datasets/places365_small/categories_places365.txt" class Builder(tfds.core.GeneratorBasedBuilder): diff --git a/tensorflow_datasets/datasets/plantae_k/plantae_k_dataset_builder.py b/tensorflow_datasets/datasets/plantae_k/plantae_k_dataset_builder.py index 7a8d5144fcd..8d3d438132a 100644 --- a/tensorflow_datasets/datasets/plantae_k/plantae_k_dataset_builder.py +++ b/tensorflow_datasets/datasets/plantae_k/plantae_k_dataset_builder.py @@ -42,7 +42,7 @@ ("walnut_h", "WALNUT DISEASED"), ("walnut-h", "WALNUT HEALTHY"), ] -_URLS_FNAME = "image_classification/plantae_k_urls.txt" +_URLS_FNAME = "datasets/plantae_k/plantae_k_urls.txt" _MAX_DOWNLOAD_RETRY = 10 diff --git a/tensorflow_datasets/image_classification/plantae_k_urls.txt b/tensorflow_datasets/datasets/plantae_k/plantae_k_urls.txt similarity index 100% rename from tensorflow_datasets/image_classification/plantae_k_urls.txt rename to tensorflow_datasets/datasets/plantae_k/plantae_k_urls.txt diff --git a/tensorflow_datasets/datasets/sun397/sun397_dataset_builder.py b/tensorflow_datasets/datasets/sun397/sun397_dataset_builder.py index f2a382b9c04..70282785be2 100644 --- a/tensorflow_datasets/datasets/sun397/sun397_dataset_builder.py +++ b/tensorflow_datasets/datasets/sun397/sun397_dataset_builder.py @@ -186,13 +186,13 @@ def __init__(self, tfds_split_files=None, **kwargs): } for split, filename in tfds_split_files.items(): tfds_split_files[split] = tfds.core.tfds_path( - os.path.join("image_classification", filename) + os.path.join("datasets", "sun397", filename) ) self._tfds_split_files = tfds_split_files def _info(self): names_file = tfds.core.tfds_path( - os.path.join("image_classification", "sun397_labels.txt") + os.path.join("datasets", "sun397", "sun397_labels.txt") ) return self.dataset_info_from_configs( features=tfds.features.FeaturesDict({ diff --git a/tensorflow_datasets/image_classification/sun397_labels.txt b/tensorflow_datasets/datasets/sun397/sun397_labels.txt similarity index 100% rename from tensorflow_datasets/image_classification/sun397_labels.txt rename to tensorflow_datasets/datasets/sun397/sun397_labels.txt diff --git a/tensorflow_datasets/image_classification/sun397_tfds_te.txt b/tensorflow_datasets/datasets/sun397/sun397_tfds_te.txt similarity index 100% rename from tensorflow_datasets/image_classification/sun397_tfds_te.txt rename to tensorflow_datasets/datasets/sun397/sun397_tfds_te.txt diff --git a/tensorflow_datasets/image_classification/sun397_tfds_tr.txt b/tensorflow_datasets/datasets/sun397/sun397_tfds_tr.txt similarity index 100% rename from tensorflow_datasets/image_classification/sun397_tfds_tr.txt rename to tensorflow_datasets/datasets/sun397/sun397_tfds_tr.txt diff --git a/tensorflow_datasets/image_classification/sun397_tfds_va.txt b/tensorflow_datasets/datasets/sun397/sun397_tfds_va.txt similarity index 100% rename from tensorflow_datasets/image_classification/sun397_tfds_va.txt rename to tensorflow_datasets/datasets/sun397/sun397_tfds_va.txt