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

ompi/mpi: Fix MPI_UNDEFINED handling in mpi_type_create_f90_(real|complex)

Просмотр исходного кода 
Signed-off-by: Joshua Hursey <jhursey@us.ibm.com>
Этот коммит содержится в:
Joshua Hursey 2017-05-23 17:55:30 -04:00
родитель 5e302f5279
Коммит a5e9c3501b
2 изменённых файлов: 12 добавлений и 6 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

9
ompi/mpi/c/type_create_f90_complex.c
Просмотреть файл

@ -46,6 +46,7 @@ static const char FUNC_NAME[] = "MPI_Type_create_f90_complex";
int MPI_Type_create_f90_complex(int p, int r, MPI_Datatype *newtype) int MPI_Type_create_f90_complex(int p, int r, MPI_Datatype *newtype)
{ {
uint64_t key; uint64_t key;
int p_key, r_key;
OPAL_CR_NOOP_PROGRESS(); OPAL_CR_NOOP_PROGRESS();
@ -65,8 +66,10 @@ int MPI_Type_create_f90_complex(int p, int r, MPI_Datatype *newtype)
/* if the user does not care about p or r set them to 0 so the /* if the user does not care about p or r set them to 0 so the
* test associate with them will always succeed. * test associate with them will always succeed.
*/ */
if( MPI_UNDEFINED == p ) p = 0; p_key = p;
if( MPI_UNDEFINED == r ) r = 0; r_key = r;
if( MPI_UNDEFINED == p ) p_key = 0;
if( MPI_UNDEFINED == r ) r_key = 0;
/** /**
* With respect to the MPI standard, MPI-2.0 Sect. 10.2.5, MPI_TYPE_CREATE_F90_xxxx, * With respect to the MPI standard, MPI-2.0 Sect. 10.2.5, MPI_TYPE_CREATE_F90_xxxx,
@ -87,7 +90,7 @@ int MPI_Type_create_f90_complex(int p, int r, MPI_Datatype *newtype)
const int* a_i[2]; const int* a_i[2];
int rc; int rc;
key = (((uint64_t)p) << 32) | ((uint64_t)r); key = (((uint64_t)p_key) << 32) | ((uint64_t)r_key);
if( OPAL_SUCCESS == opal_hash_table_get_value_uint64( &ompi_mpi_f90_complex_hashtable, if( OPAL_SUCCESS == opal_hash_table_get_value_uint64( &ompi_mpi_f90_complex_hashtable,
key, (void**)newtype ) ) { key, (void**)newtype ) ) {
return MPI_SUCCESS; return MPI_SUCCESS;

9
ompi/mpi/c/type_create_f90_real.c
Просмотреть файл

@ -46,6 +46,7 @@ static const char FUNC_NAME[] = "MPI_Type_create_f90_real";
int MPI_Type_create_f90_real(int p, int r, MPI_Datatype *newtype) int MPI_Type_create_f90_real(int p, int r, MPI_Datatype *newtype)
{ {
uint64_t key; uint64_t key;
int p_key, r_key;
OPAL_CR_NOOP_PROGRESS(); OPAL_CR_NOOP_PROGRESS();
@ -65,8 +66,10 @@ int MPI_Type_create_f90_real(int p, int r, MPI_Datatype *newtype)
/* if the user does not care about p or r set them to 0 so the /* if the user does not care about p or r set them to 0 so the
* test associate with them will always succeed. * test associate with them will always succeed.
*/ */
if( MPI_UNDEFINED == p ) p = 0; p_key = p;
if( MPI_UNDEFINED == r ) r = 0; r_key = r;
if( MPI_UNDEFINED == p ) p_key = 0;
if( MPI_UNDEFINED == r ) r_key = 0;
/** /**
* With respect to the MPI standard, MPI-2.0 Sect. 10.2.5, MPI_TYPE_CREATE_F90_xxxx, * With respect to the MPI standard, MPI-2.0 Sect. 10.2.5, MPI_TYPE_CREATE_F90_xxxx,
@ -87,7 +90,7 @@ int MPI_Type_create_f90_real(int p, int r, MPI_Datatype *newtype)
const int* a_i[2] = {&p, &r}; const int* a_i[2] = {&p, &r};
int rc; int rc;
key = (((uint64_t)p) << 32) | ((uint64_t)r); key = (((uint64_t)p_key) << 32) | ((uint64_t)r_key);
if( OPAL_SUCCESS == opal_hash_table_get_value_uint64( &ompi_mpi_f90_real_hashtable, if( OPAL_SUCCESS == opal_hash_table_get_value_uint64( &ompi_mpi_f90_real_hashtable,
key, (void**)newtype ) ) { key, (void**)newtype ) ) {
return MPI_SUCCESS; return MPI_SUCCESS;