From 704f1ecc18e3e0cd233939983d557510b2133da6 Mon Sep 17 00:00:00 2001 From: Brian Barrett Date: Sun, 21 Jul 2013 19:12:32 +0000 Subject: [PATCH] fix non-orte builds of PSM This commit was SVN r28893. --- ompi/mca/mtl/psm/mtl_psm_component.c | 4 ++-- ompi/mca/rte/pmi/rte_pmi.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ompi/mca/mtl/psm/mtl_psm_component.c b/ompi/mca/mtl/psm/mtl_psm_component.c index a1711c7d72..98256f042d 100644 --- a/ompi/mca/mtl/psm/mtl_psm_component.c +++ b/ompi/mca/mtl/psm/mtl_psm_component.c @@ -198,11 +198,11 @@ get_num_local_procs(int *out_nlp) static int get_local_rank(int *out_rank) { - orte_node_rank_t my_node_rank; + ompi_node_rank_t my_node_rank; *out_rank = 0; - if (ORTE_NODE_RANK_INVALID == (my_node_rank = + if (OMPI_NODE_RANK_INVALID == (my_node_rank = ompi_process_info.my_node_rank)) { return OMPI_ERROR; } diff --git a/ompi/mca/rte/pmi/rte_pmi.h b/ompi/mca/rte/pmi/rte_pmi.h index 2354ff2f1e..5e2ab63a1f 100644 --- a/ompi/mca/rte/pmi/rte_pmi.h +++ b/ompi/mca/rte/pmi/rte_pmi.h @@ -95,6 +95,7 @@ struct ompi_process_info_t { }; typedef struct ompi_process_info_t ompi_process_info_t; #define OMPI_LOCAL_RANK_INVALID (-1) +#define OMPI_NODE_RANK_INVALID (-1) OMPI_DECLSPEC extern ompi_process_info_t ompi_process_info;