Minor readability improvements

examples.ipynb

@@ -14,7 +14,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 1,
    "metadata": {},
    "outputs": [
     {
@@ -22,110 +22,20 @@
      "output_type": "stream",
      "text": [
       "Sample csvps-val/000030\n",
-      "{'frames': {'is_annotated': [False, False, False, False, True, False, False,\n",
-      "                             False, False, True, False, False, False, False,\n",
-      "                             True, False, False, False, False, True, False,\n",
-      "                             False, False, False, True, False, False, False,\n",
-      "                             False, True],\n",
-      "            'number': ['000000', '000001', '000002', '000003', '000004',\n",
-      "                       '000005', '000006', '000007', '000008', '000009',\n",
-      "                       '000010', '000011', '000012', '000013', '000014',\n",
-      "                       '000015', '000016', '000017', '000018', '000019',\n",
-      "                       '000020', '000021', '000022', '000023', '000024',\n",
-      "                       '000025', '000026', '000027', '000028', '000029'],\n",
-      "            'primary_key': ['lindau_000037_000000', 'lindau_000037_000001',\n",
-      "                            'lindau_000037_000002', 'lindau_000037_000003',\n",
-      "                            'lindau_000037_000004', 'lindau_000037_000005',\n",
-      "                            'lindau_000037_000006', 'lindau_000037_000007',\n",
-      "                            'lindau_000037_000008', 'lindau_000037_000009',\n",
-      "                            'lindau_000037_000010', 'lindau_000037_000011',\n",
-      "                            'lindau_000037_000012', 'lindau_000037_000013',\n",
-      "                            'lindau_000037_000014', 'lindau_000037_000015',\n",
-      "                            'lindau_000037_000016', 'lindau_000037_000017',\n",
-      "                            'lindau_000037_000018', 'lindau_000037_000019',\n",
-      "                            'lindau_000037_000020', 'lindau_000037_000021',\n",
-      "                            'lindau_000037_000022', 'lindau_000037_000023',\n",
-      "                            'lindau_000037_000024', 'lindau_000037_000025',\n",
-      "                            'lindau_000037_000026', 'lindau_000037_000027',\n",
-      "                            'lindau_000037_000028', 'lindau_000037_000029'],\n",
-      "            'timestamps': [0, 58925424, 117850824, 176776224, 235701592,\n",
-      "                           294627064, 353552488, 412478000, 471403416,\n",
-      "                           530328888, 589254288, 648179664, 707105072,\n",
-      "                           766030408, 824955840, 883881184, 942806640,\n",
-      "                           1001732056, 1060657528, 1119582984, 1178508320,\n",
-      "                           1237433744, 1296359088, 1355284520, 1414209856,\n",
-      "                           1473135304, 1532060720, 1590986120, 1649911576,\n",
-      "                           1708836952]}}\n",
+      "['000000', '000001', '000002', '000003', '000004', '000005', '000006', '000007',\n",
+      " '000008', '000009', '000010', '000011', '000012', '000013', '000014', '000015',\n",
+      " '000016', '000017', '000018', '000019', '000020', '000021', '000022', '000023',\n",
+      " '000024', '000025', '000026', '000027', '000028', '000029']\n",
       "Sample csvps-val/000031\n",
-      "{'frames': {'is_annotated': [False, False, False, False, True, False, False,\n",
-      "                             False, False, True, False, False, False, False,\n",
-      "                             True, False, False, False, False, True, False,\n",
-      "                             False, False, False, True, False, False, False,\n",
-      "                             False, True],\n",
-      "            'number': ['000000', '000001', '000002', '000003', '000004',\n",
-      "                       '000005', '000006', '000007', '000008', '000009',\n",
-      "                       '000010', '000011', '000012', '000013', '000014',\n",
-      "                       '000015', '000016', '000017', '000018', '000019',\n",
-      "                       '000020', '000021', '000022', '000023', '000024',\n",
-      "                       '000025', '000026', '000027', '000028', '000029'],\n",
-      "            'primary_key': ['lindau_000047_000000', 'lindau_000047_000001',\n",
-      "                            'lindau_000047_000002', 'lindau_000047_000003',\n",
-      "                            'lindau_000047_000004', 'lindau_000047_000005',\n",
-      "                            'lindau_000047_000006', 'lindau_000047_000007',\n",
-      "                            'lindau_000047_000008', 'lindau_000047_000009',\n",
-      "                            'lindau_000047_000010', 'lindau_000047_000011',\n",
-      "                            'lindau_000047_000012', 'lindau_000047_000013',\n",
-      "                            'lindau_000047_000014', 'lindau_000047_000015',\n",
-      "                            'lindau_000047_000016', 'lindau_000047_000017',\n",
-      "                            'lindau_000047_000018', 'lindau_000047_000019',\n",
-      "                            'lindau_000047_000020', 'lindau_000047_000021',\n",
-      "                            'lindau_000047_000022', 'lindau_000047_000023',\n",
-      "                            'lindau_000047_000024', 'lindau_000047_000025',\n",
-      "                            'lindau_000047_000026', 'lindau_000047_000027',\n",
-      "                            'lindau_000047_000028', 'lindau_000047_000029'],\n",
-      "            'timestamps': [0, 58925416, 117850784, 176776216, 235701560,\n",
-      "                           294627000, 353552352, 412477776, 471403168,\n",
-      "                           530328552, 589253984, 648179336, 707104784,\n",
-      "                           766030160, 824955608, 883880992, 942806400,\n",
-      "                           1001731832, 1060657200, 1119582648, 1178508008,\n",
-      "                           1237433456, 1296358824, 1355284248, 1414209648,\n",
-      "                           1473135024, 1532060464, 1590985824, 1649911272,\n",
-      "                           1708836624]}}\n",
+      "['000000', '000001', '000002', '000003', '000004', '000005', '000006', '000007',\n",
+      " '000008', '000009', '000010', '000011', '000012', '000013', '000014', '000015',\n",
+      " '000016', '000017', '000018', '000019', '000020', '000021', '000022', '000023',\n",
+      " '000024', '000025', '000026', '000027', '000028', '000029']\n",
       "Sample csvps-val/000032\n",
-      "{'frames': {'is_annotated': [False, False, False, False, True, False, False,\n",
-      "                             False, False, True, False, False, False, False,\n",
-      "                             True, False, False, False, False, True, False,\n",
-      "                             False, False, False, True, False, False, False,\n",
-      "                             False, True],\n",
-      "            'number': ['000000', '000001', '000002', '000003', '000004',\n",
-      "                       '000005', '000006', '000007', '000008', '000009',\n",
-      "                       '000010', '000011', '000012', '000013', '000014',\n",
-      "                       '000015', '000016', '000017', '000018', '000019',\n",
-      "                       '000020', '000021', '000022', '000023', '000024',\n",
-      "                       '000025', '000026', '000027', '000028', '000029'],\n",
-      "            'primary_key': ['lindau_000057_000000', 'lindau_000057_000001',\n",
-      "                            'lindau_000057_000002', 'lindau_000057_000003',\n",
-      "                            'lindau_000057_000004', 'lindau_000057_000005',\n",
-      "                            'lindau_000057_000006', 'lindau_000057_000007',\n",
-      "                            'lindau_000057_000008', 'lindau_000057_000009',\n",
-      "                            'lindau_000057_000010', 'lindau_000057_000011',\n",
-      "                            'lindau_000057_000012', 'lindau_000057_000013',\n",
-      "                            'lindau_000057_000014', 'lindau_000057_000015',\n",
-      "                            'lindau_000057_000016', 'lindau_000057_000017',\n",
-      "                            'lindau_000057_000018', 'lindau_000057_000019',\n",
-      "                            'lindau_000057_000020', 'lindau_000057_000021',\n",
-      "                            'lindau_000057_000022', 'lindau_000057_000023',\n",
-      "                            'lindau_000057_000024', 'lindau_000057_000025',\n",
-      "                            'lindau_000057_000026', 'lindau_000057_000027',\n",
-      "                            'lindau_000057_000028', 'lindau_000057_000029'],\n",
-      "            'timestamps': [0, 58925896, 117851752, 176777576, 235703424,\n",
-      "                           294629232, 353555104, 412480888, 471406760,\n",
-      "                           530332656, 589258512, 648184360, 707110176,\n",
-      "                           766036096, 824961936, 883887864, 942813704,\n",
-      "                           1001739592, 1060665480, 1119591288, 1178517152,\n",
-      "                           1237442936, 1296368816, 1355294616, 1414220496,\n",
-      "                           1473146352, 1532072200, 1590998064, 1649923840,\n",
-      "                           1708849704]}}\n"
+      "['000000', '000001', '000002', '000003', '000004', '000005', '000006', '000007',\n",
+      " '000008', '000009', '000010', '000011', '000012', '000013', '000014', '000015',\n",
+      " '000016', '000017', '000018', '000019', '000020', '000021', '000022', '000023',\n",
+      " '000024', '000025', '000026', '000027', '000028', '000029']\n"
      ]
     }
    ],
