Skip to content

romio,java: cleanup deprecated hindexed call #1532

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from Apr 14, 2016
Merged

romio,java: cleanup deprecated hindexed call #1532

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5c54184
romio: replace deprecated hindexed call
kmroz Apr 10, 2016
f8ecdbd
java: replace deprecated hindexed call
kmroz Apr 10, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions ompi/mca/io/romio314/romio/adio/common/ad_coll_build_req_new.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -844,7 +844,7 @@ int ADIOI_Build_agg_reqs(ADIO_File fd, int rw_type, int nprocs,
{
if (client_comm_sz_arr[i] > 0)
{
MPI_Type_hindexed(client_ol_ct_arr[i], client_blk_arr[i],
MPI_Type_create_hindexed(client_ol_ct_arr[i], client_blk_arr[i],
client_disp_arr[i], MPI_BYTE,
&(client_comm_dtype_arr[i]));
MPI_Type_commit(&(client_comm_dtype_arr[i]));
Expand All @@ -863,7 +863,7 @@ int ADIOI_Build_agg_reqs(ADIO_File fd, int rw_type, int nprocs,
if (agg_ol_ct == 1)
MPI_Type_contiguous (agg_blk_arr[0], MPI_BYTE, agg_dtype_p);
else if (agg_ol_ct > 1)
MPI_Type_hindexed(agg_ol_ct, agg_blk_arr, agg_disp_arr, MPI_BYTE,
MPI_Type_create_hindexed(agg_ol_ct, agg_blk_arr, agg_disp_arr, MPI_BYTE,
agg_dtype_p);

MPI_Type_commit(agg_dtype_p);
Expand Down Expand Up @@ -1203,7 +1203,7 @@ int ADIOI_Build_client_reqs(ADIO_File fd,
{
if (agg_comm_sz_arr[i] > 0)
{
MPI_Type_hindexed(agg_ol_ct_arr[i], agg_blk_arr[i],
MPI_Type_create_hindexed(agg_ol_ct_arr[i], agg_blk_arr[i],
agg_disp_arr[i], MPI_BYTE,
&(agg_comm_dtype_arr[i]));
MPI_Type_commit(&(agg_comm_dtype_arr[i]));
Expand Down Expand Up @@ -2063,7 +2063,7 @@ int ADIOI_Build_client_req(ADIO_File fd,
/* Create the aggregator MPI_Datatype */
if (agg_comm_sz > 0)
{
MPI_Type_hindexed(agg_ol_ct, agg_blk_arr, agg_disp_arr, MPI_BYTE,
MPI_Type_create_hindexed(agg_ol_ct, agg_blk_arr, agg_disp_arr, MPI_BYTE,
agg_comm_dtype_p);
MPI_Type_commit(agg_comm_dtype_p);
}
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/io/romio314/romio/adio/common/utils.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ int ADIOI_Type_create_hindexed_x(int count,
ret = MPI_Type_create_struct(count, blocklens, array_of_displacements,
types, newtype);
} else {
ret = MPI_Type_hindexed(count, blocklens,
ret = MPI_Type_create_hindexed(count, blocklens,
array_of_displacements, oldtype, newtype);
}
for (i=0; i< count; i++)
Expand Down
2 changes: 1 addition & 1 deletion ompi/mca/io/romio314/romio/test/types_with_zeros.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ static int test_indexed_with_zeros(char *filename, int testcase)
MPI_Type_indexed(num, blocklen, indices, MPI_INT, &filetype);
break;
case HINDEXED:
MPI_Type_hindexed(num, blocklen, addrs, MPI_INT, &filetype);
MPI_Type_create_hindexed(num, blocklen, addrs, MPI_INT, &filetype);
break;
case STRUCT:
MPI_Type_create_struct(num, blocklen, addrs, types, &filetype);
Expand Down
2 changes: 1 addition & 1 deletion ompi/mpi/java/c/mpi_Datatype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -226,7 +226,7 @@ JNIEXPORT jlong JNICALL Java_mpi_Datatype_getHIndexed(
for(i = 0; i < count; i++)
cDisps[i] = jDisps[i];

int rc = MPI_Type_hindexed(count, cBlockLengths, cDisps,
int rc = MPI_Type_create_hindexed(count, cBlockLengths, cDisps,
(MPI_Datatype)oldType, &type);

ompi_java_exceptionCheck(env, rc);
Expand Down