31,33d30
< from attrdict import optiondict
< from misc import crossproduct
<
111c108,109
< result = optiondict()
---
> import m5.util
> result = m5.util.optiondict()
331c329,331
< for options in crossproduct(optgroups):
---
>
> import m5.util
> for options in m5.util.crossproduct(optgroups):