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.

Sign up for GitHub

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

Jump to bottom

Add new resolvers oc.dict.keys and oc.dict.values #644

Merged
merged 19 commits into from
Apr 11, 2021
Merged

Add new resolvers oc.dict.keys and oc.dict.values #644

merged 19 commits into from
Apr 11, 2021

Commits on Apr 10, 2021

  1. Refactor: move built-in resolvers to built_in_resolvers.py 

    No functional change
    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    80371a6 View commit details
    Browse the repository at this point in the history

  2. Refactor: move functions around in built_in_resolvers.py 

    No functional change
    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    afb7f8d View commit details
    Browse the repository at this point in the history

  3. Add new resolvers oc.dict.keys and oc.dict.values 

    Fixes omry#643
    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    3d77807 View commit details
    Browse the repository at this point in the history

  4. Improvements to oc.dict.{keys,values} 

    * Can now take a string as input for convenience
* The output is always a ListConfig, whose parent is the parent of the
  node being processed
    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    aa49502 View commit details
    Browse the repository at this point in the history

  5. Un-factorize some code

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    5024744 View commit details
    Browse the repository at this point in the history

  6. Add tests for missing values

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    34a33b3 View commit details
    Browse the repository at this point in the history

  7. Clarify comments in doc

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    62e0bd4 View commit details
    Browse the repository at this point in the history

  8. Refactor some tests

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    19954b5 View commit details
    Browse the repository at this point in the history

  9. More tests refactoring

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    5fc2630 View commit details
    Browse the repository at this point in the history

  10. New implementation of oc.dict.values based on interpolations 

    Of particular note:

* When the result of an interpolation is a node whose parent is the
  current node's parent, but has no key, then we set its key to the
  current node's key. This makes it possible to use its full key as an
  identifier.

* _get_and_validate_dict_input() now properly raises an exception if the
  desired key does not exist
    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    ac6a329 View commit details
    Browse the repository at this point in the history

  11. Add test for merging into a resolver's output

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    26b2372 View commit details
    Browse the repository at this point in the history

  12. Update omegaconf/built_in_resolvers.py 

    Co-authored-by: Omry Yadan <omry@fb.com>
    @odelalleau @omry
    odelalleau and omry committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    890017c View commit details
    Browse the repository at this point in the history

  13. Update doc to show interpolations for oc.dict.values

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    89496b0 View commit details
    Browse the repository at this point in the history

  14. Clearer error when trying to use a relative interpolation

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    b0fadcd View commit details
    Browse the repository at this point in the history

  15. Only support the select syntax in oc.dict.{keys,values}

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    7541343 View commit details
    Browse the repository at this point in the history

  16. Update tests and documentation 

    Plus some additional code clean-up.
    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    ce794a6 View commit details
    Browse the repository at this point in the history

  17. Update doc

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    5692ed9 View commit details
    Browse the repository at this point in the history

  18. Update news item

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    517b852 View commit details
    Browse the repository at this point in the history

  19. Small code simplification

    @odelalleau
    odelalleau committed Apr 10, 2021
    Configuration menu
    Copy the full SHA
    d1a4ef7 View commit details
    Browse the repository at this point in the history