From 2bbf22e2d05cb78ff76c2ebcf76e592dd82e72cc Mon Sep 17 00:00:00 2001 From: Howard Pritchard Date: Thu, 10 Sep 2015 11:39:34 -0700 Subject: [PATCH] pmix/~pmix1xx: use u32 for OPAL_PMIX_LOCAL_SIZE Looks like in ess_pmi_module.c u32 is being used for retrieving OPAL_PMIX_LOCAL_SIZE, while s1/s2/cray pmix components were storing as u16. This commit fixes this problem. Signed-off-by: Howard Pritchard --- opal/mca/pmix/cray/pmix_cray.c | 4 ++-- opal/mca/pmix/s1/pmix_s1.c | 4 ++-- opal/mca/pmix/s2/pmix_s2.c | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/opal/mca/pmix/cray/pmix_cray.c b/opal/mca/pmix/cray/pmix_cray.c index 6673259875..0b6d9d7813 100644 --- a/opal/mca/pmix/cray/pmix_cray.c +++ b/opal/mca/pmix/cray/pmix_cray.c @@ -314,8 +314,8 @@ static int cray_init(void) /* save the local size */ OBJ_CONSTRUCT(&kv, opal_value_t); kv.key = strdup(OPAL_PMIX_LOCAL_SIZE); - kv.type = OPAL_UINT16; - kv.data.uint16 = pmix_nlranks; + kv.type = OPAL_UINT32; + kv.data.uint32 = pmix_nlranks; if (OPAL_SUCCESS != (rc = opal_pmix_base_store(&OPAL_PROC_MY_NAME, &kv))) { OPAL_ERROR_LOG(rc); OBJ_DESTRUCT(&kv); diff --git a/opal/mca/pmix/s1/pmix_s1.c b/opal/mca/pmix/s1/pmix_s1.c index 60ba28947e..3a82f6ee00 100644 --- a/opal/mca/pmix/s1/pmix_s1.c +++ b/opal/mca/pmix/s1/pmix_s1.c @@ -274,8 +274,8 @@ static int s1_init(void) /* save the local size */ OBJ_CONSTRUCT(&kv, opal_value_t); kv.key = strdup(OPAL_PMIX_LOCAL_SIZE); - kv.type = OPAL_UINT16; - kv.data.uint16 = nlranks; + kv.type = OPAL_UINT32; + kv.data.uint32 = nlranks; if (OPAL_SUCCESS != (ret = opal_pmix_base_store(&OPAL_PROC_MY_NAME, &kv))) { OPAL_ERROR_LOG(ret); OBJ_DESTRUCT(&kv); diff --git a/opal/mca/pmix/s2/pmix_s2.c b/opal/mca/pmix/s2/pmix_s2.c index 97871afb2d..9dd6d9c2ca 100644 --- a/opal/mca/pmix/s2/pmix_s2.c +++ b/opal/mca/pmix/s2/pmix_s2.c @@ -320,8 +320,8 @@ static int s2_init(void) /* save the local size */ OBJ_CONSTRUCT(&kv, opal_value_t); kv.key = strdup(OPAL_PMIX_LOCAL_SIZE); - kv.type = OPAL_UINT16; - kv.data.uint16 = s2_nlranks; + kv.type = OPAL_UINT32; + kv.data.uint32 = s2_nlranks; if (OPAL_SUCCESS != (rc = opal_pmix_base_store(&OPAL_PROC_MY_NAME, &kv))) { OPAL_ERROR_LOG(rc); OBJ_DESTRUCT(&kv);