hwlocality

9f03dbd4 - Refactor to help the test predict the child set