ports/openmpi
ports/openmpi
1
1
Форкнуть 0
Код Релизы Активность

Some minor cleanups of warnings from gcc 6.0.0. Update s1/s2 pmix to get max_procs as required.

Просмотр исходного кода
Этот коммит содержится в:
Ralph Castain 2016-05-05 15:28:13 -07:00
родитель f6fd676cad
Коммит 08022d7af1
5 изменённых файлов: 65 добавлений и 40 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

70
ompi/debuggers/ompi_msgq_dll.c
Просмотреть файл

@ -7,6 +7,7 @@
* Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved. * Copyright (c) 2008-2009 Sun Microsystems, Inc. All rights reserved.
* Copyright (c) 2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2016 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -441,42 +442,43 @@ int mqs_setup_process (mqs_process *process, const mqs_process_callbacks *pcb)
{ {
mqs_taddr_t typedefs_sizeof; mqs_taddr_t typedefs_sizeof;
if(mqs_find_symbol (image, "MPIR_debug_typedefs_sizeof", &typedefs_sizeof) != mqs_ok) if (mqs_find_symbol (image, "MPIR_debug_typedefs_sizeof", &typedefs_sizeof) != mqs_ok) {
return err_no_store; return err_no_store;
p_info->sizes.short_size = ompi_fetch_int( process, /* sizeof (short) */ }
typedefs_sizeof, p_info->sizes.short_size = ompi_fetch_int( process, /* sizeof (short) */
p_info ); typedefs_sizeof,
typedefs_sizeof += p_info->sizes.int_size; p_info );
p_info->sizes.int_size = ompi_fetch_int( process, /* sizeof (int) */ typedefs_sizeof += p_info->sizes.int_size;
typedefs_sizeof, p_info->sizes.int_size = ompi_fetch_int( process, /* sizeof (int) */
p_info ); typedefs_sizeof,
typedefs_sizeof += p_info->sizes.int_size; p_info );
p_info->sizes.long_size = ompi_fetch_int( process, /* sizeof (long) */ typedefs_sizeof += p_info->sizes.int_size;
typedefs_sizeof, p_info->sizes.long_size = ompi_fetch_int( process, /* sizeof (long) */
p_info ); typedefs_sizeof,
typedefs_sizeof += p_info->sizes.int_size; p_info );
p_info->sizes.long_long_size = ompi_fetch_int( process, /* sizeof (long long) */ typedefs_sizeof += p_info->sizes.int_size;
typedefs_sizeof, p_info->sizes.long_long_size = ompi_fetch_int( process, /* sizeof (long long) */
p_info );
typedefs_sizeof += p_info->sizes.int_size;
p_info->sizes.pointer_size = ompi_fetch_int( process, /* sizeof (void *) */
typedefs_sizeof,
p_info );
typedefs_sizeof += p_info->sizes.int_size;
p_info->sizes.bool_size = ompi_fetch_int( process, /* sizeof (bool) */
typedefs_sizeof,
p_info );
typedefs_sizeof += p_info->sizes.int_size;
p_info->sizes.size_t_size = ompi_fetch_int( process, /* sizeof (size_t) */
typedefs_sizeof, typedefs_sizeof,
p_info ); p_info );
DEBUG( VERBOSE_GENERAL, typedefs_sizeof += p_info->sizes.int_size;
("sizes short = %d int = %d long = %d long long = %d " p_info->sizes.pointer_size = ompi_fetch_int( process, /* sizeof (void *) */
"void* = %d bool = %d size_t = %d\n", typedefs_sizeof,
p_info->sizes.short_size, p_info->sizes.int_size, p_info );
p_info->sizes.long_size, p_info->sizes.long_long_size, typedefs_sizeof += p_info->sizes.int_size;
p_info->sizes.pointer_size, p_info->sizes.bool_size, p_info->sizes.bool_size = ompi_fetch_int( process, /* sizeof (bool) */
p_info->sizes.size_t_size) ); typedefs_sizeof,
p_info );
typedefs_sizeof += p_info->sizes.int_size;
p_info->sizes.size_t_size = ompi_fetch_int( process, /* sizeof (size_t) */
typedefs_sizeof,
p_info );
DEBUG( VERBOSE_GENERAL,
("sizes short = %d int = %d long = %d long long = %d "
"void* = %d bool = %d size_t = %d\n",
p_info->sizes.short_size, p_info->sizes.int_size,
p_info->sizes.long_size, p_info->sizes.long_long_size,
p_info->sizes.pointer_size, p_info->sizes.bool_size,
p_info->sizes.size_t_size) );
} }
mqs_put_process_info (process, (mqs_process_info *)p_info); mqs_put_process_info (process, (mqs_process_info *)p_info);

3
ompi/mca/bml/r2/bml_r2.c
Просмотреть файл

@ -19,6 +19,7 @@
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights * Copyright (c) 2014-2015 Los Alamos National Security, LLC. All rights
* reserved. * reserved.
* Copyright (c) 2016 Intel, Inc. All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
* *
* Additional copyrights may follow * Additional copyrights may follow
@ -430,9 +431,7 @@ static int mca_bml_r2_add_proc (struct ompi_proc_t *proc)
mca_bml_r2_compute_endpoint_metrics (bml_endpoint); mca_bml_r2_compute_endpoint_metrics (bml_endpoint);
/* do it last, for the lazy initialization check in bml_base_get* */ /* do it last, for the lazy initialization check in bml_base_get* */
#if OPAL_ENABLE_THREAD_MULTI
opal_atomic_wmb(); opal_atomic_wmb();
#endif /* OPAL_ENABLE_THREAD_MULTI */
proc->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_BML] = bml_endpoint; proc->proc_endpoints[OMPI_PROC_ENDPOINT_TAG_BML] = bml_endpoint;
return OMPI_SUCCESS; return OMPI_SUCCESS;

