Merge remote-tracking branch 'upstream/master' into detr-push-3

356c98bd · Kaushik Shivakumar · d31aba8a · b9785623 · d31aba8a · d31aba8a
Commit 356c98bd authored Aug 07, 2020 by Kaushik Shivakumar
20 changed files
--- a/research/cognitive_mapping_and_planning/datasets/factory.py
+++ b/research/cognitive_mapping_and_planning/datasets/factory.py
--- a/research/cognitive_mapping_and_planning/datasets/nav_env.py
+++ b/research/cognitive_mapping_and_planning/datasets/nav_env.py
--- a/research/cognitive_mapping_and_planning/datasets/nav_env_config.py
+++ b/research/cognitive_mapping_and_planning/datasets/nav_env_config.py
--- a/research/cognitive_mapping_and_planning/matplotlibrc
+++ b/research/cognitive_mapping_and_planning/matplotlibrc
--- a/research/cognitive_mapping_and_planning/output/.gitignore
+++ b/research/cognitive_mapping_and_planning/output/.gitignore
--- a/research/cognitive_mapping_and_planning/output/README.md
+++ b/research/cognitive_mapping_and_planning/output/README.md
--- a/research/cognitive_mapping_and_planning/patches/GLES2_2_0.py.patch
+++ b/research/cognitive_mapping_and_planning/patches/GLES2_2_0.py.patch
--- a/research/cognitive_mapping_and_planning/patches/apply_patches.sh
+++ b/research/cognitive_mapping_and_planning/patches/apply_patches.sh
--- a/research/cognitive_mapping_and_planning/patches/ctypesloader.py.patch
+++ b/research/cognitive_mapping_and_planning/patches/ctypesloader.py.patch
--- a/research/cognitive_mapping_and_planning/render/__init__.py
+++ b/research/cognitive_mapping_and_planning/render/__init__.py
--- a/research/cognitive_mapping_and_planning/render/depth_rgb_encoded.fp
+++ b/research/cognitive_mapping_and_planning/render/depth_rgb_encoded.fp
--- a/research/cognitive_mapping_and_planning/render/depth_rgb_encoded.vp
+++ b/research/cognitive_mapping_and_planning/render/depth_rgb_encoded.vp
--- a/research/cognitive_mapping_and_planning/render/rgb_flat_color.fp
+++ b/research/cognitive_mapping_and_planning/render/rgb_flat_color.fp
--- a/research/cognitive_mapping_and_planning/render/rgb_flat_color.vp
+++ b/research/cognitive_mapping_and_planning/render/rgb_flat_color.vp
--- a/research/cognitive_mapping_and_planning/render/swiftshader_renderer.py
+++ b/research/cognitive_mapping_and_planning/render/swiftshader_renderer.py
--- a/research/cognitive_mapping_and_planning/requirements.txt
+++ b/research/cognitive_mapping_and_planning/requirements.txt
--- a/research/cognitive_mapping_and_planning/scripts/__init__.py
+++ b/research/cognitive_mapping_and_planning/scripts/__init__.py
--- a/research/cognitive_mapping_and_planning/scripts/script_distill.py
+++ b/research/cognitive_mapping_and_planning/scripts/script_distill.py
--- a/research/cognitive_mapping_and_planning/scripts/script_download_init_models.sh
+++ b/research/cognitive_mapping_and_planning/scripts/script_download_init_models.sh
--- a/research/cognitive_mapping_and_planning/scripts/script_env_vis.py
+++ b/research/cognitive_mapping_and_planning/scripts/script_env_vis.py