habitat-lab tutorial (facebookresearch#445)

* habitat-lab tutoriall * Make tutorial runnable * Added unit testing framework * Fix black formatting in tests * Hacky fix * Try to properly guard everything * linter changes * Fix .circleci * Fix env indent * Fix typo * Fix flatten to modern version * Fix envs * Undo pre-commit changes * make cat path relative * Fix flake8 errors * Rename tutorial * add missing files * Fix Habitat Interactive Tasks Co-authored-by: Aaron Gokaslan <[email protected]>
mfkiwl · Aug 23, 2020 · 1120195 · 1120195
1 parent 358969e
commit 1120195
Show file tree

Hide file tree

Showing 8 changed files with 1,024 additions and 12 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -20,8 +20,8 @@ jobs:
       - run:
           name: run black
           command: |
-              black habitat/. habitat_baselines/. examples/. test/. setup.py --diff
-              black habitat/. habitat_baselines/. examples/. test/. setup.py --check
+              black --exclude '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|_build|buck-out|build|dist)|examples/tutorials/(colabs|nb_python)' habitat/. habitat_baselines/. examples/. test/. setup.py --diff
+              black --exclude '/(\.eggs|\.git|\.hg|\.mypy_cache|\.nox|\.tox|\.venv|_build|buck-out|build|dist)|examples/tutorials/(colabs|nb_python)' habitat/. habitat_baselines/. examples/. test/. setup.py --check
       - run:
           name: run isort
           command: |

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -56,7 +56,7 @@ repos:
     -   id: jupytext-sync
         name: Sync scripts and notebooks
         files: '^examples/tutorials/(colabs|nb_python)/(.*\.py|.*\.ipynb)$'
-        entry: jupytext --update-metadata '{"jupytext":{"notebook_metadata_filter":"all", "cell_metadata_filter":"-all"}, "accelerator":"GPU"}' --set-formats 'nb_python//py:percent,colabs//ipynb' --pipe black --pipe "sed s/[[:space:]]*\#[[:space:]]\%\%/\#\%\%/g" --pipe 'isort -' --pipe-fmt 'py:percent' --sync
+        entry: jupytext --update-metadata '{"jupytext":{"notebook_metadata_filter":"all", "cell_metadata_filter":"-all"}, "accelerator":"GPU"}' --set-formats 'nb_python//py:percent,colabs//ipynb' --pipe black --pipe "sed s/[[:space:]]*\#[[:space:]]\%\%/\#\%\%/g"  --pipe 'isort -' --pipe-fmt 'py:percent' --sync
         pass_filenames: true
         additional_dependencies:
             - 'jupytext==1.5.2'

diff --git a/examples/tutorials/colabs/Habitat_Interactive_Tasks.ipynb b/examples/tutorials/colabs/Habitat_Interactive_Tasks.ipynb
@@ -411,12 +411,14 @@
     "    # Object's initial position 3m away from the agent.\n",
     "    object_id = sim.add_object_by_handle(chair_attr.handle)\n",
     "    set_object_in_front_of_agent(sim, object_id, -3.0)\n",
-    "    sim.set_object_motion_type(habitat_sim.MotionType.STATIC, object_id)\n",
+    "    sim.set_object_motion_type(\n",
+    "        habitat_sim.physics.MotionType.STATIC, object_id\n",
+    "    )\n",
     "\n",
     "    # Object's final position 7m away from the agent\n",
     "    goal_id = sim.add_object_by_handle(chair_attr.handle)\n",
     "    set_object_in_front_of_agent(sim, goal_id, -7.0)\n",
-    "    sim.set_object_motion_type(habitat_sim.MotionType.STATIC, goal_id)\n",
+    "    sim.set_object_motion_type(habitat_sim.physics.MotionType.STATIC, goal_id)\n",
     "\n",
     "    return object_id, goal_id\n",
     "\n",
@@ -785,7 +787,9 @@
     "    print(f\"Chair's object id is {object_id}\")\n",
     "\n",
     "    set_object_in_front_of_agent(sim, object_id, -1.5)\n",
-    "    sim.set_object_motion_type(habitat_sim.MotionType.STATIC, object_id)\n",
+    "    sim.set_object_motion_type(\n",
+    "        habitat_sim.physics.MotionType.STATIC, object_id\n",
+    "    )\n",
     "    if make_video:\n",
     "        # Visualize the agent's initial position\n",
     "        simulate_and_make_vid(\n",