From 39162642454aaa18d9954ca8bbbf5a7b012bedc6 Mon Sep 17 00:00:00 2001 From: "charles.ochoa" Date: Tue, 11 Oct 2022 19:01:49 +0000 Subject: [PATCH] fix: ci fixes --- dgp/contribs/dgp2wicker/Dockerfile | 1 + dgp/contribs/dgp2wicker/{readme.md => README.md} | 10 ++++++---- dgp/contribs/dgp2wicker/dgp2wicker/dataset.py | 2 +- dgp/contribs/dgp2wicker/dgp2wicker/ingest.py | 6 +++--- dgp/contribs/dgp2wicker/setup.py | 4 ++-- 5 files changed, 13 insertions(+), 10 deletions(-) rename dgp/contribs/dgp2wicker/{readme.md => README.md} (82%) diff --git a/dgp/contribs/dgp2wicker/Dockerfile b/dgp/contribs/dgp2wicker/Dockerfile index f4c73f91..63478485 100644 --- a/dgp/contribs/dgp2wicker/Dockerfile +++ b/dgp/contribs/dgp2wicker/Dockerfile @@ -1,3 +1,4 @@ +# Copyright 2022 Woven Planet. All rights reserved. FROM dgp:latest RUN apt-get update && apt-get install -y --allow-downgrades --allow-change-held-packages --no-install-recommends \ diff --git a/dgp/contribs/dgp2wicker/readme.md b/dgp/contribs/dgp2wicker/README.md similarity index 82% rename from dgp/contribs/dgp2wicker/readme.md rename to dgp/contribs/dgp2wicker/README.md index 42ca0b0a..3e5f4c3b 100644 --- a/dgp/contribs/dgp2wicker/readme.md +++ b/dgp/contribs/dgp2wicker/README.md @@ -1,6 +1,7 @@ # DGP SynchronizedScene to Wicker Conversion -This adds support for using DGP data in [wicker](https://github.com/woven-planet/wicker) +This adds support for using DGP data in +[wicker](https://github.com/woven-planet/wicker) Specifically this saves the output of SynchronizedScene to wicker @@ -13,9 +14,10 @@ cd dgp/contribs/dgp2wicker pip install --editable . ``` -or, use the included docker. -Note: the s3 location of the wicker datasets is specified in a required wicker config file, please see Wicker documentaiton for more details. An example sample_wickerconfig.json is included in the docker, this can be modified -with the s3 bucket path and will work with the docker. +or, use the included docker. Note: the s3 location of the wicker datasets is +specified in a required wicker config file, please see Wicker documentaiton for +more details. An example sample_wickerconfig.json is included in the docker, +this can be modified with the s3 bucket path and will work with the docker. ```bash cd dgp/contribs/dgp2wicker diff --git a/dgp/contribs/dgp2wicker/dgp2wicker/dataset.py b/dgp/contribs/dgp2wicker/dgp2wicker/dataset.py index 1e285e87..24ceaed7 100644 --- a/dgp/contribs/dgp2wicker/dgp2wicker/dataset.py +++ b/dgp/contribs/dgp2wicker/dgp2wicker/dataset.py @@ -221,7 +221,7 @@ def __getitem__(self, index: int) -> List[Dict[str, Dict[str, Any]]]: A context window with samples as dicts keyed by datum name. """ wicker_samples = self.wicker_sample_index[index] - idx = wicker_samples[0] + context = [] for idx in wicker_samples: raw = super().__getitem__(idx) diff --git a/dgp/contribs/dgp2wicker/dgp2wicker/ingest.py b/dgp/contribs/dgp2wicker/dgp2wicker/ingest.py index d5d62fe4..ae1d3147 100644 --- a/dgp/contribs/dgp2wicker/dgp2wicker/ingest.py +++ b/dgp/contribs/dgp2wicker/dgp2wicker/ingest.py @@ -342,13 +342,13 @@ def ingest_dgp_to_wicker( skip_camera_cuboids: bool, default: True Optional to flag to skip converting 'bounding_box_3d' for image_datum types. - num_partitions: int, default=None + num_partitions: int, default: None Number of partitions to map scenes over. If None, defaults to number of scenes - num_repartitions: int, default=None + num_repartitions: int, default: None Number of partitions to shuffle all samples over. If none, defaults to num_scenes*5 - is_pd: bool, default=False + is_pd: bool, default: False Flag to indicate if the dataset to laod is a Parallel Domain dataset. If true, the scenes will be loaded with ParallelDomainScene with use_virtual_cameras set to False. diff --git a/dgp/contribs/dgp2wicker/setup.py b/dgp/contribs/dgp2wicker/setup.py index 60f7f3b5..a0275702 100644 --- a/dgp/contribs/dgp2wicker/setup.py +++ b/dgp/contribs/dgp2wicker/setup.py @@ -24,7 +24,7 @@ def run(self): with open('requirements.txt', 'r', encoding='utf-8') as f: requirements = f.read().splitlines() -with open('readme.md', 'r', encoding='utf-8') as f: +with open('README.md', 'r', encoding='utf-8') as f: readme = f.read() packages = find_packages(exclude=['tests']) @@ -32,7 +32,7 @@ def run(self): name="dgp2wicker", version=__version__, description="Tools to convert TRI's DGP to L5's Wicker format.", - long_description= readme, + long_description=readme, long_description_content_type='text/markdown', author="Chris Ochoa, Kuan Lee", author_email='charles.ochoa@woven-planet.global, kuan-hui.lee@woven-planet.global',