Merge pull request open-mpi#1208 from hjelmn/v2.x_ugni

v2.x ugni bug fixes

Author: jsquyres

opal/mca/btl/ugni/btl_ugni_add_procs.c

@@ -244,7 +244,6 @@ struct mca_btl_base_endpoint_t *mca_btl_ugni_get_ep (struct mca_btl_base_module_
     do {
         rc = opal_hash_table_get_value_uint64 (&ugni_module->id_to_endpoint, proc_id, (void **) &ep);
         if (OPAL_SUCCESS == rc) {
-            OPAL_THREAD_UNLOCK(&ugni_module->endpoint_lock);
             break;
         }
 

opal/mca/btl/ugni/btl_ugni_component.c

@@ -234,11 +234,8 @@ btl_ugni_component_register(void)
     /*
      * see def. of ALIGNMENT_MASK to figure this one out
      */
-    if (GNI_DEVICE_GEMINI == device_type) {
-        mca_btl_ugni_module.super.btl_get_alignment = 4;
-    } else {
-        mca_btl_ugni_module.super.btl_get_alignment = 0;
-    }
+    /* both gemini and aries have a 4-byte alignment requirement on remote addresses */
+    mca_btl_ugni_module.super.btl_get_alignment = 4;
 
     /* threshold for put */
     mca_btl_ugni_module.super.btl_min_rdma_pipeline_size    = 8 * 1024;