5
opal/mca/btl/tcp/btl_tcp.c
Просмотреть файл

@ -14,6 +14,7 @@
* reserved. * reserved.
* Copyright (c) 2016 Research Organization for Information Science * Copyright (c) 2016 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* Copyright (c) 2016 Intel, Inc. All rights reserved.
* *
* $COPYRIGHT$ * $COPYRIGHT$
* *
@ -94,7 +95,7 @@ int mca_btl_tcp_add_procs( struct mca_btl_base_module_t* btl,
OPAL_THREAD_LOCK(&tcp_proc->proc_lock); OPAL_THREAD_LOCK(&tcp_proc->proc_lock);
for (uint32_t j = 0 ; j < (int)tcp_proc->proc_endpoint_count ; ++j) { for (uint32_t j = 0 ; j < (uint32_t)tcp_proc->proc_endpoint_count ; ++j) {
tcp_endpoint = tcp_proc->proc_endpoints[j]; tcp_endpoint = tcp_proc->proc_endpoints[j];
if (tcp_endpoint->endpoint_btl == tcp_btl) { if (tcp_endpoint->endpoint_btl == tcp_btl) {
existing_found = true; existing_found = true;
@ -512,7 +513,7 @@ void mca_btl_tcp_dump(struct mca_btl_base_module_t* base_btl,
opal_list_item_t *item; opal_list_item_t *item;
for(item = opal_list_get_first(&btl->tcp_endpoints); for(item = opal_list_get_first(&btl->tcp_endpoints);
item != opal_list_get_end(&btl->tcp_endpoints); item != opal_list_get_end(&btl->tcp_endpoints);
item = opal_list_get_next(item)) { item = opal_list_get_next(item)) {
MCA_BTL_TCP_ENDPOINT_DUMP(10, (mca_btl_base_endpoint_t*)item, false, "TCP"); MCA_BTL_TCP_ENDPOINT_DUMP(10, (mca_btl_base_endpoint_t*)item, false, "TCP");
} }

14
opal/mca/pmix/s1/pmix_s1.c
Просмотреть файл

@ -1,6 +1,6 @@
/* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */ /* -*- Mode: C; c-basic-offset:4 ; indent-tabs-mode:nil -*- */
/* /*
* Copyright (c) 2014-2015 Intel, Inc. All rights reserved. * Copyright (c) 2014-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science * Copyright (c) 2014-2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -358,6 +358,18 @@ static int s1_init(void)
goto err_exit; goto err_exit;
} }
OBJ_DESTRUCT(&kv); OBJ_DESTRUCT(&kv);
/* push this into the dstore for subsequent fetches */
OBJ_CONSTRUCT(&kv, opal_value_t);
kv.key = strdup(OPAL_PMIX_MAX_PROCS);
kv.type = OPAL_UINT32;
kv.data.uint32 = i;
if (OPAL_SUCCESS != (ret = opal_pmix_base_store(&OPAL_PROC_MY_NAME, &kv))) {
OPAL_ERROR_LOG(ret);
OBJ_DESTRUCT(&kv);
goto err_exit;
}
OBJ_DESTRUCT(&kv);
/* get job size */ /* get job size */
ret = PMI_Get_size(&i); ret = PMI_Get_size(&i);

13
opal/mca/pmix/s2/pmix_s2.c
Просмотреть файл

@ -5,7 +5,7 @@
* Copyright (c) 2011 Cisco Systems, Inc. All rights reserved. * Copyright (c) 2011 Cisco Systems, Inc. All rights reserved.
* Copyright (c) 2011-2013 Los Alamos National Security, LLC. All * Copyright (c) 2011-2013 Los Alamos National Security, LLC. All
* rights reserved. * rights reserved.
* Copyright (c) 2013-2015 Intel, Inc. All rights reserved. * Copyright (c) 2013-2016 Intel, Inc. All rights reserved.
* Copyright (c) 2014-2015 Research Organization for Information Science * Copyright (c) 2014-2015 Research Organization for Information Science
* and Technology (RIST). All rights reserved. * and Technology (RIST). All rights reserved.
* $COPYRIGHT$ * $COPYRIGHT$
@ -274,6 +274,17 @@ static int s2_init(void)
goto err_exit; goto err_exit;
} }
OBJ_DESTRUCT(&kv); OBJ_DESTRUCT(&kv);
/* push this into the dstore for subsequent fetches */
OBJ_CONSTRUCT(&kv, opal_value_t);
kv.key = strdup(OPAL_PMIX_MAX_PROCS);
kv.type = OPAL_UINT32;
kv.data.uint32 = i;
if (OPAL_SUCCESS != (ret = opal_pmix_base_store(&OPAL_PROC_MY_NAME, &kv))) {
OPAL_ERROR_LOG(ret);
OBJ_DESTRUCT(&kv);
goto err_exit;
}
OBJ_DESTRUCT(&kv);
char *pmapping = (char*)malloc(PMI2_MAX_VALLEN); char *pmapping = (char*)malloc(PMI2_MAX_VALLEN);
if( pmapping == NULL ){ if( pmapping == NULL ){