@@ -144,7 +54,7 @@
     "for i, sample in enumerate(ds):\n",
     "    if i > 2:  \n",
     "        break\n",
-    "    meta_data = json.loads(sample[\"json\"].decode())\n",
+    "    meta_data = json.loads(sample[\"frames.json\"].decode())\n",
     "    print(\"Sample \" + sample[\"__key__\"])\n",
     "    print(pformat(meta_data, compact=True))\n",
     "    "
@@ -161,7 +71,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 13,
+   "execution_count": 2,
    "metadata": {},
    "outputs": [
     {
@@ -170,11 +80,11 @@
      "text": [
       "__key__ (<class 'str'>) csvps-val/000030/000000:000001\n",
       "camera.json (<class 'bytes'>) ...\n",
-      "json (<class 'bytes'>) ...\n",
-      "panoptic.png (<class 'list'>) 2\n",
-      "depth.tiff (<class 'list'>) 2\n",
+      "metadata.json (<class 'list'>) 2\n",
+      "vehicle.json (<class 'list'>) 2\n",
       "image.png (<class 'list'>) 2\n",
-      "vehicle.json (<class 'list'>) 2\n"
+      "panoptic.png (<class 'list'>) 2\n",
+      "depth.tiff (<class 'list'>) 2\n"
      ]
     }
    ],
