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

This commit 1. Fixes the void pointer casting to 64-bit integer issue in shmem_lock.c, line 170. 2. Applies the patch provided by George to add support for Intel (12.1.020110811) compiler in OSHMEM. 3. Fixes the configure warning generated by AC_TRY_RUN - disable mxm atomic locks if cross compiling.

Просмотр исходного кода 
This commit was SVN r29158.
Этот коммит содержится в:
Joshua Ladd 2013-09-12 20:54:55 +00:00
родитель eb132f923b
Коммит 936c42a872
14 изменённых файлов: 33 добавлений и 32 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
oshmem/mca/atomic/base/atomic_base_frame.c
Просмотреть файл

@ -88,4 +88,4 @@ MCA_BASE_FRAMEWORK_DECLARE(oshmem, atomic,
mca_atomic_base_open,
mca_atomic_base_close,
mca_atomic_base_static_components,
0);
MCA_BASE_FRAMEWORK_FLAG_DEFAULT);

2
oshmem/mca/atomic/basic/atomic_basic_component.c
Просмотреть файл

@ -72,7 +72,7 @@ static int __basic_open(void)
(void) mca_base_component_var_register(&mca_atomic_basic_component.atomic_version,
"priority",
"Priority of the atomic:basic component",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_atomic_basic_priority_param);

1
oshmem/mca/atomic/mxm/configure.m4
Просмотреть файл

@ -33,6 +33,7 @@ AC_DEFUN([MCA_oshmem_atomic_mxm_CONFIG],[
return 0;
}],
[AC_DEFINE([OSHMEM_HAS_ATOMIC_MXM], [1], [mxm support is available]) atomic_mxm_happy="yes"],
[atomic_mxm_happy="no"],
[atomic_mxm_happy="no"])
CPPFLAGS=$save_CPPFLAGS
LDFLAGS=$save_LDFLAGS

18
oshmem/mca/memheap/base/memheap_base_frame.c
Просмотреть файл

@ -57,7 +57,7 @@ static int mca_memheap_base_register(mca_base_register_flag_t flags)
MCA_BASE_VAR_TYPE_INT,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_memheap_base_alloc_type);
@ -70,7 +70,7 @@ static int mca_memheap_base_register(mca_base_register_flag_t flags)
MCA_BASE_VAR_TYPE_INT,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_memheap_base_alloc_type);
@ -84,7 +84,7 @@ static int mca_memheap_base_register(mca_base_register_flag_t flags)
MCA_BASE_VAR_TYPE_UNSIGNED_LONG_LONG,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_memheap_base_start_address);
@ -97,7 +97,7 @@ static int mca_memheap_base_register(mca_base_register_flag_t flags)
MCA_BASE_VAR_TYPE_INT,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_memheap_base_key_exchange);
@ -110,7 +110,7 @@ static int mca_memheap_base_register(mca_base_register_flag_t flags)
MCA_BASE_VAR_TYPE_INT,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_memheap_base_mr_interleave_factor);
@ -123,7 +123,7 @@ static int mca_memheap_base_register(mca_base_register_flag_t flags)
MCA_BASE_VAR_TYPE_STRING,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_memheap_base_include);
@ -144,7 +144,7 @@ static int mca_memheap_base_register(mca_base_register_flag_t flags)
MCA_BASE_VAR_TYPE_STRING,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_memheap_base_exclude);
@ -157,7 +157,7 @@ static int mca_memheap_base_register(mca_base_register_flag_t flags)
MCA_BASE_VAR_TYPE_STRING,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_memheap_base_param_hca_name);
@ -212,4 +212,4 @@ MCA_BASE_FRAMEWORK_DECLARE(oshmem, memheap,
mca_memheap_base_open,
mca_memheap_base_close,
mca_memheap_base_static_components,
0);
MCA_BASE_FRAMEWORK_FLAG_DEFAULT);

2
oshmem/mca/scoll/base/scoll_base_frame.c
Просмотреть файл

