Skip to content

Commit 1054f22

Browse files
WilliamHYZhangWilliamHYZhang
committed
address requests, add checksum
1 parent cde7fca commit 1054f22

File tree

3 files changed

+8
-136
lines changed

3 files changed

+8
-136
lines changed

‎tensorflow_datasets/image/div2k.py

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -64,28 +64,24 @@ def __init__(self, name, **kwargs):
6464
if name not in _DATA_OPTIONS:
6565
raise ValueError("data must be one of %s" % _DATA_OPTIONS)
6666

67-
description = kwargs.get("description", "Uses %s data." % data)
67+
description = kwargs.get("description", "Uses %s data." % name)
6868
kwargs["description"] = description
6969

7070
super(Div2kConfig, self).__init__(name=name, **kwargs)
71-
self.data = data
72-
73-
def download_urls():
74-
"""Returns train and validation download urls for this config."""
75-
urls = {
71+
self.data = name
72+
self.download_urls = {
7673
"train_lr_url": _DL_URLS["train_"+self.data],
7774
"valid_lr_url": _DL_URLS["valid_"+self.data],
7875
"train_hr_url": _DL_URLS["train_hr"],
7976
"valid_hr_url": _DL_URLS["valid_hr"],
8077
}
81-
return urls
8278

8379
def _make_builder_configs():
8480
configs = []
8581
for data in _DATA_OPTIONS:
8682
configs.append(Div2kConfig(
8783
version=tfds.core.Version("2.0.0"),
88-
data=data))
84+
name=data))
8985
return configs
9086

9187
class Div2k(tfds.core.GeneratorBasedBuilder):
@@ -107,7 +103,6 @@ def _info(self):
107103

108104
def _split_generators(self, dl_manager):
109105
"""Returns SplitGenerators."""
110-
111106
extracted_paths = dl_manager.download_and_extract(
112107
self.builder_config.download_urls)
113108

‎tensorflow_datasets/image/div2k_test.py

Lines changed: 0 additions & 127 deletions
Original file line numberDiff line numberDiff line change
@@ -22,51 +22,6 @@ class Div2kTest_bicubic_x2(testing.DatasetBuilderTestCase):
2222
"valid_lr_url": "DIV2K_valid_LR_bicubic_X2",
2323
}
2424

25-
class Div2kTest_bicubic_x3(testing.DatasetBuilderTestCase):
26-
DATASET_CLASS = div2k.Div2k
27-
BUILDER_CONFIG_NAMES_TO_TEST = ["bicubic_x3"]
28-
SPLITS = {
29-
"train": 1,
30-
"validation": 1,
31-
}
32-
33-
DL_EXTRACT_RESULT = {
34-
"train_hr_url": "DIV2K_train_HR",
35-
"valid_hr_url": "DIV2K_valid_HR",
36-
"train_lr_url": "DIV2K_train_LR_bicubic_X3",
37-
"valid_lr_url": "DIV2K_valid_LR_bicubic_X3",
38-
}
39-
40-
class Div2kTest_bicubic_x4(testing.DatasetBuilderTestCase):
41-
DATASET_CLASS = div2k.Div2k
42-
BUILDER_CONFIG_NAMES_TO_TEST = ["bicubic_x4"]
43-
SPLITS = {
44-
"train": 1,
45-
"validation": 1,
46-
}
47-
48-
DL_EXTRACT_RESULT = {
49-
"train_hr_url": "DIV2K_train_HR",
50-
"valid_hr_url": "DIV2K_valid_HR",
51-
"train_lr_url": "DIV2K_train_LR_bicubic_X4",
52-
"valid_lr_url": "DIV2K_valid_LR_bicubic_X4",
53-
}
54-
55-
class Div2kTest_bicubic_x4(testing.DatasetBuilderTestCase):
56-
DATASET_CLASS = div2k.Div2k
57-
BUILDER_CONFIG_NAMES_TO_TEST = ["bicubic_x8"]
58-
SPLITS = {
59-
"train": 1,
60-
"validation": 1,
61-
}
62-
63-
DL_EXTRACT_RESULT = {
64-
"train_hr_url": "DIV2K_train_HR",
65-
"valid_hr_url": "DIV2K_valid_HR",
66-
"train_lr_url": "DIV2K_train_LR_x8",
67-
"valid_lr_url": "DIV2K_valid_LR_x8",
68-
}
69-
7025
class Div2kTest_unknown_x2(testing.DatasetBuilderTestCase):
7126
DATASET_CLASS = div2k.Div2k
7227
BUILDER_CONFIG_NAMES_TO_TEST = ["unknown_x2"]
@@ -75,87 +30,5 @@ class Div2kTest_unknown_x2(testing.DatasetBuilderTestCase):
7530
"validation": 1,
7631
}
7732

