changes to client to make mapping work...
this *should* handle presence or absence of infiniband correctly...