Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CARLA dataset updates #1960

Merged
merged 8 commits into from
Aug 7, 2023
Merged

CARLA dataset updates #1960

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d8ab040
minor update to datasets
yusong-tan Jul 13, 2023
1cbe91e
updated CARLA MOT datasets with more accurate green screen coordinate…
yusong-tan Jul 20, 2023
dbb4c4d
url checksums
swsuggs Jul 21, 2023
08e7c26
dataset urls
swsuggs Jul 21, 2023
ec5db25
cached checksums
swsuggs Jul 21, 2023
41299c8
updated CARLA MOT test dataset to fix RGB/instance segmentation misal…
yusong-tan Jul 22, 2023
39127d5
resolve merge conflict
yusong-tan Jul 22, 2023
2ecfe23
update cached checksum
swsuggs Jul 26, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions armory/data/adversarial/carla_mot_dev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@
}
"""

_URLS = "https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_mot_dev_1.0.0.tar.gz"
_URLS = "https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_mot_dev_1.0.1.tar.gz"


class CarlaMOTDev(tfds.core.GeneratorBasedBuilder):
"""DatasetBuilder for carla_mot_dev dataset."""

VERSION = tfds.core.Version("1.0.0")
VERSION = tfds.core.Version("1.0.1")
RELEASE_NOTES = {
"1.0.0": "Initial release.",
"1.0.1": "Updated green screen coordinates so a patch appears static in each video.",
}

def _info(self) -> tfds.core.DatasetInfo:
Expand Down Expand Up @@ -135,4 +136,4 @@ def create_gs_coords(gs_coords_files):
for f in gs_coords_files:
gs_coords.append(np.load(f))

return np.array(gs_coords, dtype=np.int)
return np.array(gs_coords, dtype=int)
7 changes: 4 additions & 3 deletions armory/data/adversarial/carla_mot_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,15 +22,16 @@
}
"""

_URLS = "https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_mot_test_1.0.0.tar.gz"
_URLS = "https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_mot_test_1.0.1.tar.gz"


class CarlaMOTTest(tfds.core.GeneratorBasedBuilder):
"""DatasetBuilder for carla_mot_test dataset."""

VERSION = tfds.core.Version("1.0.0")
VERSION = tfds.core.Version("1.0.1")
RELEASE_NOTES = {
"1.0.0": "Initial release.",
"1.0.1": "Updated green screen coordinates and RGB/instance segmentation misalignment to eliminate patch spatial movement or flickering",
}

def _info(self) -> tfds.core.DatasetInfo:
Expand Down Expand Up @@ -135,4 +136,4 @@ def create_gs_coords(gs_coords_files):
for f in gs_coords_files:
gs_coords.append(np.load(f))

