Replace current_device()
with device()
#366
Merged
current_device()
with device()
#366