Fix a bunch of fallout from the multi-gpu changes.  Now test_basic_ops passes.