Picking a GPU or CPU device should be select-able on the command line.  A new flag should be added to the client to force CPU or GPU device enumeration, instead of being hardcoded and chosen at compile time.