diff --git a/docs/catalog/bee_dataset.md b/docs/catalog/bee_dataset.md index ec8641c5bb9..0ad2ee68122 100644 --- a/docs/catalog/bee_dataset.md +++ b/docs/catalog/bee_dataset.md @@ -3,10 +3,10 @@ - + - - + + # `bee_dataset` @@ -38,9 +38,9 @@ select 300 pixel height by loading the datset with the name License: GNU GENERAL PUBLIC LICENSE -Author: Fabian Hickert +Author: Fabian Hickert -* **Homepage**: [https://raspbee.de](https://raspbee.de) +* **Homepage**: [https://github.com/BeeAlarmed/BeeDataset](https://github.com/BeeAlarmed/BeeDataset) * **Source code**: [`tfds.datasets.bee_dataset.Builder`](https://github.com/tensorflow/datasets/tree/master/tensorflow_datasets/datasets/bee_dataset/bee_dataset_dataset_builder.py) @@ -73,7 +73,7 @@ Split | Examples url={https://github.com/BeeAlarmed}, journal={BeeAlarmed}, author = "Fabian Hickert", year = "2021", - NOTE = "\url{https://raspbee.de/} and \url{https://github.com/BeeAlarmed/BeeAlarmed}" + NOTE = "\url{https://github.com/BeeAlarmed/BeeDataset}" } ``` @@ -301,4 +301,4 @@ dataButton.addEventListener('click', async () => { {% endframebox %} - \ No newline at end of file + diff --git a/tensorflow_datasets/datasets/bee_dataset/CITATIONS.bib b/tensorflow_datasets/datasets/bee_dataset/CITATIONS.bib index b592377d147..5d0ea181302 100644 --- a/tensorflow_datasets/datasets/bee_dataset/CITATIONS.bib +++ b/tensorflow_datasets/datasets/bee_dataset/CITATIONS.bib @@ -3,5 +3,5 @@ @misc{BeeAlarmed url={https://github.com/BeeAlarmed}, journal={BeeAlarmed}, author = "Fabian Hickert", year = "2021", - NOTE = "\url{https://raspbee.de/} and \url{https://github.com/BeeAlarmed/BeeAlarmed}" -} \ No newline at end of file + NOTE = "\url{https://github.com/BeeAlarmed/BeeDataset} and \url{https://github.com/BeeAlarmed/BeeAlarmed}" +} diff --git a/tensorflow_datasets/datasets/bee_dataset/README.md b/tensorflow_datasets/datasets/bee_dataset/README.md index ffd26025ebd..1c0732bda63 100644 --- a/tensorflow_datasets/datasets/bee_dataset/README.md +++ b/tensorflow_datasets/datasets/bee_dataset/README.md @@ -22,4 +22,4 @@ select 300 pixel height by loading the datset with the name License: GNU GENERAL PUBLIC LICENSE -Author: Fabian Hickert +Author: Fabian Hickert diff --git a/tensorflow_datasets/datasets/bee_dataset/bee_dataset_dataset_builder.py b/tensorflow_datasets/datasets/bee_dataset/bee_dataset_dataset_builder.py index 2d7b180c000..fd7b8a99bd8 100644 --- a/tensorflow_datasets/datasets/bee_dataset/bee_dataset_dataset_builder.py +++ b/tensorflow_datasets/datasets/bee_dataset/bee_dataset_dataset_builder.py @@ -43,7 +43,7 @@ class Builder(tfds.core.GeneratorBasedBuilder): VERSION = tfds.core.Version('1.0.0') - URL = 'https://raspbee.de/BeeDataset_20201121.zip' + URL = 'https://github.com/BeeAlarmed/BeeDataset/raw/refs/heads/main/BeeDataset_20201121.zip' BEE_CFG_300 = BeeDatasetConfig( name='bee_dataset_300', @@ -63,7 +63,7 @@ class Builder(tfds.core.GeneratorBasedBuilder): BEE_CFG_150 = BeeDatasetConfig( name='bee_dataset_150', - description='BeeDataset images with 200 pixel height and 100 pixel width', + description='BeeDataset images with 150 pixel height and 75 pixel width', version='1.0.0', image_height=150, image_width=75, @@ -79,8 +79,8 @@ def _info(self) -> tfds.core.DatasetInfo: self.builder_config.depth, ) features = tfds.features.FeaturesDict({ - 'input': tfds.features.Image(shape=t_shape), - 'output': { + 'image': tfds.features.Image(shape=t_shape), + 'label': { 'varroa_output': np.float64, 'pollen_output': np.float64, 'wasps_output': np.float64, @@ -90,8 +90,8 @@ def _info(self) -> tfds.core.DatasetInfo: return self.dataset_info_from_configs( features=features, - supervised_keys=('input', 'output'), - homepage='https://raspbee.de', + supervised_keys=('image', 'label'), + homepage='https://github.com/BeeAlarmed/BeeDataset', ) def _split_generators(self, dl_manager): @@ -116,8 +116,8 @@ def _generate_examples(self, path): img = path / f'images_{self.builder_config.height}' / name yield name + str(self.builder_config.height), { - 'input': img, - 'output': { + 'image': img, + 'label': { 'varroa_output': labels[0], 'pollen_output': labels[1], 'wasps_output': labels[2], diff --git a/tensorflow_datasets/datasets/bee_dataset/checksums.tsv b/tensorflow_datasets/datasets/bee_dataset/checksums.tsv index c5d5f375058..e45da5fdb31 100644 --- a/tensorflow_datasets/datasets/bee_dataset/checksums.tsv +++ b/tensorflow_datasets/datasets/bee_dataset/checksums.tsv @@ -1 +1 @@ -https://raspbee.de/BeeDataset_20201121.zip 201735620 f219c7dc5d81712fb6f3423e2f5468e648260f2032720d87ebf14f218b5e3e43 BeeDataset_20201121.zip +https://github.com/BeeAlarmed/BeeDataset/raw/refs/heads/main/BeeDataset_20201121.zip 201735620 f219c7dc5d81712fb6f3423e2f5468e648260f2032720d87ebf14f218b5e3e43 BeeDataset_20201121.zip diff --git a/tensorflow_datasets/image_classification/bee_dataset/bee_dataset.py b/tensorflow_datasets/image_classification/bee_dataset/bee_dataset.py index 3653c9f0866..bbe53eb04e1 100644 --- a/tensorflow_datasets/image_classification/bee_dataset/bee_dataset.py +++ b/tensorflow_datasets/image_classification/bee_dataset/bee_dataset.py @@ -14,12 +14,7 @@ # limitations under the License. """Dataset definition for bee_dataset. - -DEPRECATED! -If you want to use the BeeDataset dataset builder class, use: -tfds.builder_cls('bee_dataset') """ -from tensorflow_datasets.core import lazy_builder_import - -BeeDataset = lazy_builder_import.LazyBuilderImport('bee_dataset') +import tensorflow_datasets as tfds +BeeDataset = tfds.builder_cls('bee_dataset')