return np.array(gs_coords, dtype=np.int)
return np.array(gs_coords, dtype=int)
5 changes: 3 additions & 2 deletions armory/data/adversarial/carla_over_obj_det_dev.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,17 +24,18 @@
"""

# fmt: off
_URLS = "https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_over_od_dev_2.0.0.tar.gz"
_URLS = "https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_over_od_dev_2.0.1.tar.gz"
# fmt: on


class CarlaOverObjDetDev(tfds.core.GeneratorBasedBuilder):
"""DatasetBuilder for carla_obj_det_dev dataset."""

VERSION = tfds.core.Version("2.0.0")
VERSION = tfds.core.Version("2.0.1")
RELEASE_NOTES = {
"1.0.0": "Eval6 update from CarlaObjDetDev with images collected from overhead perspectives",
"2.0.0": "Eval7 images collected from overhead perspectives, where patches on the sidewalk/street are constrained to +-0.03m depth perturbation and patches located elsewhere are constrained to +-3m",
"2.0.1": "Updated green screen coordinates in select images to fix imperfect patch coverage",
}

def _info(self) -> tfds.core.DatasetInfo:
Expand Down
6 changes: 3 additions & 3 deletions armory/data/adversarial_datasets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -721,7 +721,7 @@ def both_fn(batch):
)

return datasets._generator_from_tfds(
"carla_over_obj_det_dev:2.0.0",
"carla_over_obj_det_dev:2.0.1",
split=split,
batch_size=batch_size,
epochs=epochs,
Expand Down Expand Up @@ -1192,7 +1192,7 @@ def carla_multi_object_tracking_dev(
)

return datasets._generator_from_tfds(
"carla_mot_dev:1.0.0",
"carla_mot_dev:1.0.1",
split=split,
epochs=epochs,
batch_size=batch_size,
Expand Down Expand Up @@ -1253,7 +1253,7 @@ def carla_multi_object_tracking_test(
)

return datasets._generator_from_tfds(
"carla_mot_test:1.0.0",
"carla_mot_test:1.0.1",
split=split,
epochs=epochs,
batch_size=batch_size,
Expand Down
2 changes: 1 addition & 1 deletion armory/data/cached_s3_checksums/carla_mot_dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
armory-public-data carla/carla_mot_dev_cached_1.0.0.tar.gz 678719928 23d80f92c458c7fea20c1dfc209421c58ee006d2c47a6202969957fda496ce83
armory-public-data carla/carla_mot_dev_cached_1.0.1.tar.gz 678720178 3c800b0289a84fea3f11ffa9b5f4cee105cae644223a23532e1b7351560869ed
2 changes: 1 addition & 1 deletion armory/data/cached_s3_checksums/carla_mot_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
armory-public-data carla/carla_mot_test_cached_1.0.0.tar.gz 327822268 1ba37678d8d9e11d97dfbdfccfa5bb833457b137fdb96eff6ed804238fec8494
armory-public-data carla/carla_mot_test_cached_1.0.1.tar.gz 327687101 7d9e3f3cfc59c138727a976fbaeb6209909ba764ef82c5093d1bfbe360529ea0
2 changes: 1 addition & 1 deletion armory/data/cached_s3_checksums/carla_over_obj_det_dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
armory-public-data carla/carla_over_od_dev_cached_2.0.0.tar.gz 62773923 fa991a146afd771f806e050fdcfdf6953667a86acbbc05a3cd9c7d7a51ba92a6
armory-public-data carla/carla_over_od_dev_cached_2.0.1.tar.gz 62773711 2c0ef1c43fbb6235ed10a41ff1c70dfa940ff40d91a94591c716d86b458bcedb
2 changes: 1 addition & 1 deletion armory/data/url_checksums/carla_mot_dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_mot_dev_1.0.0.tar.gz 704303119 cdd4be9cd3bcb5c2f94a6628350f106deec6fdc7b6a9c05711309b2bcc814f3d
https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_mot_dev_1.0.1.tar.gz 704302804 439c93a85f65acccd1368e2bc6a9d9c30e6253642bdc8bb676da9d2667564acd
2 changes: 1 addition & 1 deletion armory/data/url_checksums/carla_mot_test.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_mot_test_1.0.0.tar.gz 342710393 a4adbfae4c3d0c887ffa7b9605901deb142b7001bef7eb13e8ba21504fbf2453
carla_mot_test_1.0.1.tar.gz 342551271 4ea53820553f17d90bfb97c92631e71f6155915d5c3d9319f83ad66251ce54d3
2 changes: 1 addition & 1 deletion armory/data/url_checksums/carla_over_obj_det_dev.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_over_od_dev_2.0.0.tar.gz 64846940 248a04c61c8dc96f8bfd62e4a0977973b77962fdd64685ee7e4327e82c80140f
https://armory-public-data.s3.us-east-2.amazonaws.com/carla/carla_over_od_dev_2.0.1.tar.gz 64846910 499cd578a8c9ebb4dc2b8578e9ae3ac89c60bd57d55250327f683e164944a749