Reorganize the hwloc-calc usage
Reorganize the hwloc-calc usage

This commit was SVN r3434.

ggouaillardet/hwloc,shekkbuilder/hwloc,shekkbuilder/hwloc,shekkbuilder/hwloc,ggouaillardet/hwloc,ggouaillardet/hwloc,shekkbuilder/hwloc,ggouaillardet/hwloc