78-
DL_EXTRACT_RESULT = {
79-
"train_hr_url": "DIV2K_train_HR",
80-
"valid_hr_url": "DIV2K_valid_HR",
81-
"train_lr_url": "DIV2K_train_LR_unknown_X2",
82-
"valid_lr_url": "DIV2K_valid_LR_unknown_X2",
83-
}
84-
85-
class Div2kTest_unknown_x3(testing.DatasetBuilderTestCase):
86-
DATASET_CLASS = div2k.Div2k
87-
BUILDER_CONFIG_NAMES_TO_TEST = ["unknown_x3"]
88-
SPLITS = {
89-
"train": 1,
90-
"validation": 1,
91-
}
92-
93-
DL_EXTRACT_RESULT = {
94-
"train_hr_url": "DIV2K_train_HR",
95-
"valid_hr_url": "DIV2K_valid_HR",
96-
"train_lr_url": "DIV2K_train_LR_unknown_X3",
97-
"valid_lr_url": "DIV2K_valid_LR_unknown_X3",
98-
}
99-
100-
class Div2kTest_unknown_x4(testing.DatasetBuilderTestCase):
101-
DATASET_CLASS = div2k.Div2k
102-
BUILDER_CONFIG_NAMES_TO_TEST = ["unknown_x4"]
103-
SPLITS = {
104-
"train": 1,
105-
"validation": 1,
106-
}
107-
108-
DL_EXTRACT_RESULT = {
109-
"train_hr_url": "DIV2K_train_HR",
110-
"valid_hr_url": "DIV2K_valid_HR",
111-
"train_lr_url": "DIV2K_train_LR_unknown_X4",
112-
"valid_lr_url": "DIV2K_valid_LR_unknown_X4",
113-
}
114-
115-
class Div2kTest_realistic_mild_x4(testing.DatasetBuilderTestCase):
116-
DATASET_CLASS = div2k.Div2k
117-
BUILDER_CONFIG_NAMES_TO_TEST = ["realistic_mild_x4"]
118-
SPLITS = {
119-
"train": 1,
120-
"validation": 1,
121-
}
122-
123-
DL_EXTRACT_RESULT = {
124-
"train_hr_url": "DIV2K_train_HR",
125-
"valid_hr_url": "DIV2K_valid_HR",
126-
"train_lr_url": "DIV2K_train_LR_mild",
127-
"valid_lr_url": "DIV2K_valid_LR_mild",
128-
}
129-
130-
class Div2kTest_realistic_difficult_x4(testing.DatasetBuilderTestCase):
131-
DATASET_CLASS = div2k.Div2k
132-
BUILDER_CONFIG_NAMES_TO_TEST = ["realistic_difficult_x4"]
133-
SPLITS = {
134-
"train": 1,
135-
"validation": 1,
136-
}
137-
138-
DL_EXTRACT_RESULT = {
139-
"train_hr_url": "DIV2K_train_HR",
140-
"valid_hr_url": "DIV2K_valid_HR",
141-
"train_lr_url": "DIV2K_train_LR_difficult",
142-
"valid_lr_url": "DIV2K_valid_LR_difficult",
143-
}
144-
145-
class Div2kTest_realistic_wild_x4(testing.DatasetBuilderTestCase):
146-
DATASET_CLASS = div2k.Div2k
147-
BUILDER_CONFIG_NAMES_TO_TEST = ["realistic_wild_x4"]
148-
SPLITS = {
149-
"train": 1,
150-
"validation": 1,
151-
}
152-
153-
DL_EXTRACT_RESULT = {
154-
"train_hr_url": "DIV2K_train_HR",
155-
"valid_hr_url": "DIV2K_valid_HR",
156-
"train_lr_url": "DIV2K_train_LR_wild",
157-
"valid_lr_url": "DIV2K_valid_LR_wild",
158-
}
159-
16033
if __name__ == "__main__":
16134
testing.test_main()

‎tensorflow_datasets/url_checksums/div2k.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
https://data.vision.ee.ethz.ch/cvl/DIV2K/DIV2K_train_HR.zip 3530603713 9d0b9c463f6e35b6c62cc6a930ee2224f670b34c1df841a57670f9acf0f6c335
2+
https://data.vision.ee.ethz.ch/cvl/DIV2K/DIV2K_train_LR_bicubic_X2.zip 925390592 a53a424317575838dadce4bcd97cf7b744d6855f43740ed5f0245af3cf4bd850
3+
https://data.vision.ee.ethz.ch/cvl/DIV2K/DIV2K_valid_HR.zip 448993893 20dd31fd84d777bc1cf5d6b7654a3f569c0aec74458ae094122ad1d0489900fc
4+
https://data.vision.ee.ethz.ch/cvl/DIV2K/DIV2K_valid_LR_bicubic_X2.zip 117763600 60eed9875c697df51204aa579e2a699e1d5215095788a097ff54dd17e2664d57

0 commit comments

Comments
 (0)