From 55d715068e8e10629bf84fa459536e66c0894928 Mon Sep 17 00:00:00 2001 From: Alexander William Clegg Date: Wed, 2 Mar 2022 12:18:52 -0800 Subject: [PATCH 1/3] update downloader for ReplicaCAD and baked ReplicaCAD to v1.3 --- src_python/habitat_sim/utils/datasets_download.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src_python/habitat_sim/utils/datasets_download.py b/src_python/habitat_sim/utils/datasets_download.py index 522ca9533a..386d53068a 100644 --- a/src_python/habitat_sim/utils/datasets_download.py +++ b/src_python/habitat_sim/utils/datasets_download.py @@ -95,16 +95,16 @@ def initialize_test_data_sources(data_path): "version": "1.0", }, "replica_cad_dataset": { - "source": "https://dl.fbaipublicfiles.com/habitat/ReplicaCAD/ReplicaCAD_dataset_v1.2.zip", - "package_name": "ReplicaCAD_dataset_v1.2.zip", + "source": "https://dl.fbaipublicfiles.com/habitat/ReplicaCAD/ReplicaCAD_dataset_v1.3.zip", + "package_name": "ReplicaCAD_dataset_v1.3.zip", "link": data_path + "replica_cad", - "version": "1.2", + "version": "1.3", }, "replica_cad_baked_lighting": { - "source": "https://dl.fbaipublicfiles.com/habitat/ReplicaCAD/ReplicaCAD_baked_lighting_v1.1.zip", - "package_name": "ReplicaCAD_baked_lighting_v1.1.zip", + "source": "https://dl.fbaipublicfiles.com/habitat/ReplicaCAD/ReplicaCAD_baked_lighting_v1.3.zip", + "package_name": "ReplicaCAD_baked_lighting_v1.3.zip", "link": data_path + "replica_cad_baked_lighting", - "version": "1.1", + "version": "1.3", }, "ycb": { "source": "https://dl.fbaipublicfiles.com/habitat/ycb/hab_ycb_v1.1.zip", From 5a9129a91d5bf199f20966eb9598f13a5065eff9 Mon Sep 17 00:00:00 2001 From: Alexander William Clegg Date: Thu, 3 Mar 2022 08:29:47 -0800 Subject: [PATCH 2/3] change quickstart default scene to "apt_1" --- examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb | 2 +- examples/tutorials/nb_python/ReplicaCAD_quickstart.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb b/examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb index 69c478a4a8..34a40e8c20 100644 --- a/examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb +++ b/examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb @@ -269,7 +269,7 @@ " scene_handles = metadata_mediator.get_scene_handles()\n", " # If not using widgets, set as first available handle\n", " if not HAS_WIDGETS:\n", - " selected_scene = scene_handles[0]\n", + " selected_scene = \"apt_1\"\n", " return\n", "\n", " # Build widgets\n", diff --git a/examples/tutorials/nb_python/ReplicaCAD_quickstart.py b/examples/tutorials/nb_python/ReplicaCAD_quickstart.py index d2fdeae524..d82ffe39d7 100644 --- a/examples/tutorials/nb_python/ReplicaCAD_quickstart.py +++ b/examples/tutorials/nb_python/ReplicaCAD_quickstart.py @@ -252,7 +252,7 @@ def build_widget_ui(metadata_mediator): scene_handles = metadata_mediator.get_scene_handles() # If not using widgets, set as first available handle if not HAS_WIDGETS: - selected_scene = scene_handles[0] + selected_scene = "apt_1" return # Build widgets From 84c7324113dbee686e01bdaac703b20978565058 Mon Sep 17 00:00:00 2001 From: Alexander William Clegg Date: Thu, 3 Mar 2022 08:46:58 -0800 Subject: [PATCH 3/3] Revert "change quickstart default scene to "apt_1"" This reverts commit 5a9129a91d5bf199f20966eb9598f13a5065eff9. --- examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb | 2 +- examples/tutorials/nb_python/ReplicaCAD_quickstart.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb b/examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb index 34a40e8c20..69c478a4a8 100644 --- a/examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb +++ b/examples/tutorials/colabs/ReplicaCAD_quickstart.ipynb @@ -269,7 +269,7 @@ " scene_handles = metadata_mediator.get_scene_handles()\n", " # If not using widgets, set as first available handle\n", " if not HAS_WIDGETS:\n", - " selected_scene = \"apt_1\"\n", + " selected_scene = scene_handles[0]\n", " return\n", "\n", " # Build widgets\n", diff --git a/examples/tutorials/nb_python/ReplicaCAD_quickstart.py b/examples/tutorials/nb_python/ReplicaCAD_quickstart.py index d82ffe39d7..d2fdeae524 100644 --- a/examples/tutorials/nb_python/ReplicaCAD_quickstart.py +++ b/examples/tutorials/nb_python/ReplicaCAD_quickstart.py @@ -252,7 +252,7 @@ def build_widget_ui(metadata_mediator): scene_handles = metadata_mediator.get_scene_handles() # If not using widgets, set as first available handle if not HAS_WIDGETS: - selected_scene = "apt_1" + selected_scene = scene_handles[0] return # Build widgets