From 7fcaf6be22177ff796a22b328067c1f6f6e6883f Mon Sep 17 00:00:00 2001 From: brimoor Date: Wed, 28 Jul 2021 09:26:40 -0400 Subject: [PATCH 1/3] removing deprecated move_media flag --- fiftyone/utils/cityscapes.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fiftyone/utils/cityscapes.py b/fiftyone/utils/cityscapes.py index 9350921d7d..a3ce176b45 100644 --- a/fiftyone/utils/cityscapes.py +++ b/fiftyone/utils/cityscapes.py @@ -266,7 +266,7 @@ def _export_split( uuids = sorted(images_map.keys()) logger.info("Finalizing split '%s'...", split) - exporter = foud.FiftyOneDatasetExporter(split_dir, move_media=False) + exporter = foud.FiftyOneDatasetExporter(split_dir) pb = fou.ProgressBar() with exporter, pb: exporter.log_collection(dataset) From b374f591b66b8f50e8440d989ca8d72e88367628 Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Wed, 28 Jul 2021 09:48:11 -0400 Subject: [PATCH 2/3] using correct exporter type --- fiftyone/utils/cityscapes.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/fiftyone/utils/cityscapes.py b/fiftyone/utils/cityscapes.py index a3ce176b45..1618056432 100644 --- a/fiftyone/utils/cityscapes.py +++ b/fiftyone/utils/cityscapes.py @@ -19,6 +19,7 @@ import fiftyone.core.sample as fos import fiftyone.core.utils as fou import fiftyone.utils.data as foud +import fiftyone.types as fot logger = logging.getLogger(__name__) @@ -266,7 +267,7 @@ def _export_split( uuids = sorted(images_map.keys()) logger.info("Finalizing split '%s'...", split) - exporter = foud.FiftyOneDatasetExporter(split_dir) + exporter = foud.LegacyFiftyOneDatasetExporter(split_dir) pb = fou.ProgressBar() with exporter, pb: exporter.log_collection(dataset) From 9841b5e53d5e01e581d5f9c7a7b6ece9bf3a3865 Mon Sep 17 00:00:00 2001 From: Brian Moore Date: Wed, 28 Jul 2021 09:49:37 -0400 Subject: [PATCH 3/3] linting --- fiftyone/utils/data/exporters.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/fiftyone/utils/data/exporters.py b/fiftyone/utils/data/exporters.py index 7a28168bd9..0a803a3c80 100644 --- a/fiftyone/utils/data/exporters.py +++ b/fiftyone/utils/data/exporters.py @@ -1329,7 +1329,6 @@ class LegacyFiftyOneDatasetExporter(GenericSampleDatasetExporter): - ``"move"``: move media files into the export directory - ``"symlink"``: create symlinks to each media file in the export directory - relative_filepaths (True): whether to store relative (True) or absolute (False) filepaths to media files on disk in the output dataset pretty_print (False): whether to render the JSON in human readable @@ -1493,7 +1492,6 @@ class FiftyOneDatasetExporter(BatchDatasetExporter): - ``"move"``: move media files into the export directory - ``"symlink"``: create symlinks to each media file in the export directory - rel_dir (None): a relative directory to remove from the ``filepath`` of each sample, if possible. The path is converted to an absolute path (if necessary) via ``os.path.abspath(os.path.expanduser(rel_dir))``.