Now that we are using local ranks in OMPI, we need to define an ompi_local_rank_t and equate it to orte_local_rank_t. Change the sm btl to use the correct abstraction.

This commit was SVN r28098.

ompi/mca/btl/sm/btl_sm_component.c

@@ -54,6 +54,7 @@
 #include "ompi/mca/mpool/base/base.h"
 #include "ompi/mca/common/sm/common_sm.h"
 #include "ompi/mca/btl/base/btl_base_error.h"
+#include "ompi/mca/rte/rte.h"
 
 #if OPAL_ENABLE_FT_CR    == 1
 #include "opal/runtime/opal_cr.h"
@@ -671,7 +672,7 @@ out:
  */
 static int
 backing_store_init(mca_btl_sm_component_t *comp_ptr,
-                   orte_local_rank_t local_rank)
+                   ompi_local_rank_t local_rank)
 {
     int rc = OMPI_SUCCESS;
 
@@ -706,7 +707,7 @@ mca_btl_sm_component_init(int *num_btls,
 {
     int num_local_procs = 0;
     mca_btl_base_module_t **btls = NULL;
-    orte_local_rank_t my_local_rank = OMPI_LOCAL_RANK_INVALID;
+    ompi_local_rank_t my_local_rank = OMPI_LOCAL_RANK_INVALID;
 #if OMPI_BTL_SM_HAVE_KNEM
     int rc;
 #endif /* OMPI_BTL_SM_HAVE_KNEM */

ompi/mca/rte/orte/rte_orte.h

@@ -63,6 +63,7 @@ typedef orte_grpcomm_coll_id_t ompi_rte_collective_id_t;
 
 /* Process info struct and values */
 typedef orte_node_rank_t ompi_node_rank_t;
+typedef orte_local_rank_t ompi_local_rank_t;
 #define ompi_process_info orte_process_info
 #define ompi_rte_proc_is_bound orte_proc_is_bound