Even less ompi usages down here.

This commit was SVN r32328.

opal/mca/btl/openib/connect/btl_openib_connect_udcm.c

@@ -2435,7 +2435,7 @@ static int udcm_xrc_send_qp_create (mca_btl_base_endpoint_t *lcl_ep)
     if (NULL == *qp) {
         opal_show_help("help-mpi-btl-openib-cpc-base.txt",
                        "ibv_create_qp failed", true,
-                       ompi_process_info.nodename,
+                       opal_process_info.nodename,
                        ibv_get_device_name(openib_btl->device->ib_dev),
                        "Reliable connected (XRC)");
         return OPAL_ERROR;
@@ -2444,7 +2444,7 @@ static int udcm_xrc_send_qp_create (mca_btl_base_endpoint_t *lcl_ep)
     if (qp_init_attr.cap.max_inline_data < req_inline) {
         lcl_ep->qps[0].ib_inline_max = qp_init_attr.cap.max_inline_data;
         opal_show_help("help-mpi-btl-openib-cpc-base.txt",
-                       "inline truncated", ompi_process_info.nodename,
+                       "inline truncated", opal_process_info.nodename,
                        ibv_get_device_name(openib_btl->device->ib_dev),
                        openib_btl->port_num,
                        req_inline, qp_init_attr.cap.max_inline_data);

opal/mca/btl/sm/btl_sm_component.c

@@ -656,7 +656,7 @@ out:
  */
 static int
 backing_store_init(mca_btl_sm_component_t *comp_ptr,
-                   ompi_local_rank_t local_rank)
+                   uint32_t local_rank)
 {
     int rc = OPAL_SUCCESS;
 
@@ -691,7 +691,7 @@ mca_btl_sm_component_init(int *num_btls,
 {
     int num_local_procs = 0;
     mca_btl_base_module_t **btls = NULL;
-    ompi_local_rank_t my_local_rank = UINT16_MAX;
+    uint32_t my_local_rank = UINT32_MAX;
 #if OPAL_BTL_SM_HAVE_KNEM
     int rc;
 #endif /* OPAL_BTL_SM_HAVE_KNEM */
@@ -714,7 +714,7 @@ mca_btl_sm_component_init(int *num_btls,
      * the spawn case we need to designate a metadata creator rank within the
      * set of processes that are initializing the btl, and my_local_rank seems
      * to provide that for us. */
-    if (UINT16_MAX ==
+    if (UINT32_MAX ==
         (my_local_rank = opal_process_info.my_local_rank)) {
         opal_show_help("help-mpi-btl-sm.txt", "no locality", true);
         return NULL;

opal/mca/btl/smcuda/btl_smcuda.c

@@ -61,7 +61,7 @@
 #include "opal/mca/crs/base/base.h"
 #include "opal/util/basename.h"
 #include "orte/mca/sstore/sstore.h"
-#include "ompi/runtime/ompi_cr.h"
+#include "opal/runtime/opal_cr.h"
 #endif
 
 #include "btl_smcuda.h"

opal/mca/btl/smcuda/btl_smcuda_component.c

@@ -588,7 +588,7 @@ out:
  */
 static int
 backing_store_init(mca_btl_smcuda_component_t *comp_ptr,
-                   ompi_local_rank_t local_rank)
+                   uint32_t local_rank)
 {
     int rc = OPAL_SUCCESS;
 
@@ -833,7 +833,7 @@ mca_btl_smcuda_component_init(int *num_btls,
 {
     int num_local_procs = 0;
     mca_btl_base_module_t **btls = NULL;
-    ompi_local_rank_t my_local_rank = UINT16_MAX;
+    uint32_t my_local_rank = UINT32_MAX;
 
     *num_btls = 0;
     /* lookup/create shared memory pool only when used */
@@ -853,7 +853,7 @@ mca_btl_smcuda_component_init(int *num_btls,
      * the spawn case we need to designate a metadata creator rank within the
      * set of processes that are initializing the btl, and my_local_rank seems
      * to provide that for us. */
-    if (UINT16_MAX ==
+    if (UINT32_MAX ==
         (my_local_rank = opal_process_info.my_local_rank)) {
         opal_show_help("help-mpi-btl-sm.txt", "no locality", true);
         return NULL;

opal/mca/btl/tcp/btl_tcp_component.c

@@ -73,8 +73,6 @@
 #include "opal/mca/common/cuda/common_cuda.h"
 #endif /* OPAL_CUDA_SUPPORT */
 
-#include "ompi/runtime/ompi_module_exchange.h"
-
 /* 
  * Local functions
  */
@@ -305,10 +303,10 @@ static int mca_btl_tcp_component_register(void)
 
         if (NULL != argv && '\0' != *(argv[0])) {
             int if_index, rc, count;
-            ompi_node_rank_t node_rank;
+            uint32_t node_rank;
             char name[256];
 
-            node_rank = ompi_process_info.my_node_rank;
+            node_rank = opal_process_info.my_local_rank;
 
             /* Now that we've got that local rank, take the
                corresponding entry from the tcp_if_seq list (wrapping

opal/mca/btl/vader/btl_vader.h

@@ -64,8 +64,8 @@
 #include "opal/mca/btl/base/base.h"
 #include "opal/mca/rcache/rcache.h"
 #include "opal/mca/rcache/base/base.h"
+#include "opal/util/proc.h"
 
-#include "ompi/runtime/ompi_module_exchange.h"
 #include "btl_vader_endpoint.h"
 
 BEGIN_C_DECLS

opal/mca/btl/vader/btl_vader_component.c

@@ -23,7 +23,6 @@
  */
 #include "opal_config.h"
 
-#include "ompi/constants.h"
 #include "opal/util/output.h"
 #include "opal/mca/btl/base/btl_base_error.h"
 

opal/mca/btl/vader/btl_vader_module.c

@@ -286,7 +286,7 @@ static int vader_add_procs (struct mca_btl_base_module_t* btl,
     }
 
     /* make sure that my local rank has been defined */
-    if (ORTE_LOCAL_RANK_INVALID == MCA_BTL_VADER_LOCAL_RANK) {
+    if (0 <= MCA_BTL_VADER_LOCAL_RANK) {
         return OPAL_ERROR;
     }