From f5934965db0c689e67afba26b887491aa63ba4ca Mon Sep 17 00:00:00 2001
From: "ogueler@idiap.ch" <ogueler@vws110.idiap.ch>
Date: Sat, 15 Apr 2023 04:10:33 +0200
Subject: [PATCH] removed unnecessary functions
---
.../data/tbx11k_simplified_RS/__init__.py | 45 +++++--------------
.../data/tbx11k_simplified_v2_RS/__init__.py | 44 +++++-------------
.../data/tbx11k_simplified_v3_RS/__init__.py | 44 +++++-------------
3 files changed, 33 insertions(+), 100 deletions(-)
diff --git a/src/ptbench/data/tbx11k_simplified_RS/__init__.py b/src/ptbench/data/tbx11k_simplified_RS/__init__.py
index 5a7aa0d7..8598a8c5 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 31c0a4a5..f2bcf8c2 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 31c0a4a5..f2bcf8c2 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."""
--
GitLab