@ -109,4 +109,4 @@ MCA_BASE_FRAMEWORK_DECLARE(oshmem, scoll,
mca_scoll_base_open,
mca_scoll_base_close,
mca_scoll_base_static_components,
0);
MCA_BASE_FRAMEWORK_FLAG_DEFAULT);

10
oshmem/mca/scoll/basic/scoll_basic_component.c
Просмотреть файл

@ -83,7 +83,7 @@ static int basic_register(void)
(void) mca_base_component_var_register(comp,
"priority",
"Priority of the basic scoll:basic component",
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_scoll_basic_priority_param);
@ -99,7 +99,7 @@ static int basic_register(void)
(void) mca_base_component_var_register(comp,
"barrier_alg",
help_msg,
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_scoll_basic_param_barrier_algorithm);
@ -111,7 +111,7 @@ static int basic_register(void)
(void) mca_base_component_var_register(comp,
"broadcast_alg",
help_msg,
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_scoll_basic_param_broadcast_algorithm);
@ -125,7 +125,7 @@ static int basic_register(void)
(void) mca_base_component_var_register(comp,
"collect_alg",
help_msg,
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_scoll_basic_param_collect_algorithm);
@ -140,7 +140,7 @@ static int basic_register(void)
(void) mca_base_component_var_register(comp,
"reduce_alg",
help_msg,
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_scoll_basic_param_reduce_algorithm);

2
oshmem/mca/spml/base/spml_base_frame.c
Просмотреть файл

@ -156,4 +156,4 @@ MCA_BASE_FRAMEWORK_DECLARE(oshmem, spml,
mca_spml_base_open,
mca_spml_base_close,
mca_spml_base_static_components,
0);
MCA_BASE_FRAMEWORK_FLAG_DEFAULT);

4
oshmem/mca/spml/yoda/spml_yoda.c
Просмотреть файл