@@ -182,7 +92,7 @@
     "import collections\n",
     "import itertools\n",
     "\n",
-    "def find_frame_keys(keys):\n",
+    "def find_frame_keys(keys, frames):\n",
     "    r\"\"\"\n",
     "    Returns a mapping from frame number to the keys of the sample that correspond to \n",
     "    that frame.\n",
@@ -196,7 +106,7 @@
     "            meta_keys.add(key)\n",
     "            continue \n",
     "        stem, other = key.split(\".\", 1)\n",
-    "        if stem.isdigit():\n",
+    "        if stem in frames:\n",
     "            frame_keys[stem].append(other)\n",
     "        else:\n",
     "            meta_keys.add(key)\n",
@@ -205,8 +115,9 @@
     "\n",
     "def generate_range(src, length: int = 2, *, missing_ok: bool =True):\n",
     "    for sample in src:\n",
+    "        frames = json.loads(sample.pop(\"frames.json\").decode())\n",
     "        key = sample[\"__key__\"]\n",
-    "        frame_keys, meta_keys = find_frame_keys(sample.keys()) \n",
+    "        frame_keys, meta_keys = find_frame_keys(sample.keys(), frames) \n",
     "        \n",
     "        pair_keys = set(itertools.chain.from_iterable(frame_keys.values()))\n",
     "        meta_data = {key: sample[key] for key in meta_keys}\n",
@@ -252,7 +163,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 14,
+   "execution_count": null,
    "metadata": {},
    "outputs": [
     {

scripts/build.py

@@ -57,6 +57,7 @@ def parse_args():
     ap.add_argument(
         "--splits", nargs="+", default=["train", "val", "test"], help="Splits to build."
     )
+    ap.add_argument("--compression", "-c", default="", help="Compression to use")
 
     # Positional
     ap.add_argument("manifest", type=Path, help="Path to the manifest CSV file.")
@@ -132,6 +133,7 @@ def find_sequence_files(
     *,
     data_dir: Path,
     dataset_name: str,
+    compression: str,
     missing_ok: bool = False,
     frame_inputs: T.Sequence[str] = ("image.png", "vehicle.json"),
     frame_annotations: T.Sequence[str] = ("panoptic.png", "depth.tiff"),
@@ -356,6 +358,7 @@ def main():
             shard_size=args.shard_size,
             dataset_name=f"{args.name}-{split_out}",
             missing_ok=True,
+            compression=args.compression
         )