diff --git a/src/ptbench/data/tbx11k_simplified_RS/__init__.py b/src/ptbench/data/tbx11k_simplified_RS/__init__.py index 5a7aa0d765d80e48506fd7e59b2bbdf476a59880..8598a8c5b1a11f1a8a1866e5e4d04b83c27925ff 100644 --- a/src/ptbench/data/tbx11k_simplified_RS/__init__.py +++ b/src/ptbench/data/tbx11k_simplified_RS/__init__.py @@ -27,20 +27,20 @@ The version of the dataset used in this benchmark is a simplified. import importlib.resources from ..dataset import JSONDataset -from ..loader import make_delayed, make_delayed_bbox +from ..loader import make_delayed _protocols = [ importlib.resources.files(__name__).joinpath("default.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_0.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_1.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_2.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_3.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_4.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_5.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_6.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_7.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_8.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_9.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_0.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_1.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_2.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_3.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_4.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_5.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_6.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_7.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_8.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_9.json.bz2"), ] @@ -48,38 +48,15 @@ def _raw_data_loader(sample): return dict(data=sample["data"], label=sample["label"]) -def _raw_data_loader_bbox(sample): - return dict( - data=sample["data"], - label=sample["label"], - bboxes=sample["bboxes"], - ) - - def _loader(context, sample): # "context" is ignored in this case - database is homogeneous # we returned delayed samples to avoid loading all images at once return make_delayed(sample, _raw_data_loader, key=sample["filename"]) -def _loader_bbox(context, sample): - # "context" is ignored in this case - database is homogeneous - # we return delayed samples to avoid loading all images at once - return make_delayed_bbox( - sample, _raw_data_loader_bbox, key=sample["filename"] - ) - - dataset = JSONDataset( protocols=_protocols, fieldnames=("filename", "label", "data"), loader=_loader, ) - -dataset_with_bboxes = JSONDataset( - protocols=_protocols, - fieldnames=("filename", "label", "data", "bboxes"), - loader=_loader_bbox, -) - """Extended TBX11K simplified dataset object.""" diff --git a/src/ptbench/data/tbx11k_simplified_v2_RS/__init__.py b/src/ptbench/data/tbx11k_simplified_v2_RS/__init__.py index 31c0a4a5521a6825a494ecd5df737622c7c2bd8f..f2bcf8c2a53cd117f556c5854774d5ea81fb2f6c 100644 --- a/src/ptbench/data/tbx11k_simplified_v2_RS/__init__.py +++ b/src/ptbench/data/tbx11k_simplified_v2_RS/__init__.py @@ -27,20 +27,20 @@ The version of the dataset used in this benchmark is a simplified. import importlib.resources from ..dataset import JSONDataset -from ..loader import make_delayed, make_delayed_bbox +from ..loader import make_delayed _protocols = [ importlib.resources.files(__name__).joinpath("default.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_0.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_1.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_2.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_3.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_4.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_5.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_6.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_7.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_8.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_9.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_0.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_1.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_2.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_3.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_4.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_5.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_6.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_7.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_8.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_9.json.bz2"), ] @@ -48,38 +48,16 @@ def _raw_data_loader(sample): return dict(data=sample["data"], label=sample["label"]) -def _raw_data_loader_bbox(sample): - return dict( - data=sample["data"], - label=sample["label"], - bboxes=sample["bboxes"], - ) - - def _loader(context, sample): # "context" is ignored in this case - database is homogeneous # we returned delayed samples to avoid loading all images at once return make_delayed(sample, _raw_data_loader, key=sample["filename"]) -def _loader_bbox(context, sample): - # "context" is ignored in this case - database is homogeneous - # we return delayed samples to avoid loading all images at once - return make_delayed_bbox( - sample, _raw_data_loader_bbox, key=sample["filename"] - ) - - dataset = JSONDataset( protocols=_protocols, fieldnames=("filename", "label", "data"), loader=_loader, ) -dataset_with_bboxes = JSONDataset( - protocols=_protocols, - fieldnames=("filename", "label", "data", "bboxes"), - loader=_loader_bbox, -) - """Extended TBX11K simplified dataset object.""" diff --git a/src/ptbench/data/tbx11k_simplified_v3_RS/__init__.py b/src/ptbench/data/tbx11k_simplified_v3_RS/__init__.py index 31c0a4a5521a6825a494ecd5df737622c7c2bd8f..f2bcf8c2a53cd117f556c5854774d5ea81fb2f6c 100644 --- a/src/ptbench/data/tbx11k_simplified_v3_RS/__init__.py +++ b/src/ptbench/data/tbx11k_simplified_v3_RS/__init__.py @@ -27,20 +27,20 @@ The version of the dataset used in this benchmark is a simplified. import importlib.resources from ..dataset import JSONDataset -from ..loader import make_delayed, make_delayed_bbox +from ..loader import make_delayed _protocols = [ importlib.resources.files(__name__).joinpath("default.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_0.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_1.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_2.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_3.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_4.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_5.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_6.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_7.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_8.json.bz2"), - # importlib.resources.files(__name__).joinpath("fold_9.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_0.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_1.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_2.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_3.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_4.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_5.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_6.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_7.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_8.json.bz2"), + importlib.resources.files(__name__).joinpath("fold_9.json.bz2"), ] @@ -48,38 +48,16 @@ def _raw_data_loader(sample): return dict(data=sample["data"], label=sample["label"]) -def _raw_data_loader_bbox(sample): - return dict( - data=sample["data"], - label=sample["label"], - bboxes=sample["bboxes"], - ) - - def _loader(context, sample): # "context" is ignored in this case - database is homogeneous # we returned delayed samples to avoid loading all images at once return make_delayed(sample, _raw_data_loader, key=sample["filename"]) -def _loader_bbox(context, sample): - # "context" is ignored in this case - database is homogeneous - # we return delayed samples to avoid loading all images at once - return make_delayed_bbox( - sample, _raw_data_loader_bbox, key=sample["filename"] - ) - - dataset = JSONDataset( protocols=_protocols, fieldnames=("filename", "label", "data"), loader=_loader, ) -dataset_with_bboxes = JSONDataset( - protocols=_protocols, - fieldnames=("filename", "label", "data", "bboxes"), - loader=_loader_bbox, -) - """Extended TBX11K simplified dataset object."""