@ -263,7 +263,7 @@ static void mca_yoda_get_response_callback(mca_btl_base_module_t* btl,
/* unpacking data*/
size = (size_t *) ( ((char*)des->des_dst->seg_addr.pval) );
l_addr = (void**)( ((char*)size) + sizeof(*size));
getreq = (mca_spml_yoda_get_request_t*)*(void**)((void*)l_addr + sizeof(*l_addr) + *size);
getreq = (mca_spml_yoda_get_request_t*)*(void**)((char*)l_addr + sizeof(*l_addr) + *size);
/* Complete get request*/
OPAL_THREAD_ADD32(&getreq->parent->active_count, -1);
@ -271,7 +271,7 @@ static void mca_yoda_get_response_callback(mca_btl_base_module_t* btl,
oshmem_request_complete(&getreq->req_get.req_base.req_oshmem, 1);
oshmem_request_free((oshmem_request_t**) &getreq);
memcpy(*l_addr, (void*)l_addr + sizeof(*l_addr), *size);
memcpy(*l_addr, (char*)l_addr + sizeof(*l_addr), *size);
}
/**

4
oshmem/mca/spml/yoda/spml_yoda_component.c
Просмотреть файл

@ -62,7 +62,7 @@ static inline int mca_spml_yoda_param_register_int(const char *param_name,
(void) mca_base_component_var_register(&mca_spml_yoda_component.spmlm_version,
param_name,
help_msg,
MCA_BASE_VAR_TYPE_INT, NULL, 0, 0,
MCA_BASE_VAR_TYPE_INT, NULL, 0, MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&param_value);
@ -87,7 +87,7 @@ static int mca_spml_yoda_component_register(void)
static int mca_spml_yoda_component_open(void)
{
return mca_base_framework_open(&ompi_bml_base_framework, 0);
return mca_base_framework_open(&ompi_bml_base_framework, MCA_BASE_OPEN_DEFAULT);
}
static int mca_spml_yoda_component_close(void)

2
oshmem/proc/proc_group_cache.c
Просмотреть файл

@ -86,7 +86,7 @@ int oshmem_group_cache_list_init(void)
MCA_BASE_VAR_TYPE_INT,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_value);

2
oshmem/runtime/oshmem_shmem_exchange.c
Просмотреть файл

@ -35,7 +35,7 @@ OSHMEM_DECLSPEC int oshmem_shmem_exchange_allgather(void *buf,
ranks_in_comm[i] = i;
}
void* buf_temp = malloc(buf_size);
memcpy(buf_temp, buf + buf_size * ORTE_PROC_MY_NAME->vpid, buf_size);
memcpy(buf_temp, (char*)buf + buf_size * ORTE_PROC_MY_NAME->vpid, buf_size);
rc = comm_allgather_pml( buf_temp,
buf,

10
oshmem/runtime/oshmem_shmem_init.c
Просмотреть файл

@ -305,7 +305,7 @@ int oshmem_shmem_preconnect_all(void)
MCA_BASE_VAR_TYPE_INT,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&mca_value);
@ -373,12 +373,12 @@ static int __shmem_init(int argc, char **argv, int requested, int *provided)
goto error;
}
if (OSHMEM_SUCCESS != (ret = mca_base_framework_open(&oshmem_spml_base_framework, 0))) {
if (OSHMEM_SUCCESS != (ret = mca_base_framework_open(&oshmem_spml_base_framework, MCA_BASE_OPEN_DEFAULT))) {
error = "mca_spml_base_open() failed";
goto error;
}
if (OSHMEM_SUCCESS != (ret = mca_base_framework_open(&oshmem_scoll_base_framework, 0))) {
if (OSHMEM_SUCCESS != (ret = mca_base_framework_open(&oshmem_scoll_base_framework, MCA_BASE_OPEN_DEFAULT))) {
error = "mca_scoll_base_open() failed";
goto error;
}
@ -441,7 +441,7 @@ static int __shmem_init(int argc, char **argv, int requested, int *provided)
goto error;
}
if (OSHMEM_SUCCESS != (ret = mca_base_framework_open(&oshmem_memheap_base_framework, 0))) {
if (OSHMEM_SUCCESS != (ret = mca_base_framework_open(&oshmem_memheap_base_framework, MCA_BASE_OPEN_DEFAULT))) {
error = "mca_memheap_base_open() failed";
goto error;
}
@ -451,7 +451,7 @@ static int __shmem_init(int argc, char **argv, int requested, int *provided)
goto error;
}
if (OSHMEM_SUCCESS != (ret = mca_base_framework_open(&oshmem_atomic_base_framework, 0))) {
if (OSHMEM_SUCCESS != (ret = mca_base_framework_open(&oshmem_atomic_base_framework, MCA_BASE_OPEN_DEFAULT))) {
error = "mca_atomic_base_open() failed";
goto error;
}

4
oshmem/runtime/oshmem_shmem_params.c
Просмотреть файл

@ -26,7 +26,7 @@ int oshmem_shmem_register_params(void)
MCA_BASE_VAR_TYPE_INT,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&oshmem_shmem_lock_recursive);
@ -39,7 +39,7 @@ int oshmem_shmem_register_params(void)
MCA_BASE_VAR_TYPE_INT,
NULL,
0,
0,
MCA_BASE_VAR_FLAG_SETTABLE,
OPAL_INFO_LVL_9,
MCA_BASE_VAR_SCOPE_READONLY,
&oshmem_shmem_api_verbose);

2
oshmem/shmem/c/shmem_lock.c
Просмотреть файл

@ -167,7 +167,7 @@ int shmem_lock_finalize()
static int shmem_lock_get_server(const void *lock)
{
return (int) (((uint64_t) lock) / 8) % shmem_n_pes();
return (int) (((uintptr_t) lock) / 8) % shmem_n_pes();
}
static uint64_t get_lock_value(const void *lock, int lock_size)