Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Config system improvements: compositional config, added scenes_dir, removed config_dir, fixed eqa test #77

Merged
merged 17 commits into from
Apr 30, 2019

Conversation

mathfac
Copy link
Contributor

@mathfac mathfac commented Apr 28, 2019

Caution: with this change all config paths will be specified in new way: tasks/poingoal.yaml => configs/tasks/pointgoal.yaml

How Has This Been Tested

pytest
black . --line-length 79;mypy . --ignore-missing-imports;pycodestyle;flake8

============================================================================================================ test session starts =============================================================================================================
platform linux -- Python 3.6.4, pytest-4.4.1, py-1.5.2, pluggy-0.9.0
rootdir: /private/home/maksymets/habitat-api, inifile: setup.cfg, testpaths: test
plugins: xdist-1.25.0, forked-0.2
collected 37 items

test/test_baseline_agents.py ..                                                                                                                                                                                                        [  5%]
test/test_config.py .                                                                                                                                                                                                                  [  8%]
test/test_dataset.py .........                                                                                                                                                                                                         [ 32%]
test/test_habitat_env.py .........s                                                                                                                                                                                                    [ 59%]
test/test_habitat_example.py ...                                                                                                                                                                                                       [ 67%]
test/test_install.py .                                                                                                                                                                                                                 [ 70%]
test/test_mp3d_eqa.py ...                                                                                                                                                                                                              [ 78%]
test/test_pointnav_dataset.py ...                                                                                                                                                                                                      [ 86%]
test/test_sensors.py ...                                                                                                                                                                                                               [ 94%]
test/test_trajectory_sim.py ..                                                                                                                                                                                                         [100%]
========================================================================================================== short test summary info ===========================================================================================================
SKIPPED [1] test/test_habitat_env.py:318: unconditional skip

=================================================================================================== 36 passed, 1 skipped in 210.82 seconds ===================================================================================================

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • New feature (non-breaking change which adds functionality)
  • Breaking change (fix or feature that would cause existing functionality to change)

Checklist

  • My code follows the code style of this project.
  • My change requires a change to the documentation.
  • I have updated the documentation accordingly.
  • I have read the CONTRIBUTING document.
  • I have completed my CLA (see CONTRIBUTING)
  • I have added tests to cover my changes.
  • All new and existing tests passed.

@facebook-github-bot facebook-github-bot added the CLA Signed Do not delete this pull request or issue due to inactivity. label Apr 28, 2019
baselines/agents/slam_agents.py Outdated Show resolved Hide resolved
baselines/agents/slam_agents.py Outdated Show resolved Hide resolved
baselines/config/default.py Outdated Show resolved Hide resolved
def get_config(
config_file: Optional[str] = None, config_dir: str = DEFAULT_CONFIG_DIR
) -> CN:
def get_config(config_file: Optional[str] = None) -> CN:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Same comment/feelings about this function as above.

habitat/datasets/pointnav/pointnav_dataset.py Show resolved Hide resolved
test/test_mp3d_eqa.py Outdated Show resolved Hide resolved
… options, added EQA dataset changes, adopted quaternion suggestion
@mathfac
Copy link
Contributor Author

mathfac commented Apr 29, 2019

Addressed the comments. Added support of config list, corrected scene_path, added overwriting options, added EQA dataset changes, adopted quaternion suggestion. Retested:

======================================================================================================================================================= test session starts =======================================================================================================================================================
platform linux -- Python 3.6.4, pytest-4.4.1, py-1.5.2, pluggy-0.9.0
rootdir: /private/home/maksymets/habitat-api, inifile: setup.cfg, testpaths: test
plugins: xdist-1.25.0, forked-0.2
collected 38 items

test/test_baseline_agents.py ..                                                                                                                                                                                                                                                                                             [  5%]
test/test_config.py ..                                                                                                                                                                                                                                                                                                      [ 10%]
test/test_dataset.py .........                                                                                                                                                                                                                                                                                              [ 34%]
test/test_habitat_env.py .........s                                                                                                                                                                                                                                                                                         [ 60%]
test/test_habitat_example.py ...                                                                                                                                                                                                                                                                                            [ 68%]
test/test_install.py .                                                                                                                                                                                                                                                                                                      [ 71%]
test/test_mp3d_eqa.py ...                                                                                                                                                                                                                                                                                                   [ 78%]
test/test_pointnav_dataset.py ...                                                                                                                                                                                                                                                                                           [ 86%]
test/test_sensors.py ...                                                                                                                                                                                                                                                                                                    [ 94%]
test/test_trajectory_sim.py ..                                                                                                                                                                                                                                                                                              [100%]
===================================================================================================================================================== short test summary info =====================================================================================================================================================
SKIPPED [1] test/test_habitat_env.py:318: unconditional skip

============================================================================================================================================= 37 passed, 1 skipped in 176.51 seconds ==============================================================================================================================================

brucecui97 pushed a commit to brucecui97/habitat-api that referenced this pull request May 16, 2019
…emoved config_dir, fixed eqa test (facebookresearch#77)

* Added scenes_dir parameter to Config to have no requirement of data symlink or data directory in working directory. scenes_dir will be used as prefix for scene_id during episodes dataset loading.
* Added overwriting options argument to get_config that unblocks parameter sweeping and experimentation capabilities from command line
* config_file path can be comma separated list of configs that will be merged in exact order. That will help to use separate configs for dataset specification and sensors setups. String with commas was chosen because that make it easy to pass list of configs as script argument.
* To make habitat-api easier to as package we decided to get rid of forcing loading of configs from config_dir param
* fixed unit test caused by latest habitat-sim update
* Added support of config list, corrected scene_path, added overwriting options, added EQA dataset changes, adopted quaternion suggestion
* Fixed headers
@erikwijmans erikwijmans deleted the config_impr branch May 18, 2019 22:24
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CLA Signed Do not delete this pull request or issue due to inactivity.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants